X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-item-search.pl;h=4dba30276d633c5aa381590f9034101433581500;hb=e5f251a709f3ebfcda57cdf7f32185464a6991d5;hp=9b920094cf1a92c030608aff44b1b11b249fb88b;hpb=9573f444fcd6f56b2c9248d6bc8d52525a62d518;p=koha-ffzg.git

diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index 9b920094cf..4dba30276d 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -4,47 +4,37 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
-use vars qw($debug $cgi_debug);
+use Modern::Perl;
 
-use CGI;
-use List::Util qw( max min );
-use POSIX qw(ceil);
+use CGI qw ( -utf8 );
+use POSIX qw( ceil );
 
-use C4::Auth qw(get_template_and_user);
-use C4::Output qw(output_html_with_http_headers);
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Context;
-use C4::Dates;
-use C4::Search qw(SimpleSearch);
-use C4::Biblio qw(TransformMarcToKoha);
-use C4::Items qw(GetItemInfosOf get_itemnumbers_of);
-use C4::Koha qw(GetItemTypes);    # XXX subfield_is_koha_internal_p
-use C4::Creators::Lib qw(html_table);
-use C4::Debug;
-
-BEGIN {
-    $debug = $debug || $cgi_debug;
-    if ($debug) {
-        require Data::Dumper;
-        import Data::Dumper qw(Dumper);
-    }
-}
+use C4::Search qw( new_record_from_zebra );
+use C4::Biblio qw( TransformMarcToKoha );
+use C4::Creators::Lib qw( html_table );
+
+use Koha::Logger;
+use Koha::Items;
+use Koha::ItemTypes;
+use Koha::SearchEngine::Search;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my $type      = $query->param('type');
 my $op        = $query->param('op') || '';
@@ -53,7 +43,7 @@ my $ccl_query = $query->param('ccl_query');
 my $startfrom = $query->param('startfrom') || 1;
 my ($template, $loggedinuser, $cookie) = (undef, undef, undef);
 my (
-    $total_hits,  $orderby, $results,  $total,  $error,
+    $total_hits,  $total,  $error,
     $marcresults, $idx,     $datefrom, $dateto, $ccl_textbox
 );
 my $resultsperpage = C4::Context->preference('numSearchResults') || '20';
@@ -69,34 +59,31 @@ if ( $op eq "do_search" ) {
     $idx         = $query->param('idx');
     $ccl_textbox = $query->param('ccl_textbox');
     if ( $ccl_textbox && $idx ) {
-        $ccl_query = "$idx=$ccl_textbox";
+        $ccl_query = "$idx:$ccl_textbox";
     }
 
     $datefrom = $query->param('datefrom');
     $dateto   = $query->param('dateto');
 
     if ($datefrom) {
-        $datefrom = C4::Dates->new($datefrom);
-        $ccl_query .= ' and ' if $ccl_textbox;
-        $ccl_query .=
-          "acqdate,st-date-normalized,ge=" . $datefrom->output("iso");
+        $ccl_query .= ' AND ' if $ccl_textbox;
+        $ccl_query .= "acqdate,ge,st-date-normalized=" . $datefrom;
     }
 
     if ($dateto) {
-        $dateto = C4::Dates->new($dateto);
-        $ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
-        $ccl_query .= "acqdate,st-date-normalized,le=" . $dateto->output("iso");
+        $ccl_query .= ' AND ' if ( $ccl_textbox || $datefrom );
+        $ccl_query .= "acqdate,le,st-date-normalized=" . $dateto;
     }
 
     my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
-    ( $error, $marcresults, $total_hits ) =
-      SimpleSearch( $ccl_query, $offset, $resultsperpage );
+    my $searcher = Koha::SearchEngine::Search->new({index => 'biblios'});
+    ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($ccl_query, $offset, $resultsperpage);
 
     if (!defined $error && @{$marcresults} ) {
         $show_results = @{$marcresults};
     }
     else {
-        $debug and warn "ERROR label-item-search: no results from SimpleSearch";
+        Koha::Logger->get->warn("ERROR label-item-search: no results from simple_search_compat");
 
         # leave $show_results undef
     }
@@ -106,57 +93,45 @@ if ($show_results) {
     my $hits = $show_results;
     my @results_set = ();
     my @items =();
-    # This code needs to be refactored using these subs...
-    #my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
-    #my $dat = &GetBiblioData( $biblio->{biblionumber} );
     for ( my $i = 0 ; $i < $hits ; $i++ ) {
         my @row_data= ();
         #DEBUG Notes: Decode the MARC record from each resulting MARC record...
-        my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
+        my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $marcresults->[$i] );
         #DEBUG Notes: Transform it to Koha form...
-        my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
+        my $biblio = TransformMarcToKoha({ record => $marcrecord });
         #DEBUG Notes: Stuff the bib into @biblio_data...
         push (@results_set, $biblio);
         my $biblionumber = $biblio->{'biblionumber'};
         #DEBUG Notes: Grab the item numbers associated with this MARC record...
-        my $itemnums = get_itemnumbers_of($biblionumber);
+        my $items = Koha::Items->search({ biblionumber => $biblionumber }, { order_by => { -desc => 'itemnumber' }});
         #DEBUG Notes: Retrieve the item data for each number...
-        if (my $iii = $itemnums->{$biblionumber}) {
-            my $item_results = GetItemInfosOf(@$iii);
-            foreach my $item ( keys %$item_results ) {
-                #DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
-                if ($item_results->{$item}->{'biblionumber'} eq $results_set[$i]->{'biblionumber'}) {
-                    my $item_data;
-                    $item_data->{'_item_number'} = $item_results->{$item}->{'itemnumber'};
-                    $item_data->{'_item_call_number'} = ($item_results->{$item}->{'itemcallnumber'} ? $item_results->{$item}->{'itemcallnumber'} : 'NA');
-                    $item_data->{'_date_accessioned'} = $item_results->{$item}->{'dateaccessioned'};
-                    $item_data->{'_barcode'} = ( $item_results->{$item}->{'barcode'} ? $item_results->{$item}->{'barcode'} : 'NA');
-                    $item_data->{'_add'} = $item_results->{$item}->{'itemnumber'};
-                    unshift (@row_data, $item_data);    # item numbers are given to us in descending order by get_itemnumbers_of()...
-                }
+        while ( my $item = $items->next ) {
+            #DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
+            if ( $item->biblionumber eq $results_set[$i]->{'biblionumber'} ) {
+                my $item_data;
+                $item_data->{'_item_number'}      = $item->itemnumber;
+                $item_data->{'_item_call_number'} = ( $item->itemcallnumber || 'NA' );
+                $item_data->{'_date_accessioned'} = $item->dateaccessioned;
+                $item_data->{'_barcode'}          = ( $item->barcode || 'NA' );
+                $item_data->{'_add'}              = $item->itemnumber;
+                push @row_data, $item_data;
             }
             $results_set[$i]->{'item_table'} = html_table($display_columns, \@row_data);
         }
-        else {
-            # FIXME: Some error trapping code needed
-            warn sprintf('No item numbers retrieved for biblio number: %s', $biblionumber);
-        }
     }
 
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "labels/result.tmpl",
+            template_name   => "labels/result.tt",
             query           => $query,
             type            => "intranet",
-            authnotrequired => 0,
-            flagsrequired   => { borrowers => 1 },
+            flagsrequired   => { borrowers => 'edit_borrowers' },
             flagsrequired   => { catalogue => 1 },
-            debug           => 1,
         }
     );
 
     # build page nav stuff.
-    my ( @field_data, @numbers );
+    my @numbers;
     $total = $total_hits;
 
     my ( $from, $to, $startfromnext, $startfromprev, $displaynext,
@@ -190,6 +165,8 @@ if ($show_results) {
 
     }
     else {
+        $from = 1;
+        $to = $total_hits;
         $displayprev = 0;
         $displaynext = 0;
     }
@@ -212,7 +189,6 @@ if ($show_results) {
         result_set=> \@results_set,
         batch_id  => $batch_id,
         type      => $type,
-        idx       => $idx,
         ccl_query => $ccl_query,
     );
 }
@@ -224,20 +200,21 @@ if ($show_results) {
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "labels/search.tmpl",
+            template_name   => "labels/search.tt",
             query           => $query,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1 },
-            debug           => 1,
         }
     );
-    my $itemtypes = GetItemTypes;
+    my $itemtypes = Koha::ItemTypes->search;
     my @itemtypeloop;
-    foreach my $thisitemtype ( keys %$itemtypes ) {
+    while ( my $itemtype = $itemtypes->next ) {
+        # FIXME This must be improved:
+        # - pass the iterator to the template
+        # - display the translated_description
         my %row = (
-            value       => $thisitemtype,
-            description => $itemtypes->{$thisitemtype}->{'description'},
+            value       => $itemtype->itemtype,
+            description => $itemtype->description,
         );
         push @itemtypeloop, \%row;
     }
@@ -249,6 +226,7 @@ else {
 
 }
 
+$template->param( idx => $idx );
+
 # Print the page
-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), );
 output_html_with_http_headers $query, $cookie, $template->output;