X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cataloguing%2Faddbooks.pl;h=5e89ef87f3d549b736c429decd7b50f1df2b4039;hb=50bbfe3b0ad45e7ab37a588f274b66fd65bb1096;hp=6e45ed5f407cef8137e27aa380b8f67751494adf;hpb=289e8f445ea4dde315a23fa5c9cd565add264b7e;p=koha.git

diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index 6e45ed5f40..5e89ef87f3 100755
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -14,9 +14,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 cataloguing:addbooks.pl
 
@@ -25,6 +25,7 @@
 =cut
 
 use strict;
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Biblio;
@@ -48,7 +49,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { editcatalogue => 1 },
+        flagsrequired   => { editcatalogue => 'edit_catalogue' },
         debug           => 1,
     }
 );
@@ -56,19 +57,24 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # get framework list
 my $frameworks = getframeworks;
 my @frameworkcodeloop;
-foreach my $thisframeworkcode ( keys %$frameworks ) {
-    my %row = (
+foreach my $thisframeworkcode ( sort {$frameworks->{$a} cmp $frameworks->{$b}}keys %{$frameworks} ) {
+    push @frameworkcodeloop, {
         value         => $thisframeworkcode,
         frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-    );
-    push @frameworkcodeloop, \%row;
+    };
 }
 
+
 # Searching the catalog.
 if ($query) {
 
+    # build query
+    my @operands = $query;
+    my (@operators, @indexes, @sort_by, @limits) = ();
+    my ( $builterror,$builtquery,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,@limits,\@sort_by,undef,undef);
+
     # find results
-    my ( $error, $marcresults ) = SimpleSearch($query);
+    my ( $error, $marcresults, $total_hits ) = SimpleSearch($builtquery, $results_per_page * ($page - 1), $results_per_page);
 
     if ( defined $error ) {
         $template->param( error => $error );
@@ -76,57 +82,58 @@ if ($query) {
         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 );
+    # SimpleSearch() give the results per page we want, so 0 offet here
+    my $total = @{$marcresults};
+    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 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' ),
     );
 }
 
 # fill with books in breeding farm
-my $toggle = 0;
-my ( $title, $isbn );
 
+my $countbr = 0;
+my @resultsbr;
+if ($query) {
 # fill isbn or title, depending on what has been entered
 #u must do check on isbn because u can find number in beginning of title
 #check is on isbn legnth 13 for new isbn and 10 for old isbn
-my $querylength = length($query);
-if ( $query =~ /\d/ and ( $querylength eq 13 or $querylength eq 10 ) ) {
-    $isbn = $query;
-}
-$title = $query unless $isbn;
-my ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn ) if $query;
-my @breeding_loop = ();
-for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) {
-    my %row_data;
-    if ( $i % 2 ) {
-        $toggle = 0;
+    my ( $title, $isbn );
+    if ($query=~/\d/) {
+        my $querylength = length $query;
+        if ( $querylength == 13 || $querylength == 10 ) {
+            $isbn = $query;
+        }
     }
-    else {
-        $toggle = 1;
+    if (!$isbn) {
+        $title = $query;
     }
-    $row_data{toggle} = $toggle;
-    $row_data{id}     = $resultsbr[$i]->{'id'};
-    $row_data{isbn}   = $resultsbr[$i]->{'isbn'};
-    $row_data{file}   = $resultsbr[$i]->{'file'};
-    $row_data{title}  = $resultsbr[$i]->{'title'};
-    $row_data{author} = $resultsbr[$i]->{'author'};
-    push( @breeding_loop, \%row_data );
+    ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn );
+}
+my $breeding_loop = [];
+for my $resultsbr (@resultsbr) {
+    push @{$breeding_loop}, {
+        id               => $resultsbr->{import_record_id},
+        isbn             => $resultsbr->{isbn},
+        copyrightdate    => $resultsbr->{copyrightdate},
+        editionstatement => $resultsbr->{editionstatement},
+        file             => $resultsbr->{file_name},
+        title            => $resultsbr->{title},
+        author           => $resultsbr->{author},
+    };
 }
 
 $template->param(
     frameworkcodeloop => \@frameworkcodeloop,
-    breeding_loop     => \@breeding_loop,
+    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;
+