[interchange-cvs] interchange - heins modified code/UI_Tag/menu_load.coretag

[interchange-core@icdevgroup.org]

User:      heins
Date:      2003-01-14 00:21:51 GMT
Modified:  code/UI_Tag menu_load.coretag
Log:
* Various minor changes to menu_load tag to make compatibile with new UI
  setup.

Revision  Changes    Path
1.3       +18 -8     interchange/code/UI_Tag/menu_load.coretag


rev 1.3, prev_rev 1.2
Index: menu_load.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/menu_load.coretag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- menu_load.coretag	1 Dec 2002 16:38:39 -0000	1.2
+++ menu_load.coretag	14 Jan 2003 00:21:51 -0000	1.3
@@ -35,28 +35,36 @@
 	  else {
 		push @out, "co=yes";
 		for(@items) {
-			my ($col, $string) = split /\s*=\s*/;
+			my ($col, $string) = split /\s*=\s*/, $_, 2;
 			push @out, "sf=$col";
 			push @out, "se=$string";
 		}
 		push @out, $row->{search}
 			if $row->{search} =~ /^\s*\w\w=/;
 
-		push @out, qq{va=banner_image=$row->{banner_image}} if $row->{banner_image};
-		push @out, qq{va=banner_text=$row->{banner_text}} if $row->{banner_text};
+		push @out, qq{va=banner_image=$row->{banner_image}}
+			if $row->{banner_image};
+		push @out, qq{va=banner_text=$row->{banner_text}}
+			if $row->{banner_text};
 		for(@out) {
 			s/(.*?=)(.*)/$1 . Vend::Util::hexify($2)/ges;
 		}
-		$arg = join "&", @out;
+		$arg = join $Global::UrlJoiner, @out;
 		$nrow->{form} = $arg;
 	  }
   }
   elsif	($row->{link_type} eq 'complex') {
 	  $nrow->{page} = 'search';
 	  $row->{search} =~ s/[\r\n+]/\n/g;
-	  $row->{search} .= qq{\nva=banner_text=$row->{banner_text}} if $row->{banner_text};
-	  $row->{search} .= qq{\nva=banner_image=$row->{banner_image}} if $row->{banner_image};
-	  $nrow->{form} = $row->{search};
+	  $row->{search} .= qq{\nva=banner_text=$row->{banner_text}}
+	  	if $row->{banner_text};
+	  $row->{search} .= qq{\nva=banner_image=$row->{banner_image}}
+	  	if $row->{banner_image};
+	  my @items = grep /\S/, split /[\r\n]+/, $row->{search};
+		for(@items) {
+			s/(.*?=)(.*)/$1 . Vend::Util::hexify($2)/ges;
+		}
+	  $nrow->{form} = join $Global::UrlJoiner, @items;
 	  $nrow->{form} =~ s/[\r\n]+/&/g;
   }
   return $nrow;
@@ -207,6 +215,8 @@
 	elsif ($type eq 'comb_category') {
 		$opt->{table} ||= 'products';
 		$opt->{comb_field} ||= 'comb_category';
+		$opt->{sort_string} ||= "tf=$opt->{comb_field},$Vend::Cfg->{DescriptionField}";
+		$opt->{sort_order} ||= $opt->{comb_field};
 
 
 		COMB_BUILD: {
@@ -280,7 +290,7 @@
 							$searchterm .= $Tag->filter('urlencode',$comb);
 							my $form = join "&",
 										@base_search,
-										"tf=$comb_field,description",
+										$opt->{sort_string},
 										"sf=$comb_field",
 										$searchterm
 										;