X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fsubscription-bib-search.pl;h=eba631809efe8d1a3a287252fa4d9858e6289ea0;hb=d339abf0bfc334a819818bbb9b4c31f23326cbd1;hp=4f2e2bf23d10a22b7f455d92a3a89ba54d63e385;hpb=fc1342f73df868410e0ab670981f25ba2e1acd74;p=koha.git

diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
index 4f2e2bf23d..eba631809e 100755
--- a/serials/subscription-bib-search.pl
+++ b/serials/subscription-bib-search.pl
@@ -48,19 +48,20 @@ to multipage gestion.
 
 
 use strict;
-require Exporter;
+use warnings;
+
 use CGI;
 use C4::Koha;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Search;
 use C4::Biblio;
+use C4::Debug;
 
 my $input=new CGI;
 # my $type=$query->param('type');
-my $op = $input->param('op');
+my $op = $input->param('op') || q{};
 my $dbh = C4::Context->dbh;
 
 my $startfrom=$input->param('startfrom');
@@ -68,13 +69,27 @@ $startfrom=0 unless $startfrom;
 my ($template, $loggedinuser, $cookie);
 my $resultsperpage;
 
-if ($op eq "do_search") {
-    my $query = $input->param('q');
-
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
+my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
+
+my $query = $input->param('q');
+# don't run the search if no search term !
+if ($op eq "do_search" && $query) {
+
+    # add the itemtype limit if applicable
+    my $itemtypelimit = $input->param('itemtypelimit');
+    if ( $itemtypelimit ) {
+	if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {                                                                 
+	    $query .= " AND $itype_or_itemtype=$itemtypelimit";
+	} else {
+	    $query .= " AND $advanced_search_types=$itemtypelimit";
+	}
+    }
+    $debug && warn $query; 
     $resultsperpage= $input->param('resultsperpage');
-    $resultsperpage = 19 if(!defined $resultsperpage);
+    $resultsperpage = 20 if(!defined $resultsperpage);
 
-    my ($error,$marcrecords) = SimpleSearch($query);
+    my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage);
     my $total = scalar @$marcrecords;
 
     if (defined $error) {
@@ -84,12 +99,11 @@ if ($op eq "do_search") {
         exit;
     }
     my @results;
-    warn "total=".$total;
-    
+
     for(my $i=0;$i<$total;$i++) {
         my %resultsloop;
         my $marcrecord = MARC::File::USMARC::decode($marcrecords->[$i]);
-        my $biblio = MARCmarc2koha(C4::Context->dbh,$marcrecord,'');
+        my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
 
         #build the hash for the template.
         $resultsloop{highlight}       = ($i % 2)?(1):(0);
@@ -102,7 +116,7 @@ if ($op eq "do_search") {
 
         push @results, \%resultsloop;
     }
-    
+
     ($template, $loggedinuser, $cookie)
         = get_template_and_user({template_name => "serials/result.tmpl",
                 query => $input,
@@ -116,14 +130,14 @@ if ($op eq "do_search") {
     # multi page display gestion
     my $displaynext=0;
     my $displayprev=$startfrom;
-    if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
+    if(($total_hits - (($startfrom+1)*($resultsperpage))) > 0 ){
         $displaynext = 1;
     }
 
 
     my @numbers = ();
 
-    if ($total>$resultsperpage)
+    if ($total_hits>$resultsperpage)
     {
         for (my $i=1; $i<$total/$resultsperpage+1; $i++)
         {
@@ -139,10 +153,11 @@ if ($op eq "do_search") {
         }
     }
 
-    my $from = $startfrom*$resultsperpage+1;
+    my $from = 0;
+    $from = $startfrom*$resultsperpage+1 if($total_hits > 0);
     my $to;
 
-    if($total < (($startfrom+1)*$resultsperpage))
+    if($total_hits < (($startfrom+1)*$resultsperpage))
     {
         $to = $total;
     } else {
@@ -157,13 +172,48 @@ if ($op eq "do_search") {
                             resultsperpage => $resultsperpage,
                             startfromnext => $startfrom+1,
                             startfromprev => $startfrom-1,
-                            total=>$total,
+                            total=>$total_hits,
                             from=>$from,
                             to=>$to,
                             numbers=>\@numbers,
                             );
-} # end of if ($op eq "do_search")
+} # end of if ($op eq "do_search" & $query)
  else {
+    my @itemtypesloop;
+    if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {                                                                 
+	# load the itemtypes
+	my $itemtypes = GetItemTypes;
+	my $selected=1;
+	my $cnt;
+	foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
+	    my %row =(
+			code => $thisitemtype,
+			selected => $selected,
+			description => $itemtypes->{$thisitemtype}->{'description'},
+		    );
+	    $selected = 0 if ($selected) ;
+	    push @itemtypesloop, \%row;
+	}
+
+
+    } else {
+	my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+	my $cnt;
+	my $selected=1;
+	for my $thisitemtype (sort {$a->{'lib'} cmp $b->{'lib'}} @$advsearchtypes) {
+	    my %row =(
+		    number=>$cnt++,
+		    ccl => $advanced_search_types,
+		    code => $thisitemtype->{authorised_value},
+		    selected => $selected,
+		    description => $thisitemtype->{'lib'},
+		    count5 => $cnt % 4,
+		    imageurl=> getitemtypeimagelocation( 'intranet', $thisitemtype->{'imageurl'} ),
+		);
+	    push @itemtypesloop, \%row;
+	}
+    }
+
     ($template, $loggedinuser, $cookie)
         = get_template_and_user({template_name => "serials/subscription-bib-search.tmpl",
                 query => $input,
@@ -173,21 +223,14 @@ if ($op eq "do_search") {
                 debug => 1,
                 });
 
-    my  %itemtypes = GetItemTypes();
-    my @values = values %itemtypes;
-    my $CGIitemtype=CGI::scrolling_list(
-            -name     => 'value',
-            -values   => \@values,
-            -labels   => \%itemtypes,
-            -size     => 1,
-            -multiple => 0
-    );
-
-    $template->param(
-            CGIitemtype => $CGIitemtype,
-    );
+ 
+    if ($op eq "do_search") {
+       $template->param("no_query" => 1);
+    } else {
+       $template->param("no_query" => 0);
+    }
+    $template->param(itemtypeloop => \@itemtypesloop);
 }
-
 # Print the page
 output_html_with_http_headers $input, $cookie, $template->output;