[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/z3950/s... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <tipaul>   07/02/07 17:35:10

Modified files:
        koha-tmpl/intranet-tmpl/default/en/z3950: searchresult.tmpl 
        z3950          : search.pl 

Log message:
        BUGFIX on title search : only the 1st word was searched, making an 
internal server error when it was en empty word

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.5&r2=1.4.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/search.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.11&r2=1.3.2.12

Patches:
Index: koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/z3950/Attic/searchresult.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -b -r1.4.2.5 -r1.4.2.6
--- koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl  22 Nov 2006 
10:24:35 -0000      1.4.2.5
+++ koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl  7 Feb 2007 
17:35:10 -0000       1.4.2.6
@@ -19,10 +19,10 @@
     <form method="post" action="search.pl" name="f">
     
     <input type="hidden" name="op" id="op" value="do_search" />
-    <input type="hidden" name="title" value=<!-- TMPL_VAR NAME="title" --> />
-    <input type="hidden" name="author" value=<!-- TMPL_VAR NAME="author" --> />
-    <input type="hidden" name="isbn" value=<!-- TMPL_VAR NAME="isbn" --> />
-    <input type="hidden" name="issn" value=<!-- TMPL_VAR NAME="issn" --> />
+    <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+    <input type="hidden" name="author" value="<!-- TMPL_VAR NAME="author" -->" 
/>
+    <input type="hidden" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" />
+    <input type="hidden" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" />
     <input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR 
NAME="oldbiblionumber" -->" />
     
     <!-- TMPL_LOOP name="serverloop" -->

Index: z3950/search.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/search.pl,v
retrieving revision 1.3.2.11
retrieving revision 1.3.2.12
diff -u -b -r1.3.2.11 -r1.3.2.12
--- z3950/search.pl     22 Nov 2006 10:24:35 -0000      1.3.2.11
+++ z3950/search.pl     7 Feb 2007 17:35:10 -0000       1.3.2.12
@@ -102,13 +102,13 @@
        my @oResult;
        my $s=0;
                                                        
-       if ($isbn ne "/" || $issn ne "/") {
+       if ($isbn || $issn) {
                $attr='1=7';
 #         warn "isbn : $isbn";
                $term=$isbn if ($isbn ne "/");
                $term=$issn if ($issn ne "/");
        } elsif ($title ne "/") {
-               $attr='1=4 @attr 4=1  ';
+               $attr='1=4 ';
                $term=$title;
        } elsif ($author ne "/") {
                $attr='1=1003';
@@ -116,7 +116,7 @@
        } 
 
        my $query="address@hidden $attr \"$term\"";     
-#     warn "query ".$query;
+    warn "query ".$query;
        foreach my $servid (@id){
                my $sth=$dbh->prepare("select * from z3950servers where id=?");
                $sth->execute($servid);