Portuguese Opac Updates

[koha.git] / cataloguing / z3950_search.pl

diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
index df2fab1..39881a8 100755 (executable)
--- a/cataloguing/z3950_search.pl
+++ b/cataloguing/z3950_search.pl
@@ -42,6 +42,9 @@ my $issn          = $input->param('issn');
 my $lccn          = $input->param('lccn');
 my $subject       = $input->param('subject');
 my $dewey         = $input->param('dewey');
+my $controlnumber      = $input->param('controlnumber');
+my $stdid                      = $input->param('stdid');
+my $srchany                    = $input->param('srchany');
 my $random        = $input->param('random') || rand(1000000000); # this var is not useful anymore just kept for rel2_2 compatibility
 my $op            = $input->param('op');
 my $numberpending;
@@ -86,6 +89,9 @@ if ( $op ne "do_search" ) {
         lccn         => $lccn,
         title        => $title,
         author       => $author,
+        controlnumber=> $controlnumber,
+        stdid                  => $stdid,
+        srchany                => $srchany,
         serverloop   => $serverloop,
         opsearch     => "search",
         biblionumber => $biblionumber,
@@ -129,6 +135,18 @@ else {
         $query .= " \@attr 1=9 $lccn ";
         $nterms++;
     }
+    if ($controlnumber) {
+        $query .= " \@attr 1=12 \"$controlnumber\" ";
+        $nterms++;
+    }
+    if ($stdid) {
+        $query .= " \@attr 1=1007 \"$stdid\" ";
+        $nterms++;
+    }
+    if ($srchany) {
+        $query .= " \@attr 1=1016 \"$srchany\" ";
+        $nterms++;
+    }
 for my $i (1..$nterms-1) {
     $query = "\@and " . $query;
 }
@@ -207,6 +225,26 @@ warn "query ".$query  if $DEBUG;
                         my ($charset_result, $charset_errors);
                         ($marcrecord, $charset_result, $charset_errors) = 
                           MarcToUTF8Record($marcdata, C4::Context->preference('marcflavour'), $encoding[$k]);
+                          
+                          # We clean the ISBN
+                          my ($bibliotag,$bibliosubf)=GetMarcFromKohaField('biblioitems.isbn','');
+                          
+                          if ($bibliotag<10){
+                                $isbn = $marcrecord->field($bibliotag)->data;
+                          }else{
+                                $isbn = $marcrecord->subfield($bibliotag,$bibliosubf);
+                          }
+                          
+                          $isbn = C4::Koha::_isbn_cleanup($isbn);
+
+                          if($marcrecord->field($bibliotag)){
+                              if($bibliotag < 10){
+                                $marcrecord->field($bibliotag)->update($isbn)
+                              }else{
+                                $marcrecord->field($bibliotag)->update($bibliosubf => $isbn);  
+                              }
+                          }
+                          
 ####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
@@ -220,18 +258,19 @@ warn "query ".$query  if $DEBUG;
                           )
                           = ImportBreeding( $marcdata, 2, $serverhost[$k], $encoding[$k], $random, 'z3950' );
                         my %row_data;
-                        $row_data{toggle}       = ($i % 2) ? 1 : 0;
                         $row_data{server}       = $servername[$k];
                         $row_data{isbn}         = $oldbiblio->{isbn};
                         $row_data{lccn}         = $oldbiblio->{lccn};
                         $row_data{title}        = $oldbiblio->{title};
                         $row_data{author}       = $oldbiblio->{author};
+                        $row_data{date}         = $oldbiblio->{copyrightdate};
+                        $row_data{edition}      = $oldbiblio->{editionstatement};
                         $row_data{breedingid}   = $breedingid;
                         $row_data{biblionumber} = $biblionumber;
                         push( @breeding_loop, \%row_data );
                            
                     } else {
-                        push(@breeding_loop,{'toggle'=>($i % 2)?1:0,'server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
+                        push(@breeding_loop,{'server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'biblionumber'=>-1});
                     } # $rec
                 }
             }    #$numresults