[Koha-cvs] koha cataloguing/z3950_search.pl koha-tmpl/intr...

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Antoine Farnault <toins>        07/07/12 15:30:14

Modified files:
        cataloguing    : z3950_search.pl 
        koha-tmpl/intranet-tmpl/prog/en/cataloguing: z3950_search.tmpl 

Log message:
        displaying the query to search
        re indenting
        minor style enhancement

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/z3950_search.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl?cvsroot=koha&r1=1.2&r2=1.3

Patches:
Index: cataloguing/z3950_search.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/z3950_search.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cataloguing/z3950_search.pl 25 Jun 2007 15:06:28 -0000      1.5
+++ cataloguing/z3950_search.pl 12 Jul 2007 15:30:13 -0000      1.6
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+
 # This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
 # Copyright 2000-2002 Katipo Communications
 #
@@ -31,18 +32,18 @@
 my $input = new CGI;
 my $dbh = C4::Context->dbh;
 my $error = $input->param('error');
-my $biblionumber=$input->param('biblionumber');
-$biblionumber=0 unless $biblionumber;
-my $frameworkcode=$input->param('frameworkcode');
+my $biblionumber = $input->param('biblionumber');
+$biblionumber = 0 unless $biblionumber;
+my $frameworkcode = $input->param('frameworkcode');
 my $title = $input->param('title');
 my $author = $input->param('author');
 my $isbn = $input->param('isbn');
 my $issn = $input->param('issn');
 my $random = $input->param('random');
-my $op=$input->param('op');
+my $op            = $input->param('op');
 my $noconnection;
 my $numberpending;
-my $attr='';
+my $attr = '';
 my $term;
 my $host;
 my $server;
@@ -57,157 +58,191 @@
 my $oldbiblio;
 my $dbh = C4::Context->dbh;
 my $errmsg;
-my @serverloop=();
+my @serverloop = ();
 my @serverhost;
 my @breeding_loop = ();
 
 my $DEBUG = 1; # if set to 1, many debug message are send on syslog.
 
-unless ($random) { # this var is not useful anymore just kept to keep rel2_2 
compatibility
-    $random =rand(1000000000);
+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({
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
                 template_name => "cataloguing/z3950_search.tmpl",
                 query => $input,
                 type => "intranet",
                 authnotrequired => 1,
-                flagsrequired => {catalogue => 1},
+        flagsrequired   => { catalogue => 1 },
                 debug => 1,
-                });
+    }
+);
 
-$template->param(
-        intranetcolorstylesheet => 
C4::Context->preference("intranetcolorstylesheet"),
-        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-        IntranetNav => C4::Context->preference("IntranetNav"),
-        frameworkcode => $frameworkcode,
-        );
+$template->param( frameworkcode => $frameworkcode, );
 
-if ($op ne "do_search"){
-    my $sth=$dbh->prepare("select id,host,checked from z3950servers  order by 
host");
+if ( $op ne "do_search" ) {
+    my $sth = $dbh->prepare("select id,host,checked from z3950servers  order 
by host");
     $sth->execute();
-    my $serverloop=$sth->fetchall_arrayref({});
-    $template->param(isbn=>$isbn, issn=>$issn,title=>$title,author=>$author,
+    my $serverloop = $sth->fetchall_arrayref( {} );
+    $template->param(
+        isbn         => $isbn,
+        issn         => $issn,
+        title        => $title,
+        author       => $author,
                         serverloop => $serverloop,
                         opsearch => "search",
                         biblionumber => $biblionumber,
                         );
     output_html_with_http_headers $input, $cookie, $template->output;
-}else{
-    my @id=$input->param('id');
+}
+else {
+    my @id = $input->param('id');
     my @oConnection;
     my @oResult;
-    my $s=0;
+    my $s = 0;
                             
-    if ($isbn || $issn) {
-            $attr='1=7';
-            $term=$isbn if ($isbn);
-            $term=$issn if ($issn);
-        } elsif ($title) {
-            $attr='1=4 ';
+    if ( $isbn || $issn ) {
+        $attr = '1=7';
+        $term = $isbn if ($isbn);
+        $term = $issn if ($issn);
+    }
+    elsif ($title) {
+        $attr = '1=4 ';
             utf8::decode($title);
-            $term=$title;
-        } elsif ($author) {
-            $attr='1=1003';
+        $term = $title;
+    }
+    elsif ($author) {
+        $attr = '1=1003';
             utf8::decode($author);
-            $term=$author;
+        $term = $author;
         }
 
-    my $query="address@hidden $attr \"$term\"";        
-    warn "query ".$query if $DEBUG;
-    foreach my $servid (@id){
-        my $sth=$dbh->prepare("select * from z3950servers where id=?");
+    my $query = "address@hidden $attr \"$term\"";
+    warn "query " . $query if $DEBUG;
+    foreach my $servid (@id) {
+        my $sth = $dbh->prepare("select * from z3950servers where id=?");
         $sth->execute($servid);
-        while ($server=$sth->fetchrow_hashref) {
-            my $noconnection=0;                                                
        
-            my $option1=new ZOOM::Options();
-            $option1->option('async'=>1);
-            $option1->option('elementSetName', 'F');
-            $option1->option('databaseName',$server->{db})  ;
-            $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());
-            $serverhost[$s]=$server->{host};
-            $encoding[$s]=$server->{syntax};
+        while ( $server = $sth->fetchrow_hashref ) {
+            my $noconnection = 0;
+            my $option1      = new ZOOM::Options();
+            $option1->option( 'async' => 1 );
+            $option1->option( 'elementSetName', 'F' );
+            $option1->option( 'databaseName',   $server->{db} );
+            $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() );
+            $serverhost[$s] = $server->{host};
+            $encoding[$s]   = $server->{syntax};
             $s++;
-        }## while fetch
-    }# foreach
+        }    ## while fetch
+    }    # foreach
     my $nremaining = $s;
-    my $firstresult=1;
+    my $firstresult = 1;
 
-    for (my $z=0 ;$z<$s;$z++){
+    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);
+        $oResult[$z] = $oConnection[$z]->search_pqf($query)
+          || $DEBUG
+          && warn( "somthing went wrong: " . $oConnection[$s]->errmsg() );
+
+        #$oResult[$z] = $oConnection[$z]->search_pqf($query);
     }
 
-AGAIN:
+  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;
+    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) {
+    if ( $k != 0 ) {
         $k--;
         warn $serverhost[$k] if $DEBUG;
-        my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x();
+        my ( $error, $errmsg, $addinfo, $diagset ) =
+          $oConnection[$k]->error_x();
         if ($error) {
-            warn "$k $serverhost[$k] error $query: $errmsg ($error) 
$addinfo\n" if $DEBUG;
+            warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n"
+              if $DEBUG;
             
-        } else {
-        my $numresults=$oResult[$k]->size() ;
+        }
+        else {
+            my $numresults = $oResult[$k]->size();
         my $i;
-        my $result='';
-        if ($numresults>0){
-            for ($i=0; $i<(($numresults<20) ? ($numresults) : (20)) ; $i++) {
-                my $rec=$oResult[$k]->record($i);
+            my $result = '';
+            if ( $numresults > 0 ) {
+                for (
+                    $i = 0 ;
+                    $i < ( ( $numresults < 20 ) ? ($numresults) : (20) ) ;
+                    $i++
+                  )
+                {
+                    my $rec = $oResult[$k]->record($i);
                 my $marcrecord;
                 $marcdata = $rec->raw();
-                $marcrecord= FixEncoding($marcdata);
-                warn "MARC : ".$marcrecord->as_formatted;
+                    $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 = TransformMarcToKoha($dbh,$marcrecord,"");
+                    my $oldbiblio = TransformMarcToKoha( $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,      $breedingid
+                      )
+                      = ImportBreeding( $marcdata, 1, $serverhost[$k],
+                        $encoding[$k], $random );
+                        
+                        $encoding[$k], $random ));
+                        
                 my %row_data;
-                if ($i % 2) {
-                    $toggle="#ffffcc";
-                } else {
-                    $toggle="white";
+                    if ( $i % 2 ) {
+                        $toggle = "#ffffcc";
+                    }
+                    else {
+                        $toggle = "white";
                 }
                 $row_data{toggle} = $toggle;
                 $row_data{server} = $serverhost[$k];
                 $row_data{isbn} = $oldbiblio->{isbn};
-                $row_data{title} =$oldbiblio->{title};
+                    $row_data{title}        = $oldbiblio->{title};
                 $row_data{author} = $oldbiblio->{author};
                 $row_data{breedingid} = $breedingid;
-                $row_data{biblionumber}=$biblionumber;
-                push (@breeding_loop, \%row_data);
-            }# upto 5 results
-        }#$numresults
-        }
-    }# if $k !=0
-    $numberpending=$nremaining-1;
-    $template->param(breeding_loop => address@hidden, server=>$serverhost[$k],
+                    $row_data{biblionumber} = $biblionumber;
+                    push( @breeding_loop, \%row_data );
+                }    # upto 5 results
+            }    #$numresults
+        }
+    }    # if $k !=0
+    $numberpending = $nremaining - 1;
+    $template->param(
+        breeding_loop => address@hidden,
+        server        => $serverhost[$k],
                 numberpending => $numberpending,
     );
-    output_html_with_http_headers $input, $cookie, $template->output if 
$numberpending==0;
 
-#      print  $template->output  if $firstresult !=1;
+    output_html_with_http_headers $input, $cookie, $template->output if 
$numberpending == 0;
+
+    #          print  $template->output  if $firstresult !=1;
     $firstresult++;
 
     MAYBE_AGAIN:
-        if (--$nremaining > 0) {
+    if ( --$nremaining > 0 ) {
             goto AGAIN;
         }
 } ## if op=search

Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl       9 Mar 
2007 15:39:04 -0000       1.2
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl       12 Jul 
2007 15:30:14 -0000      1.3
@@ -13,8 +13,15 @@
 
 <body>
 <div id="main-compact">
+
+    <h2>Search for</h2>
+    <!-- TMPL_IF NAME='title'--><p>Title: <!-- TMPL_VAR 
NAME='title'--></p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME='author'--><p>Author: <!-- TMPL_VAR 
NAME='author'--></p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME='isbn'--><p>ISBN: <!-- TMPL_VAR NAME='isbn'--></p><!-- 
/TMPL_IF -->
+    <!-- TMPL_IF NAME='issn'--><p>ISSN: <!-- TMPL_VAR NAME='issn'--></p><!-- 
/TMPL_IF -->
+    
 <!-- TMPL_IF name="opsearch" -->
-    <h2>Search on</h2>
+    <h2>on following servers</h2>
     
     <form method="post" action="z3950_search.pl" name="f">