[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/26 13:55:32

Modified files:
        z3950          : search.pl 

Log message:
        Reverting+BugFixing on serverhost and encoding.

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

Patches:
Index: search.pl
===================================================================
RCS file: /sources/koha/koha/z3950/search.pl,v
retrieving revision 1.3.2.15
retrieving revision 1.3.2.16
diff -u -b -r1.3.2.15 -r1.3.2.16
--- search.pl   24 Feb 2007 16:03:19 -0000      1.3.2.15
+++ search.pl   26 Feb 2007 13:55:32 -0000      1.3.2.16
@@ -106,21 +106,24 @@
     my @oResult;
     my $s=0;
                             
-    if ($isbn ne "/" || $issn ne "/") {
+       my $query;
+    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  ';
+               $term=$isbn if ($isbn);
+               $term=$issn if ($issn);
+       } elsif ($title) {
+               $attr='1=4 ';
+#         $title=~tr/������/aaaeeeeiioouu/;
         $term=$title;
-    } elsif ($author ne "/") {
+       } elsif ($author) {
         $attr='1=1003';
+#         $author=~tr/������/aaaeeeeiioouu/;
         $term=$author;
     } 
 
-    my $query="address@hidden $attr \"$term\"";        
-    warn "query ".$query if $DEBUG;
+    $query="address@hidden $attr \"$term\"";
+    warn "query ".$query;
     foreach my $servid (@id){
         my $sth=$dbh->prepare("select * from z3950servers where id=?");
         $sth->execute($servid);
@@ -133,58 +136,47 @@
             $option1->option('user',$server->{userid}) if $server->{userid};
             $option1->option('password',$server->{password})  if 
$server->{password};
             $option1->option('preferredRecordSyntax', $server->{syntax});
-            $oConnection[$s]=create ZOOM::Connection($option1) || $DEBUG && 
warn ("something went wrong: ".$oConnection[$s]->errmsg());
-            warn ("server data",$server->{name}, $server->{port}) if $DEBUG;
-            $oConnection[$s]->connect($server->{host}, $server->{port}) || 
$DEBUG && warn ("something went wrong: ".$oConnection[$s]->errmsg());
+                       $oConnection[$s]=create ZOOM::Connection($option1) || 
warn ("something went wrong: ".$oConnection[$s]->errmsg());
+#                      warn ("server data",$server->{name}, $server->{port});
             $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" if $DEBUG;
-        $oResult[$z] = $oConnection[$z]->search_pqf($query) || $DEBUG && 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") if $DEBUG;
-        last if $event == ZOOM::Event::ZEND;
-    }
-
-    if ($k != 0) {
-        $k--;
-        warn $serverhost[$k] if $DEBUG;
-        my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x();
+               warn ("connection ", $k-1, ": event $event (", 
ZOOM::event_str($event), ")\n");
+               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" if $DEBUG;
-            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 = 
MARC::Record->new_from_usmarc($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
+                  $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
                 my $oldbiblio = MARCmarc2koha($dbh,$marcrecord,"");
                 $oldbiblio->{isbn} =~ s/ |-|\.//g,
                 $oldbiblio->{issn} =~ s/ |-|\.//g,
-                my 
($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported,$breedingid)=ImportBreeding($marcdata,1,$serverhost[$k],$encoding[$k],$random);
+                  my 
($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported,$bid)=ImportBreeding($marcdata,1,
+                  $serverhost[$k-1],$encoding[$k-1],$random);
+              
                 my %row_data;
                 if ($i % 2) {
                     $toggle="#ffffcc";
@@ -192,22 +184,27 @@
                     $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} = $breedingid;
-                $row_data{oldbiblionumber}=$biblionumber;
+                  $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++;