[interchange-cvs] interchange - heins modified 2 files

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-04-29 02:47:01 GMT
Modified:  lib/Vend Interpolate.pm
Modified:  dist/lib/UI/pages/include/Options Matrix
Log:
* Allow the key in [if type=data ...] to have a colon in it.

* Honor the "variant" view of variants if present.

Revision  Changes    Path
2.210     +3 -3      interchange/lib/Vend/Interpolate.pm


rev 2.210, prev_rev 2.209
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.209
retrieving revision 2.210
diff -u -r2.209 -r2.210
--- Interpolate.pm	19 Apr 2004 21:59:07 -0000	2.209
+++ Interpolate.pm	29 Apr 2004 02:47:01 -0000	2.210
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.209 2004/04/19 21:59:07 mheins Exp $
+# $Id: Interpolate.pm,v 2.210 2004/04/29 02:47:01 mheins Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.209 $, 10);
+$VERSION = substr(q$Revision: 2.210 $, 10);
 
 @EXPORT = qw (
 
@@ -1330,7 +1330,7 @@
                 if defined $comp;
     }
 	elsif($base eq 'data') {
-		my($d,$f,$k) = split /::/, $term;
+		my($d,$f,$k) = split /::/, $term, 3;
 		$op = database_field($d,$k,$f);
 #::logDebug ("tag_if db=$d fld=$f key=$k\n");
 		$op = "q{$op}" unless defined $noop;



1.3       +4 -0      interchange/dist/lib/UI/pages/include/Options/Matrix


rev 1.3, prev_rev 1.2
Index: Matrix
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/Options/Matrix,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Matrix	4 Dec 2003 19:04:43 -0000	1.2
+++ Matrix	29 Apr 2004 02:47:01 -0000	1.3
@@ -249,8 +249,12 @@
 						ui_page_title=[cgi ui_page_banner]
 						ui_class=Items
 						ui_meta_specific=[cgi ui_meta_specific]
+						[if type=data term="mv_metadata::code::variant::[cgi mv_variant_table]"]
 						ui_meta_view=variant
+						[else]
 						ui_data_fields=code sku description price wholesale inventory:quantity weight
+						[/else]
+						[/if]
 						ui_return_to=@@MV_PAGE@@
 						ui_return_to=item_id=[cgi item_id]
 						item_id=[variant-code]