X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fsubscription-bib-search.pl;h=95e4aa770e068abe59bc310f208d7867fcb0bd8f;hb=9af08e4e2d2091de489633b3f1c4fb03fcf323cd;hp=eba631809efe8d1a3a287252fa4d9858e6289ea0;hpb=20548648831c36310341034157a9fe70f8c594ad;p=koha_fer

diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
index eba631809e..95e4aa770e 100755
--- a/serials/subscription-bib-search.pl
+++ b/serials/subscription-bib-search.pl
@@ -2,6 +2,7 @@
 # WARNING: 4-character tab stops here
 
 # Copyright 2000-2002 Katipo Communications
+# Parts Copyright 2010 Biblibre
 #
 # This file is part of Koha.
 #
@@ -14,9 +15,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 NAME
@@ -76,21 +77,42 @@ my $query = $input->param('q');
 # don't run the search if no search term !
 if ($op eq "do_search" && $query) {
 
+    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {   template_name   => "serials/result.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired => {catalogue => 1, serials => '*'},
+            debug           => 1,
+        }
+    );
+
     # 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";
-	}
+        my $QParser;
+        $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
+        my $op;
+        if ($QParser) {
+            $op = '&&';
+        } else {
+            $op = 'and';
+        }
+        if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
+            $query .= " $op $itype_or_itemtype:$itemtypelimit";
+        } else {
+            $query .= " $op $advanced_search_types:$itemtypelimit";
+        }
     }
-    $debug && warn $query; 
+    $debug && warn $query;
     $resultsperpage= $input->param('resultsperpage');
     $resultsperpage = 20 if(!defined $resultsperpage);
 
     my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage);
-    my $total = scalar @$marcrecords;
+    my $total = 0;
+    if (defined $marcrecords ) {
+        $total = scalar @{$marcrecords};
+    }
 
     if (defined $error) {
         $template->param(query_error => $error);
@@ -113,20 +135,11 @@ if ($op eq "do_search" && $query) {
         $resultsloop{author}          = $biblio->{'author'};
         $resultsloop{publishercode}   = $biblio->{'publishercode'};
         $resultsloop{publicationyear} = $biblio->{'publicationyear'};
+        $resultsloop{issn}            = $biblio->{'issn'};
 
         push @results, \%resultsloop;
     }
 
-    ($template, $loggedinuser, $cookie)
-        = get_template_and_user({template_name => "serials/result.tmpl",
-                query => $input,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {serials => 1},
-                flagsrequired => {catalogue => 1},
-                debug => 1,
-                });
-
     # multi page display gestion
     my $displaynext=0;
     my $displayprev=$startfrom;
@@ -178,9 +191,19 @@ if ($op eq "do_search" && $query) {
                             numbers=>\@numbers,
                             );
 } # end of if ($op eq "do_search" & $query)
- else {
+else {
+    ($template, $loggedinuser, $cookie)
+        = get_template_and_user({template_name => "serials/subscription-bib-search.tmpl",
+                query => $input,
+                type => "intranet",
+                authnotrequired => 0,
+                flagsrequired => {catalogue => 1, serials => '*'},
+                debug => 1,
+                });
+    # load the itemtypes
+    my $itemtypes = GetItemTypes;
     my @itemtypesloop;
-    if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {                                                                 
+    if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
 	# load the itemtypes
 	my $itemtypes = GetItemTypes;
 	my $selected=1;
@@ -214,16 +237,7 @@ if ($op eq "do_search" && $query) {
 	}
     }
 
-    ($template, $loggedinuser, $cookie)
-        = get_template_and_user({template_name => "serials/subscription-bib-search.tmpl",
-                query => $input,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {catalogue => 1, serials=>1},
-                debug => 1,
-                });
 
- 
     if ($op eq "do_search") {
        $template->param("no_query" => 1);
     } else {