[Koha-cvs] koha/opac opac-search.pl [rel_2_2]

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Joshua Ferraro <address@hidden> 06/02/04 17:01:31

Modified files:
        opac           : opac-search.pl 

Log message:
        Fix searchdesc variable to have proper spaces for display in OPAC

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-search.pl.diff?only_with_tag=rel_2_2&tr1=1.21.2.11&tr2=1.21.2.12&r1=text&r2=text

Patches:
Index: koha/opac/opac-search.pl
diff -u koha/opac/opac-search.pl:1.21.2.11 koha/opac/opac-search.pl:1.21.2.12
--- koha/opac/opac-search.pl:1.21.2.11  Sat Feb  4 16:47:21 2006
+++ koha/opac/opac-search.pl    Sat Feb  4 17:01:31 2006
@@ -42,14 +42,13 @@
        my $orderby = $query->param('orderby');
        my $desc_or_asc = $query->param('desc_or_asc');
        my $exactsearch = $query->param('exact');
-
        for (my $i=0;$i<=$#marclist;$i++) {
-               if ($searchdesc) { # don't put the and_or on the 1st search term
-                       $searchdesc .= $and_or[$i].$excluding[$i]." 
".($marclist[$i]?$marclist[$i]:"*").$operator[$i].$value[$i] if ($value[$i]);
-               } else {
-                       $searchdesc = 
$excluding[$i].($marclist[$i]?$marclist[$i]:"*").$operator[$i].$value[$i] if 
($value[$i]);
-               }
-       }
+                if ($searchdesc) { # don't put the and_or on the 1st search 
term
+                        $searchdesc .= $and_or[$i].$excluding[$i]." 
".($marclist[$i]?$marclist[$i]:"* ")." ".$operator[$i]." ".$value[$i]." " if 
($value[$i]);
+                } else {                        $searchdesc = 
$excluding[$i].($marclist[$i]?$marclist[$i]:"* ")." ".$operator[$i]." 
".$value[$i]." " if ($value[$i]);
+                }
+        }
+       
        $resultsperpage= $query->param('resultsperpage');
        $resultsperpage = 19 if(!defined $resultsperpage);