use strict;
-require Exporter;
+use warnings;
+
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');
-
- $resultsperpage= $query->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 $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 ) {
+ my $index = C4::Context->preference("item-level_itypes") ? 'itype' : 'itemtype';
+ $query .= " AND $index=$itemtypelimit";
+ }
+
+ $resultsperpage= $input->param('resultsperpage');
+ $resultsperpage = 20 if(!defined $resultsperpage);
+
+ my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage);
+ 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;
+
+ 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;
}
- my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
- \@excluding, \@operator, \@value,
- $startfrom*$resultsperpage, $resultsperpage,$orderby);
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "serials/result.tmpl",
- query => $query,
+ query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
- flagsrequired => {catalogue => 1},
+ flagsrequired => {catalogue => 1, serials => '*'},
debug => 1,
});
# 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 @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 = ();
- if ($total>$resultsperpage)
+ if ($total_hits>$resultsperpage)
{
for (my $i=1; $i<$total/$resultsperpage+1; $i++)
{
($startfrom==($i-1)) && ($highlight=1);
push @numbers, { number => $i,
highlight => $highlight ,
- searchdata=> \@field_data,
+ searchdata=> \@results,
startfrom => ($i-1)};
}
}
}
- 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 {
$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,
+ total=>$total_hits,
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 => '*'},
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,
- );
+ # load the itemtypes
+ my $itemtypes = GetItemTypes;
+ my @itemtypesloop;
+ 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;
+ }
+ $template->param(itemtypeloop => \@itemtypesloop);
+ $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 => '*'},
+ debug => 1,
+ });
+ # load the itemtypes
+ my $itemtypes = GetItemTypes;
+ my @itemtypesloop;
+ 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;
+ }
+ $template->param(itemtypeloop => \@itemtypesloop);
+ $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
projects / koha.git / blobdiff