[interchange-cvs] interchange - jon modified dist/foundation/pages/results.html

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Fri Dec 28 12:09:01 2001


User:      jon
Date:      2001-12-28 17:08:02 GMT
Modified:  dist/foundation/pages results.html
Log:
Clean up 'no matches' output:

* Allow numbers to be displayed
* Reflect default Foundation search usage
* Handle empty search strings more gracefully.

Also remove unused scratch setting.

Revision  Changes    Path
2.2       +12 -13    interchange/dist/foundation/pages/results.html


rev 2.2, prev_rev 2.1
Index: results.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/results.html,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- results.html	2001/07/23 18:59:40	2.1
+++ results.html	2001/12/28 17:08:02	2.2
@@ -86,14 +86,13 @@
 [/calc]
 	[bounce href="[history-scan exclude=nothing]"]
 [/set]
-[tmp cross_sale][value-extended name=mv_searchspec index=0][/tmp]
 
 [on-match]
 <FORM ACTION="[area nothing]" METHOD=POST>
-<input type=hidden name=mv_session_id value="[data session id]">
-<INPUT TYPE=hidden  NAME="mv_action" VALUE="refresh">
-<INPUT TYPE=hidden  NAME="mv_separate_items"  VALUE="0">
-<INPUT TYPE=hidden  NAME="mv_click" VALUE="munge_quantity">
+<INPUT TYPE=hidden NAME=mv_session_id value="[data session id]">
+<INPUT TYPE=hidden NAME=mv_action VALUE=refresh>
+<INPUT TYPE=hidden NAME=mv_separate_items VALUE=0>
+<INPUT TYPE=hidden NAME=mv_click VALUE=munge_quantity>
 [/on-match]
 
 <table width="90%" border="0" cellspacing="0" cellpadding="3">
@@ -164,14 +163,14 @@
 [no-match]
 <BR><BR>
 <BLOCKQUOTE>
-Sorry, no matches for <B>[calc]
-			my $joiner = ' AND ';
-			$joiner = ' OR ' if
-					defined $Search->{''}->{mv_orsearch}[0]
-					and $Search->{''}->{mv_orsearch}[0];
-			my @str = grep /\D/, @{$Values->{mv_searchspec}};
-			return join $joiner, @str;
-			[/calc]
+[comment]
+	Don't show the search string if it was empty, since it looks weird
+	and the user will see the error below anyway.
+[/comment]
+[tmp matchstring][value-extended name=mv_searchspec joiner=" | "][/tmp]
+[if scratch matchstring]
+Sorry, no matches for <B>[scratch matchstring]</B>.
+[/if]
 [if value mv_search_error]
 <P>
 <B>