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

[Henri-Damien LAURENT]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Henri-Damien LAURENT <hdl>      07/02/15 18:25:36

Modified files:
        z3950          : search.pl 

Log message:
        Bug Fixing : Making search work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/search.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.12&r2=1.3.2.13

Patches:
Index: search.pl
===================================================================
RCS file: /sources/koha/koha/z3950/search.pl,v
retrieving revision 1.3.2.12
retrieving revision 1.3.2.13
diff -u -b -r1.3.2.12 -r1.3.2.13
--- search.pl   7 Feb 2007 17:35:10 -0000       1.3.2.12
+++ search.pl   15 Feb 2007 18:25:36 -0000      1.3.2.13
@@ -35,6 +35,7 @@
 my $oldbiblionumber=$input->param('oldbiblionumber');
 $oldbiblionumber=0 unless $oldbiblionumber;
 my $title = $input->param('title');
+warn "titre ;".$title;
 my $author = $input->param('author');
 my $isbn = $input->param('isbn');
 my $issn = $input->param('issn');
@@ -62,9 +63,6 @@
 my @breeding_loop = ();
 
 
-unless ($random) { # this var is not useful anymore just kept to keep rel2_2 
compatibility
-       $random =rand(1000000000);
-}
 
 my ($template, $loggedinuser, $cookie)= get_template_and_user({
                                template_name => "z3950/searchresult.tmpl",
@@ -102,20 +100,21 @@
        my @oResult;
        my $s=0;
                                                        
+       my $query;
        if ($isbn || $issn) {
                $attr='1=7';
 #         warn "isbn : $isbn";
-               $term=$isbn if ($isbn ne "/");
-               $term=$issn if ($issn ne "/");
-       } elsif ($title ne "/") {
+               $term=$isbn if ($isbn);
+               $term=$issn if ($issn);
+       } elsif ($title) {
                $attr='1=4 ';
                $term=$title;
-       } elsif ($author ne "/") {
+       } elsif ($author) {
                $attr='1=1003';
                $term=$author;
        } 
 
-       my $query="address@hidden $attr \"$term\"";     
+    $query="address@hidden $attr \"$term\"";
     warn "query ".$query;
        foreach my $servid (@id){
                my $sth=$dbh->prepare("select * from z3950servers where id=?");
@@ -131,51 +130,39 @@
                        $option1->option('preferredRecordSyntax', 
$server->{syntax});
                        $oConnection[$s]=create ZOOM::Connection($option1) || 
warn ("something went wrong: ".$oConnection[$s]->errmsg());
 #                      warn ("server data",$server->{name}, $server->{port});
-                       $oConnection[$s]->connect($server->{host}, 
$server->{port}) || warn ("something went wrong: ".$oConnection[$s]->errmsg());
                        $serverhost[$s]=$server->{host};
                        $encoding[$s]=$server->{syntax};
+                       $oConnection[$s]->connect($server->{host}, 
$server->{port}) || warn ("Connection to $serverhost[$s]: 
".$oConnection[$s]->errmsg());
+            $oResult[$s] = $oConnection[$s]->search_pqf($query) || warn 
("search $serverhost[$s]: " . $oConnection[$s]->errmsg());
                        $s++;
                }## while fetch
        }# foreach
        my $nremaining = $s;
-       my $firstresult=1;
+#      my $firstresult=1;
 
-       for (my $z=0 ;$z<$s;$z++){
-       warn "doing the search";
-               $oResult[$z] = $oConnection[$z]->search_pqf($query) || warn 
("somthing went wrong: " . $oConnection[$s]->errmsg());
-#$oResult[$z] = $oConnection[$z]->search_pqf($query);
-       }
-
-AGAIN:
        my $k;
        my $event;
        while (($k = ZOOM::event(address@hidden)) != 0) {
                $event = $oConnection[$k-1]->last_event();
                warn ("connection ", $k-1, ": event $event (", 
ZOOM::event_str($event), ")\n");
-               last if $event == ZOOM::Event::ZEND;
-       }
-
-       if ($k != 0) {
-               $k--;
-               warn $serverhost[$k];
-               my($error, $errmsg, $addinfo, $diagset) = 
$oConnection[$k]->error_x();
+               if ($event == ZOOM::Event::ZEND){
+          my($error, $errmsg, $addinfo, $diagset) = 
$oConnection[$k-1]->error_x();
                if ($error) {
-                       warn "$k $serverhost[$k] error $query: $errmsg ($error) 
$addinfo\n";
-                       goto MAYBE_AGAIN;
+              warn "$k $serverhost[$k - 1] error $query: $errmsg ($error) 
$addinfo\n";
                }
-               my $numresults=$oResult[$k]->size() ;                           
                                
+          my $numresults=$oResult[$k-1]->size() ;                              
                                
                my $i;
                my $result='';
                if ($numresults>0){
-                       for ($i=0; $i<(($numresults<5) ? ($numresults) : (5)) ; 
$i++) {
-                               my $rec=$oResult[$k]->record($i);               
                                                                
+              for ($i=0; $i<$numresults ; $i++) {
+                  my $rec=$oResult[$k-1]->record($i);                          
                                                
                                my $marcrecord;
                                $marcdata = $rec->raw();                        
                                                                
                 $marcrecord= fixEncoding($marcdata);
-####WARNING records coming from Z3950 clients are in various character sets 
MARC8,UTF8,UNIMARC etc
-## In HEAD i change everything to UTF-8
-# In rel2_2 i am not sure what encoding is so no character conversion is done 
here
-##Add necessary encoding changes to here -TG
+  ####WARNING records coming from Z3950 clients are in various character sets 
MARC8,UTF8,UNIMARC etc
+  ## In HEAD i change everything to UTF-8
+  # In rel2_2 i am not sure what encoding is so no character conversion is 
done here
+  ##Add necessary encoding changes to here -TG
                                my $oldbiblio = 
MARCmarc2koha($dbh,$marcrecord,"");
                                $oldbiblio->{isbn} =~ s/ |-|\.//g,
                                $oldbiblio->{issn} =~ s/ |-|\.//g,
@@ -188,28 +175,29 @@
                                        $toggle="white";
                                }
                                $row_data{toggle} = $toggle;
-                               $row_data{server} = $serverhost[$k];
+                  $row_data{server} = $serverhost[$k-1];
                                $row_data{isbn} = $oldbiblio->{isbn};
                                $row_data{title} =$oldbiblio->{title};
                                $row_data{author} = $oldbiblio->{author};
                                $row_data{id} = $bid;
                                $row_data{oldbiblionumber}=$oldbiblionumber;
                                push (@breeding_loop, \%row_data);
-                       }# upto 5 results
+              }
      
                }#$numresults
-       }# if $k !=0
-       $numberpending=$nremaining-1;
+          else {
+            warn "no results for $serverhost[$k - 1]";
+          }
+        }
+        
+       }
+
        $template->param(breeding_loop => address@hidden, 
server=>$serverhost[$k],
                                numberpending => $numberpending,
        );
-       output_html_with_http_headers $input, $cookie, $template->output if 
$numberpending==0;
+       output_html_with_http_headers $input, $cookie, $template->output;
 
 #      print  $template->output  if $firstresult !=1;
-       $firstresult++;
+#      $firstresult++;
 
-       MAYBE_AGAIN:
-               if (--$nremaining > 0) {
-               goto AGAIN;
-               }
 } ## if op=search