bug 3263: Staff Search Results Interface Changes

[koha.git] / cataloguing / addbooks.pl

diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index e22556a..d4083d9 100755 (executable)
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -57,7 +56,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # get framework list
 my $frameworks = getframeworks;
 my @frameworkcodeloop;
-foreach my $thisframeworkcode ( keys %$frameworks ) {
+foreach my $thisframeworkcode ( sort keys %$frameworks ) {
     my %row = (
         value         => $thisframeworkcode,
         frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
@@ -69,7 +68,7 @@ foreach my $thisframeworkcode ( keys %$frameworks ) {
 if ($query) {
 
     # find results
-    my ( $error, $marcresults ) = SimpleSearch($query);
+    my ( $error, $marcresults, $total_hits ) = SimpleSearch($query, $results_per_page * ($page - 1), $results_per_page);
 
     if ( defined $error ) {
         $template->param( error => $error );
@@ -78,26 +77,14 @@ if ($query) {
         exit;
     }
     
-       if(not defined $marcresults){
-               $template->param(query => $query);
-               warn "no result found";
-               output_html_with_http_headers $input, $cookie, $template->output;
-        exit;
-       }
-
     # format output
     my $total = scalar @$marcresults;
-    my @newresults = searchResults( $query, $total, $results_per_page, $page-1, @$marcresults );
+    my @newresults = searchResults( $query, $total, $results_per_page, $page-1, 0, @$marcresults );
     $template->param(
-        total       => $total,
-        query       => $query,
-        resultsloop => \@newresults,
-        pagination_bar => pagination_bar(
-                               "/cgi-bin/koha/cataloguing/addbooks.pl?q=$query&",
-                                getnbpages( $total, $results_per_page ),
-               $page,
-                       'page'
-               ),
+        total          => $total_hits,
+        query          => $query,
+        resultsloop    => \@newresults,
+        pagination_bar => pagination_bar( "/cgi-bin/koha/cataloguing/addbooks.pl?q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
     );
 }
 
@@ -126,6 +113,8 @@ for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) {
     $row_data{toggle} = $toggle;
     $row_data{id}     = $resultsbr[$i]->{'id'};
     $row_data{isbn}   = $resultsbr[$i]->{'isbn'};
+    $row_data{copyrightdate}   = $resultsbr[$i]->{'copyrightdate'};
+    $row_data{editionstatement}   = $resultsbr[$i]->{'editionstatement'};
     $row_data{file}   = $resultsbr[$i]->{'file'};
     $row_data{title}  = $resultsbr[$i]->{'title'};
     $row_data{author} = $resultsbr[$i]->{'author'};
@@ -134,7 +123,9 @@ for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) {
 
 $template->param(
     frameworkcodeloop => \@frameworkcodeloop,
+    breeding_count    => $countbr,
     breeding_loop     => \@breeding_loop,
+    z3950_search_params => C4::Search::z3950_search_args($query),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;