X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cataloguing%2Fz3950_search.pl;h=e3973c9e467deb8fd2204a3faa11699688310e7a;hb=fae56bb8804cc298d34df9ff53738a138e565848;hp=df2fab199c9d311d2484f4ab096fd7a996ff5dae;hpb=139ffdf7d7ad60b2c070b95633be25618c811372;p=koha.git

diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
index df2fab199c..e3973c9e46 100755
--- 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;
 }
@@ -220,7 +238,6 @@ 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};
@@ -231,7 +248,7 @@ warn "query ".$query  if $DEBUG;
                         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