X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fsubscription-bib-search.pl;h=bda92dde0d672455befc3e2e5ec5aff1bba1acf9;hb=66b2cb4e38a20ad7ada3b693be392c70f65edd03;hp=1620ed8ba0aa61fb12cc5b7bb241af8055e9447b;hpb=abf523e751e980f6030dff047d9b872930b539a1;p=koha.git

diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
index 1620ed8ba0..bda92dde0d 100755
--- a/serials/subscription-bib-search.pl
+++ b/serials/subscription-bib-search.pl
@@ -52,58 +52,63 @@ require Exporter;
 use CGI;
 use C4::Koha;
 use C4::Auth;
-use HTML::Template;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::SearchMarc;
+use C4::Search;
+use C4::Biblio;
 
-my $query=new CGI;
+my $input=new CGI;
 # my $type=$query->param('type');
-my $op = $query->param('op');
+my $op = $input->param('op');
 my $dbh = C4::Context->dbh;
 
-my $startfrom=$query->param('startfrom');
+my $startfrom=$input->param('startfrom');
 $startfrom=0 unless $startfrom;
 my ($template, $loggedinuser, $cookie);
 my $resultsperpage;
 
-if ($op eq "do_search") {
-    my @marclist = $query->param('marclist');
-    my @and_or = $query->param('and_or');
-    my @excluding = $query->param('excluding');
-    my @operator = $query->param('operator');
-    my @value = $query->param('value');
+my $query = $input->param('q');
+# don't run the search if no search term !
+if ($op eq "do_search" && $query) {
 
-    $resultsperpage= $query->param('resultsperpage');
+    $resultsperpage= $input->param('resultsperpage');
     $resultsperpage = 19 if(!defined $resultsperpage);
-    my $orderby = $query->param('orderby');
-
-    # builds tag and subfield arrays
-    my @tags;
-
-    foreach my $marc (@marclist) {
-        if ($marc) {
-            my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,$marc);
-            if ($tag) {
-                push @tags,$dbh->quote("$tag$subfield");
-            } else {
-                push @tags, $dbh->quote(substr($marc,0,4));
-            }
-        } else {
-            push @tags, "";
-        }
-    }
-    my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
-                               \@excluding, \@operator, \@value,
-                               $startfrom*$resultsperpage, $resultsperpage,$orderby);
 
+    my ($error,$marcrecords) = SimpleSearch($query);
+    my $total = scalar @$marcrecords;
+
+    if (defined $error) {
+        $template->param(query_error => $error);
+        warn "error: ".$error;
+        output_html_with_http_headers $input, $cookie, $template->output;
+        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 = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
+
+        #build the hash for the template.
+        $resultsloop{highlight}       = ($i % 2)?(1):(0);
+        $resultsloop{title}           = $biblio->{'title'};
+        $resultsloop{subtitle}        = $biblio->{'subtitle'};
+        $resultsloop{biblionumber}    = $biblio->{'biblionumber'};
+        $resultsloop{author}          = $biblio->{'author'};
+        $resultsloop{publishercode}   = $biblio->{'publishercode'};
+        $resultsloop{publicationyear} = $biblio->{'publicationyear'};
+
+        push @results, \%resultsloop;
+    }
+    
     ($template, $loggedinuser, $cookie)
         = get_template_and_user({template_name => "serials/result.tmpl",
-                query => $query,
+                query => $input,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {borrowers => 1},
+                flagsrequired => {serials => 1},
                 flagsrequired => {catalogue => 1},
                 debug => 1,
                 });
@@ -115,17 +120,6 @@ if ($op eq "do_search") {
         $displaynext = 1;
     }
 
-    my @field_data = ();
-
-
-    for(my $i = 0 ; $i <= $#marclist ; $i++)
-    {
-        push @field_data, { term => "marclist", val=>$marclist[$i] };
-        push @field_data, { term => "and_or", val=>$and_or[$i] };
-        push @field_data, { term => "excluding", val=>$excluding[$i] };
-        push @field_data, { term => "operator", val=>$operator[$i] };
-        push @field_data, { term => "value", val=>$value[$i] };
-    }
 
     my @numbers = ();
 
@@ -139,7 +133,7 @@ if ($op eq "do_search") {
                 ($startfrom==($i-1)) && ($highlight=1);
                 push @numbers, { number => $i,
                     highlight => $highlight ,
-                    searchdata=> \@field_data,
+                    searchdata=> \@results,
                     startfrom => ($i-1)};
             }
         }
@@ -154,47 +148,47 @@ if ($op eq "do_search") {
     } else {
         $to = (($startfrom+1)*$resultsperpage);
     }
-    $template->param(result => $results,
+    $template->param(
+                            query => $query,
+                            resultsloop => \@results,
                             startfrom=> $startfrom,
                             displaynext=> $displaynext,
                             displayprev=> $displayprev,
                             resultsperpage => $resultsperpage,
                             startfromnext => $startfrom+1,
                             startfromprev => $startfrom-1,
-                            searchdata=>\@field_data,
                             total=>$total,
                             from=>$from,
                             to=>$to,
                             numbers=>\@numbers,
                             );
-} else {
+} # end of if ($op eq "do_search" & $query)
+ elsif ($op eq "do_search") {
     ($template, $loggedinuser, $cookie)
         = get_template_and_user({template_name => "serials/subscription-bib-search.tmpl",
-                query => $query,
+                query => $input,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {catalogue => 1},
+                flagsrequired => {catalogue => 1, serials=>1},
+                debug => 1,
+                });
+    $template->param("no_query" => 1);
+}
+ 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=>1},
                 debug => 1,
                 });
 
-    my  %itemtypes = GetItemTypes();
-    my @values = values %itemtypes;
-    my @labels = keys %itemtypes;
-    my $CGIitemtype=CGI::scrolling_list(
-            -name     => 'value',
-            -values   => \@values,
-            -labels   => \@labels,
-            -size     => 1,
-            -multiple => 0
-    );
-
-    $template->param(
-            CGIitemtype => $CGIitemtype,
-    );
+    $template->param("no_query" => 0);
 }
 
 # Print the page
-output_html_with_http_headers $query, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $template->output;
 
 # Local Variables:
 # tab-width: 4