use C4::Biblio; # GetMarcFromKohaField
use C4::Koha; # getFacets
use Lingua::Stem;
+use C4::Search::PazPar2;
+use XML::Simple;
use C4::Dates qw(format_date);
+use C4::XSLT;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
=head2 SimpleSearch
-($error,$results) = SimpleSearch($query,@servers);
+( $error, $results, $total_hits ) = SimpleSearch( $query, $offset, $max_results, [@servers] );
This function provides a simple search API on the bibliographic catalog
* $query can be a simple keyword or a complete CCL query
* @servers is optional. Defaults to biblioserver as found in koha-conf.xml
+ * $offset - If present, represents the number of records at the beggining to omit. Defaults to 0
+ * $max_results - if present, determines the maximum number of records to fetch. undef is All. defaults to undef.
+
+
+=item C<Output:>
-=item C<Output arg:>
* $error is a empty unless an error is detected
* \@results is an array of records.
+ * $total_hits is the number of hits that would have been returned with no limit
=item C<usage in the script:>
=back
-my ($error, $marcresults) = SimpleSearch($query);
+my ( $error, $marcresults, $total_hits ) = SimpleSearch($query);
if (defined $error) {
$template->param(query_error => $error);
my $hits = scalar @$marcresults;
my @results;
-for(my $i=0;$i<$hits;$i++) {
+for my $i (0..$hits) {
my %resultsloop;
my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
=cut
sub SimpleSearch {
- my $query = shift;
+ my ( $query, $offset, $max_results, $servers ) = @_;
+
if ( C4::Context->preference('NoZebra') ) {
my $result = NZorder( NZanalyse($query) )->{'biblioserver'};
my $search_result =
( $result->{hits}
&& $result->{hits} > 0 ? $result->{'RECORDS'} : [] );
- return ( undef, $search_result );
+ return ( undef, $search_result, scalar($search_result) );
}
else {
- my @servers = @_;
+ # FIXME hardcoded value. See catalog/search.pl & opac-search.pl too.
+ my @servers = defined ( $servers ) ? @$servers : ( "biblioserver" );
my @results;
+ my @zoom_queries;
my @tmpresults;
my @zconns;
- return ( "No query entered", undef ) unless $query;
-
- # FIXME hardcoded value. See catalog/search.pl & opac-search.pl too.
- @servers = ("biblioserver") unless @servers;
+ my $total_hits;
+ return ( "No query entered", undef, undef ) unless $query;
# Initialize & Search Zebra
for ( my $i = 0 ; $i < @servers ; $i++ ) {
eval {
$zconns[$i] = C4::Context->Zconn( $servers[$i], 1 );
- $tmpresults[$i] =
- $zconns[$i]
- ->search( new ZOOM::Query::CCL2RPN( $query, $zconns[$i] ) );
+ $zoom_queries[$i] = new ZOOM::Query::CCL2RPN( $query, $zconns[$i]);
+ $tmpresults[$i] = $zconns[$i]->search( $zoom_queries[$i] );
# error handling
my $error =
. $zconns[$i]->addinfo() . " "
. $zconns[$i]->diagset();
- return ( $error, undef ) if $zconns[$i]->errcode();
+ return ( $error, undef, undef ) if $zconns[$i]->errcode();
};
if ($@) {
. $@->addinfo() . " "
. $@->diagset();
warn $error;
- return ( $error, undef );
+ return ( $error, undef, undef );
}
}
- my $hits;
- my $ev;
while ( ( my $i = ZOOM::event( \@zconns ) ) != 0 ) {
- $ev = $zconns[ $i - 1 ]->last_event();
- if ( $ev == ZOOM::Event::ZEND ) {
- $hits = $tmpresults[ $i - 1 ]->size();
- }
- if ( $hits > 0 ) {
- for ( my $j = 0 ; $j < $hits ; $j++ ) {
- my $record = $tmpresults[ $i - 1 ]->record($j)->raw();
+ my $event = $zconns[ $i - 1 ]->last_event();
+ if ( $event == ZOOM::Event::ZEND ) {
+
+ my $first_record = defined( $offset ) ? $offset+1 : 1;
+ my $hits = $tmpresults[ $i - 1 ]->size();
+ $total_hits += $hits;
+ my $last_record = $hits;
+ if ( defined $max_results && $offset + $max_results < $hits ) {
+ $last_record = $offset + $max_results;
+ }
+
+ for my $j ( $first_record..$last_record ) {
+ my $record = $tmpresults[ $i - 1 ]->record( $j-1 )->raw(); # 0 indexed
push @results, $record;
}
}
}
- return ( undef, \@results );
+
+ foreach my $result (@tmpresults) {
+ $result->destroy();
+ }
+ foreach my $zoom_query (@zoom_queries) {
+ $zoom_query->destroy();
+ }
+
+ return ( undef, \@results, $total_hits );
}
}
# perform the search, create the results objects
# if this is a local search, use the $koha-query, if it's a federated one, use the federated-query
- my $query_to_use;
- if ( $servers[$i] =~ /biblioserver/ ) {
- $query_to_use = $koha_query;
- }
- else {
- $query_to_use = $simple_query;
- }
+ my $query_to_use = ($servers[$i] =~ /biblioserver/) ? $koha_query : $simple_query;
#$query_to_use = $simple_query if $scan;
warn $simple_query if ( $scan and $DEBUG );
my $tmpauthor;
# the minimal record in author/title (depending on MARC flavour)
- if ( C4::Context->preference("marcflavour") eq
- "UNIMARC" )
- {
- $tmptitle = MARC::Field->new(
- '200', ' ', ' ',
- a => $term,
- f => $occ
- );
- }
- else {
- $tmptitle =
- MARC::Field->new( '245', ' ', ' ', a => $term, );
- $tmpauthor =
- MARC::Field->new( '100', ' ', ' ', a => $occ, );
+ if (C4::Context->preference("marcflavour") eq "UNIMARC") {
+ $tmptitle = MARC::Field->new('200',' ',' ', a => $term, f => $occ);
+ $tmprecord->append_fields($tmptitle);
+ } else {
+ $tmptitle = MARC::Field->new('245',' ',' ', a => $term,);
+ $tmpauthor = MARC::Field->new('100',' ',' ', a => $occ,);
+ $tmprecord->append_fields($tmptitle);
+ $tmprecord->append_fields($tmpauthor);
}
- $tmprecord->append_fields($tmptitle);
- $tmprecord->append_fields($tmpauthor);
- $results_hash->{'RECORDS'}[$j] =
- $tmprecord->as_usmarc();
+ $results_hash->{'RECORDS'}[$j] = $tmprecord->as_usmarc();
}
# not an index scan
{
type_link_value => $link_value,
type_id => $link_value . "_id",
- type_label =>
- $facets_info->{$link_value}->{'label_value'},
+ "type_label_" . $facets_info->{$link_value}->{'label_value'} => 1,
facets => \@this_facets_array,
expandable => $expandable,
expand => $link_value,
}
- );
+ ) unless ( ($facets_info->{$link_value}->{'label_value'} =~ /Libraries/) and (C4::Context->preference('singleBranchMode')) );
}
}
}
return ( undef, $results_hashref, \@facets_loop );
}
+sub pazGetRecords {
+ my (
+ $koha_query, $simple_query, $sort_by_ref, $servers_ref,
+ $results_per_page, $offset, $expanded_facet, $branches,
+ $query_type, $scan
+ ) = @_;
+
+ my $paz = C4::Search::PazPar2->new(C4::Context->config('pazpar2url'));
+ $paz->init();
+ $paz->search($simple_query);
+ sleep 1;
+
+ # do results
+ my $results_hashref = {};
+ my $stats = XMLin($paz->stat);
+ my $results = XMLin($paz->show($offset, $results_per_page, 'work-title:1'), forcearray => 1);
+
+ # for a grouped search result, the number of hits
+ # is the number of groups returned; 'bib_hits' will have
+ # the total number of bibs.
+ $results_hashref->{'biblioserver'}->{'hits'} = $results->{'merged'}->[0];
+ $results_hashref->{'biblioserver'}->{'bib_hits'} = $stats->{'hits'};
+
+ HIT: foreach my $hit (@{ $results->{'hit'} }) {
+ my $recid = $hit->{recid}->[0];
+
+ my $work_title = $hit->{'md-work-title'}->[0];
+ my $work_author;
+ if (exists $hit->{'md-work-author'}) {
+ $work_author = $hit->{'md-work-author'}->[0];
+ }
+ my $group_label = (defined $work_author) ? "$work_title / $work_author" : $work_title;
+
+ my $result_group = {};
+ $result_group->{'group_label'} = $group_label;
+ $result_group->{'group_merge_key'} = $recid;
+
+ my $count = 1;
+ if (exists $hit->{count}) {
+ $count = $hit->{count}->[0];
+ }
+ $result_group->{'group_count'} = $count;
+
+ for (my $i = 0; $i < $count; $i++) {
+ # FIXME -- may need to worry about diacritics here
+ my $rec = $paz->record($recid, $i);
+ push @{ $result_group->{'RECORDS'} }, $rec;
+ }
+
+ push @{ $results_hashref->{'biblioserver'}->{'GROUPS'} }, $result_group;
+ }
+
+ # pass through facets
+ my $termlist_xml = $paz->termlist('author,subject');
+ my $terms = XMLin($termlist_xml, forcearray => 1);
+ my @facets_loop = ();
+ #die Dumper($results);
+# foreach my $list (sort keys %{ $terms->{'list'} }) {
+# my @facets = ();
+# foreach my $facet (sort @{ $terms->{'list'}->{$list}->{'term'} } ) {
+# push @facets, {
+# facet_label_value => $facet->{'name'}->[0],
+# };
+# }
+# push @facets_loop, ( {
+# type_label => $list,
+# facets => \@facets,
+# } );
+# }
+
+ return ( undef, $results_hashref, \@facets_loop );
+}
+
# STOPWORDS
sub _remove_stopwords {
my ( $operand, $index ) = @_;
foreach ( keys %{ C4::Context->stopwords } ) {
next if ( $_ =~ /(and|or|not)/ ); # don't remove operators
if ( $operand =~
- /(\P{IsAlpha}$_\P{IsAlpha}|^$_\P{IsAlpha}|\P{IsAlpha}$_$)/ )
+ /(\P{IsAlpha}$_\P{IsAlpha}|^$_\P{IsAlpha}|\P{IsAlpha}$_$|^$_$)/ )
{
$operand =~ s/\P{IsAlpha}$_\P{IsAlpha}/ /gi;
$operand =~ s/^$_\P{IsAlpha}/ /gi;
$operand =~ s/\P{IsAlpha}$_$/ /gi;
+ $operand =~ s/$1//gi;
push @stopwords_removed, $_;
}
}
my ($operand) = @_;
my $stemmed_operand;
+ # If operand contains a digit, it is almost certainly an identifier, and should
+ # not be stemmed. This is particularly relevant for ISBNs and ISSNs, which
+ # can contain the letter "X" - for example, _build_stemmend_operand would reduce
+ # "014100018X" to "x ", which for a MARC21 database would bring up irrelevant
+ # results (e.g., "23 x 29 cm." from the 300$c). Bug 2098.
+ return $operand if $operand =~ /\d/;
+
# FIXME: the locale should be set based on the user's language and/or search choice
my $stemmer = Lingua::Stem->new( -locale => 'EN-US' );
sub buildQuery {
my ( $operators, $operands, $indexes, $limits, $sort_by, $scan ) = @_;
- warn "---------" if $DEBUG;
- warn "Enter buildQuery" if $DEBUG;
- warn "---------" if $DEBUG;
+ warn "---------\nEnter buildQuery\n---------" if $DEBUG;
# dereference
my @operators = @$operators if $operators;
if ( $index eq 'yr' ) {
$index .= ",st-numeric";
$indexes_set++;
- (
- $stemming, $auto_truncation,
- $weight_fields, $fuzzy_enabled,
- $remove_stopwords
- ) = ( 0, 0, 0, 0, 0 );
+ $stemming = $auto_truncation = $weight_fields = $fuzzy_enabled = $remove_stopwords = 0;
}
# Date of Acquisition
elsif ( $index eq 'acqdate' ) {
$index .= ",st-date-normalized";
$indexes_set++;
- (
+ $stemming = $auto_truncation = $weight_fields = $fuzzy_enabled = $remove_stopwords = 0;
+ }
+ # ISBN,ISSN,Standard Number, don't need special treatment
+ elsif ( $index eq 'nb' || $index eq 'ns' ) {
+ $indexes_set++;
+ (
$stemming, $auto_truncation,
$weight_fields, $fuzzy_enabled,
$remove_stopwords
) = ( 0, 0, 0, 0, 0 );
- }
+ }
# Set default structure attribute (word list)
my $struct_attr;
- unless ( !$index || $index =~ /(st-|phr|ext|wrdl)/ ) {
+ unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl)/ ) {
$struct_attr = ",wrdl";
}
$_ =~ s/^ //g; # remove any beginning spaces
$_ =~ s/ $//g; # remove any ending spaces
$_ =~ s/==/=/g; # remove double == from query
-
}
$query_cgi =~ s/^&//; # remove unnecessary & from beginning of the query cgi
+ for ($query_cgi,$simple_query) {
+ $_ =~ s/"//g;
+ }
# append the limit to the query
$query .= " " . $limit;
warn "LIMIT:" . $limit;
warn "LIMIT CGI:" . $limit_cgi;
warn "LIMIT DESC:" . $limit_desc;
- warn "---------";
- warn "Leave buildQuery";
- warn "---------";
+ warn "---------\nLeave buildQuery\n---------";
}
return (
undef, $query, $simple_query, $query_cgi,
# IMO this subroutine is pretty messy still -- it's responsible for
# building the HTML output for the template
sub searchResults {
- my ( $searchdesc, $hits, $results_per_page, $offset, @marcresults ) = @_;
+ my ( $searchdesc, $hits, $results_per_page, $offset, $scan, @marcresults ) = @_;
my $dbh = C4::Context->dbh;
- my $toggle;
my $even = 1;
my @newresults;
while ( my $bdata = $bsth->fetchrow_hashref ) {
$branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
}
- my %locations;
- my $lsch =
- $dbh->prepare(
-"SELECT authorised_value,lib FROM authorised_values WHERE category = 'LOC'"
- );
- $lsch->execute();
- while ( my $ldata = $lsch->fetchrow_hashref ) {
- $locations{ $ldata->{'authorised_value'} } = $ldata->{'lib'};
- }
+# FIXME - We build an authorised values hash here, using the default framework
+# though it is possible to have different authvals for different fws.
+
+ my $shelflocations =GetKohaAuthorisedValues('items.location','');
+
+ # get notforloan authorised value list (see $shelflocations FIXME)
+ my $notforloan_authorised_value = GetAuthValCode('items.notforloan','');
#Build itemtype hash
#find itemtype & itemtype image
);
$bsth->execute();
while ( my $bdata = $bsth->fetchrow_hashref ) {
- $itemtypes{ $bdata->{'itemtype'} }->{description} =
- $bdata->{'description'};
- $itemtypes{ $bdata->{'itemtype'} }->{imageurl} = $bdata->{'imageurl'};
- $itemtypes{ $bdata->{'itemtype'} }->{summary} = $bdata->{'summary'};
- $itemtypes{ $bdata->{'itemtype'} }->{notforloan} =
- $bdata->{'notforloan'};
+ foreach (qw(description imageurl summary notforloan)) {
+ $itemtypes{ $bdata->{'itemtype'} }->{$_} = $bdata->{$_};
+ }
}
#search item field code
$sth->execute;
my ($itemtag) = $sth->fetchrow;
- # get notforloan authorised value list
- $sth =
- $dbh->prepare(
-"SELECT authorised_value FROM `marc_subfield_structure` WHERE kohafield = 'items.notforloan' AND frameworkcode=''"
- );
- $sth->execute;
- my ($notforloan_authorised_value) = $sth->fetchrow;
-
## find column names of items related to MARC
my $sth2 = $dbh->prepare("SHOW COLUMNS FROM items");
$sth2->execute;
$times = $offset + $results_per_page;
}
else {
- $times = $hits;
+ $times = $hits; # FIXME: if $hits is undefined, why do we want to equal it?
}
# loop through all of the records we've retrieved
for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
- my $marcrecord;
- $marcrecord = MARC::File::USMARC::decode( $marcresults[$i] );
+ my $marcrecord = MARC::File::USMARC::decode( $marcresults[$i] );
my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, '' );
+ $oldbiblio->{subtitle} = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $marcrecord, '');
$oldbiblio->{result_number} = $i + 1;
# add imageurl to itemtype if there is one
- if ( $itemtypes{ $oldbiblio->{itemtype} }->{imageurl} =~ /^http:/ ) {
- $oldbiblio->{imageurl} =
- $itemtypes{ $oldbiblio->{itemtype} }->{imageurl};
- $oldbiblio->{description} =
- $itemtypes{ $oldbiblio->{itemtype} }->{description};
- }
- else {
- $oldbiblio->{imageurl} =
- getitemtypeimagesrc() . "/"
- . $itemtypes{ $oldbiblio->{itemtype} }->{imageurl}
- if ( $itemtypes{ $oldbiblio->{itemtype} }->{imageurl} );
- $oldbiblio->{description} =
- $itemtypes{ $oldbiblio->{itemtype} }->{description};
- }
-
+ $oldbiblio->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes{ $oldbiblio->{itemtype} }->{imageurl} );
+
+ my $biblio_authorised_value_images = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $oldbiblio->{biblionumber} ) );
+ $oldbiblio->{authorised_value_images} = $biblio_authorised_value_images;
+ (my $aisbn) = $oldbiblio->{isbn} =~ /([\d-]*[X]*)/;
+ $aisbn =~ s/-//g;
+ $oldbiblio->{amazonisbn} = $aisbn;
+ $oldbiblio->{description} = $itemtypes{ $oldbiblio->{itemtype} }->{description};
# Build summary if there is one (the summary is defined in the itemtypes table)
# FIXME: is this used anywhere, I think it can be commented out? -- JF
if ( $itemtypes{ $oldbiblio->{itemtype} }->{summary} ) {
}
# FIXME: yuk
$summary =~ s/\[(.*?)]//g;
- $summary =~ s/\n/<br>/g;
+ $summary =~ s/\n/<br\/>/g;
$oldbiblio->{summary} = $summary;
}
-# Add search-term highlighting to the whole record where they match using <span>s
- my $searchhighlightblob;
- for my $highlight_field ( $marcrecord->fields ) {
-
- # FIXME: need to skip title, subtitle, author, etc., as they are handled below
- next if $highlight_field->tag() =~ /(^00)/; # skip fixed fields
- for my $subfield ($highlight_field->subfields()) {
- my $match;
- next if $subfield->[0] eq '9';
- my $field = $subfield->[1];
- for my $term ( keys %$span_terms_hashref ) {
- if ( ( $field =~ /$term/i ) && (( length($term) > 3 ) || ($field =~ / $term /i)) ) {
- $field =~ s/$term/<span class=\"term\">$&<\/span>/gi;
- $match++;
+ # save an author with no <span> tag, for the <a href=search.pl?q=<!--tmpl_var name="author"-->> link
+ $oldbiblio->{'author_nospan'} = $oldbiblio->{'author'};
+ $oldbiblio->{'title_nospan'} = $oldbiblio->{'title'};
+ # Add search-term highlighting to the whole record where they match using <span>s
+ if (C4::Context->preference("OpacHighlightedWords")){
+ my $searchhighlightblob;
+ for my $highlight_field ( $marcrecord->fields ) {
+
+ # FIXME: need to skip title, subtitle, author, etc., as they are handled below
+ next if $highlight_field->tag() =~ /(^00)/; # skip fixed fields
+ for my $subfield ($highlight_field->subfields()) {
+ my $match;
+ next if $subfield->[0] eq '9';
+ my $field = $subfield->[1];
+ for my $term ( keys %$span_terms_hashref ) {
+ if ( ( $field =~ /$term/i ) && (( length($term) > 3 ) || ($field =~ / $term /i)) ) {
+ $field =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+ $match++;
+ }
}
+ $searchhighlightblob .= $field . " ... " if $match;
}
- $searchhighlightblob .= $field . " ... " if $match;
+
}
-
+ $searchhighlightblob = ' ... '.$searchhighlightblob if $searchhighlightblob;
+ $oldbiblio->{'searchhighlightblob'} = $searchhighlightblob;
}
- $searchhighlightblob = ' ... '.$searchhighlightblob if $searchhighlightblob;
- $oldbiblio->{'searchhighlightblob'} = $searchhighlightblob;
-
-# save an author with no <span> tag, for the <a href=search.pl?q=<!--tmpl_var name="author"-->> link
- $oldbiblio->{'author_nospan'} = $oldbiblio->{'author'};
# Add search-term highlighting to the title, subtitle, etc. fields
for my $term ( keys %$span_terms_hashref ) {
my $old_term = $term;
if ( length($term) > 3 ) {
$term =~ s/(.*=|\)|\(|\+|\.|\?|\[|\]|\\|\*)//g;
- $oldbiblio->{'title'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
- $oldbiblio->{'subtitle'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
- $oldbiblio->{'author'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
- $oldbiblio->{'publishercode'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
- $oldbiblio->{'place'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
- $oldbiblio->{'pages'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
- $oldbiblio->{'notes'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
- $oldbiblio->{'size'} =~
- s/$term/<span class=\"term\">$&<\/span>/gi;
+ foreach(qw(title subtitle author publishercode place pages notes size)) {
+ $oldbiblio->{$_} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+ }
}
}
- # FIXME:
- # surely there's a better way to handle this
- if ( $i % 2 ) {
- $toggle = "#ffffcc";
- }
- else {
- $toggle = "white";
- }
- $oldbiblio->{'toggle'} = $toggle;
+ ($i % 2) and $oldbiblio->{'toggle'} = 1;
# Pull out the items fields
my @fields = $marcrecord->field($itemtag);
my $onloan_items;
my $other_items;
- my $ordered_count = 0;
- my $available_count = 0;
- my $onloan_count = 0;
- my $longoverdue_count = 0;
- my $other_count = 0;
- my $wthdrawn_count = 0;
- my $itemlost_count = 0;
- my $itembinding_count = 0;
- my $itemdamaged_count = 0;
- my $can_place_holds = 0;
- my $items_count = scalar(@fields);
+ my $ordered_count = 0;
+ my $available_count = 0;
+ my $onloan_count = 0;
+ my $longoverdue_count = 0;
+ my $other_count = 0;
+ my $wthdrawn_count = 0;
+ my $itemlost_count = 0;
+ my $itembinding_count = 0;
+ my $itemdamaged_count = 0;
+ my $item_in_transit_count = 0;
+ my $can_place_holds = 0;
+ my $items_count = scalar(@fields);
my $items_counter;
my $maxitems =
( C4::Context->preference('maxItemsinSearchResults') )
foreach my $code ( keys %subfieldstosearch ) {
$item->{$code} = $field->subfield( $subfieldstosearch{$code} );
}
-
- # set item's branch name, use homebranch first, fall back to holdingbranch
- if ( $item->{'homebranch'} ) {
- $item->{'branchname'} = $branches{ $item->{homebranch} };
+ my $hbranch = C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch' ? 'homebranch' : 'holdingbranch';
+ my $otherbranch = C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch' ? 'holdingbranch' : 'homebranch';
+ # set item's branch name, use HomeOrHoldingBranch syspref first, fall back to the other one
+ if ($item->{$hbranch}) {
+ $item->{'branchname'} = $branches{$item->{$hbranch}};
}
-
- # Last resort
- elsif ( $item->{'holdingbranch'} ) {
- $item->{'branchname'} = $branches{ $item->{holdingbranch} };
+ elsif ($item->{$otherbranch}) { # Last resort
+ $item->{'branchname'} = $branches{$item->{$otherbranch}};
}
+ my $prefix = $item->{$hbranch} . '--' . $item->{location} . $item->{itype} . $item->{itemcallnumber};
# For each grouping of items (onloan, available, unavailable), we build a key to store relevant info about that item
if ( $item->{onloan} ) {
$onloan_count++;
- $onloan_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{due_date} = format_date( $item->{onloan} );
- $onloan_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{count}++ if $item->{'homebranch'};
- $onloan_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{branchname} = $item->{'branchname'};
- $onloan_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{location} = $locations{ $item->{location} };
- $onloan_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{itemcallnumber} = $item->{itemcallnumber};
- $onloan_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{imageurl} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
+ my $key = $prefix . $item->{due_date};
+ $onloan_items->{$key}->{due_date} = format_date($item->{onloan});
+ $onloan_items->{$key}->{count}++ if $item->{$hbranch};
+ $onloan_items->{$key}->{branchname} = $item->{branchname};
+ $onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} };
+ $onloan_items->{$key}->{itemcallnumber} = $item->{itemcallnumber};
+ $onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes{ $item->{itype} }->{imageurl} );
# if something's checked out and lost, mark it as 'long overdue'
if ( $item->{itemlost} ) {
- $onloan_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{longoverdue}++;
+ $onloan_items->{$prefix}->{longoverdue}++;
$longoverdue_count++;
- }
-
- # can place holds as long as this item isn't lost
- else {
+ } else { # can place holds as long as item isn't lost
$can_place_holds = 1;
}
}
$ordered_count++;
}
+ # is item in transit?
+ my $transfertwhen = '';
+ my ($transfertfrom, $transfertto);
+
+ unless ($item->{wthdrawn}
+ || $item->{itemlost}
+ || $item->{damaged}
+ || $item->{notforloan}
+ || $items_count > 20) {
+
+ # A couple heuristics to limit how many times
+ # we query the database for item transfer information, sacrificing
+ # accuracy in some cases for speed;
+ #
+ # 1. don't query if item has one of the other statuses
+ # 2. don't check transit status if the bib has
+ # more than 20 items
+ #
+ # FIXME: to avoid having the query the database like this, and to make
+ # the in transit status count as unavailable for search limiting,
+ # should map transit status to record indexed in Zebra.
+ #
+ ($transfertwhen, $transfertfrom, $transfertto) = C4::Circulation::GetTransfers($item->{itemnumber});
+ }
+
# item is withdrawn, lost or damaged
if ( $item->{wthdrawn}
|| $item->{itemlost}
|| $item->{damaged}
- || $item->{notforloan} )
+ || $item->{notforloan}
+ || ($transfertwhen ne ''))
{
- $wthdrawn_count++ if $item->{wthdrawn};
- $itemlost_count++ if $item->{itemlost};
- $itemdamaged_count++ if $item->{damaged};
+ $wthdrawn_count++ if $item->{wthdrawn};
+ $itemlost_count++ if $item->{itemlost};
+ $itemdamaged_count++ if $item->{damaged};
+ $item_in_transit_count++ if $transfertwhen ne '';
$item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
$other_count++;
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{wthdrawn} = $item->{wthdrawn};
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{itemlost} = $item->{itemlost};
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{damaged} = $item->{damaged};
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{notforloan} = GetAuthorisedValueDesc( '', '', $item->{notforloan}, '', '', $notforloan_authorised_value ) if $notforloan_authorised_value;
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{count}++ if $item->{'homebranch'};
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{branchname} = $item->{'branchname'};
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{location} = $locations{ $item->{location} };
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{itemcallnumber} = $item->{itemcallnumber};
- $other_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{imageurl} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
+ my $key = $prefix . $item->{status};
+ foreach (qw(wthdrawn itemlost damaged branchname itemcallnumber)) {
+ $other_items->{$key}->{$_} = $item->{$_};
+ }
+ $other_items->{$key}->{intransit} = ($transfertwhen ne '') ? 1 : 0;
+ $other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value;
+ $other_items->{$key}->{count}++ if $item->{$hbranch};
+ $other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
+ $other_items->{$key}->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes{ $item->{itype} }->{imageurl} );
}
-
# item is available
else {
$can_place_holds = 1;
$available_count++;
- $available_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{count}++ if $item->{'homebranch'};
- $available_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{branchname} = $item->{'branchname'};
- $available_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{location} = $locations{ $item->{location} };
- $available_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{itemcallnumber} = $item->{itemcallnumber};
- $available_items->{ $item->{'homebranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{imageurl} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
+ $available_items->{$prefix}->{count}++ if $item->{$hbranch};
+ foreach (qw(branchname itemcallnumber)) {
+ $available_items->{$prefix}->{$_} = $item->{$_};
+ }
+ $available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
+ $available_items->{$prefix}->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes{ $item->{itype} }->{imageurl} );
}
}
} # notforloan, item level and biblioitem level
my ( $availableitemscount, $onloanitemscount, $otheritemscount );
- my $maxitems =
+ $maxitems =
( C4::Context->preference('maxItemsinSearchResults') )
? C4::Context->preference('maxItemsinSearchResults') - 1
: 1;
for my $key ( sort keys %$onloan_items ) {
- $onloanitemscount++;
- push @onloan_items_loop, $onloan_items->{$key}
- unless $onloanitemscount > $maxitems;
+ (++$onloanitemscount > $maxitems) and last;
+ push @onloan_items_loop, $onloan_items->{$key};
}
for my $key ( sort keys %$other_items ) {
- $otheritemscount++;
- push @other_items_loop, $other_items->{$key}
- unless $otheritemscount > $maxitems;
+ (++$otheritemscount > $maxitems) and last;
+ push @other_items_loop, $other_items->{$key};
}
for my $key ( sort keys %$available_items ) {
- $availableitemscount++;
+ (++$availableitemscount > $maxitems) and last;
push @available_items_loop, $available_items->{$key}
- unless $availableitemscount > $maxitems;
}
-# last check for norequest : if itemtype is notforloan, it can't be reserved either, whatever the items
+ # XSLT processing of some stuff
+ if (C4::Context->preference("XSLTResultsDisplay") && !$scan) {
+ my $newxmlrecord = XSLTParse4Display($oldbiblio->{biblionumber},C4::Context->config('opachtdocs')."/prog/en/xslt/MARC21slim2OPACResults.xsl");
+ $oldbiblio->{XSLTResultsRecord} = $newxmlrecord;
+ }
+
+ # last check for norequest : if itemtype is notforloan, it can't be reserved either, whatever the items
$can_place_holds = 0
if $itemtypes{ $oldbiblio->{itemtype} }->{notforloan};
$oldbiblio->{norequests} = 1 unless $can_place_holds;
$oldbiblio->{wthdrawncount} = $wthdrawn_count;
$oldbiblio->{itemlostcount} = $itemlost_count;
$oldbiblio->{damagedcount} = $itemdamaged_count;
+ $oldbiblio->{intransitcount} = $item_in_transit_count;
$oldbiblio->{orderedcount} = $ordered_count;
$oldbiblio->{isbn} =~
s/-//g; # deleting - in isbn to enable amazon content
+ $oldbiblio->{'authorised_value_images'} = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $oldbiblio->{'biblionumber'} ) );
push( @newresults, $oldbiblio );
}
return @newresults;
}
}
warn "string :" . $string if $DEBUG;
- $string =~ /(.*?)( and | or | not | AND | OR | NOT )(.*)/;
- my $left = $1;
- my $right = $3;
- my $operator = lc($2); # FIXME: and/or/not are operators, not operands
+ my $left = "";
+ my $right = "";
+ my $operator = "";
+ if ($string =~ /(.*?)( and | or | not | AND | OR | NOT )(.*)/) {
+ $left = $1;
+ $right = $3;
+ $operator = lc($2); # FIXME: and/or/not are operators, not operands
+ }
warn "no parenthesis. left : $left operator: $operator right: $right"
if $DEBUG;
else {
$string =~ s/__X__/"$commacontent"/ if $commacontent;
$string =~ s/-|\.|\?|,|;|!|'|\(|\)|\[|\]|{|}|"|&|\+|\*|\// /g;
+ #remove trailing blank at the beginning
+ $string =~ s/^ //g;
warn "leaf:$string" if $DEBUG;
# parse the string in in operator/operand/value again
- $string =~ /(.*)(>=|<=)(.*)/;
- my $left = $1;
- my $operator = $2;
- my $right = $3;
-# warn "handling leaf... left:$left operator:$operator right:$right"
-# if $DEBUG;
- unless ($operator) {
- $string =~ /(.*)(>|<|=)(.*)/;
+ my $left = "";
+ my $operator = "";
+ my $right = "";
+ if ($string =~ /(.*)(>=|<=)(.*)/) {
$left = $1;
$operator = $2;
$right = $3;
-# warn
-# "handling unless (operator)... left:$left operator:$operator right:$right"
-# if $DEBUG;
+ } else {
+ $left = $string;
+ }
+# warn "handling leaf... left:$left operator:$operator right:$right"
+# if $DEBUG;
+ unless ($operator) {
+ if ($string =~ /(.*)(>|<|=)(.*)/) {
+ $left = $1;
+ $operator = $2;
+ $right = $3;
+ warn
+ "handling unless (operator)... left:$left operator:$operator right:$right"
+ if $DEBUG;
+ } else {
+ $left = $string;
+ }
}
my $results;
# strip adv, zebra keywords, currently not handled in nozebra: wrdl, ext, phr...
- $left =~ s/[, ].*$//;
+ $left =~ s/ .*$//;
# automatic replace for short operators
$left = 'title' if $left =~ '^ti$';
$left = 'subject' if $left =~ '^su$';
$left = 'koha-Auth-Number' if $left =~ '^an$';
$left = 'keyword' if $left =~ '^kw$';
- warn "handling leaf... left:$left operator:$operator right:$right";
+ warn "handling leaf... left:$left operator:$operator right:$right" if $DEBUG;
if ( $operator && $left ne 'keyword' ) {
#do a specific search
$dbh->prepare(
"SELECT biblionumbers,value FROM nozebra WHERE server=? AND indexname=? AND value $operator ?"
);
- warn "$left / $operator / $right\n";
+ warn "$left / $operator / $right\n" if $DEBUG;
# split each word, query the DB and build the biblionumbers result
#sanitizing leftpart
my $biblionumbers;
$_ =~ s/^\s+|\s+$//;
next unless $_;
- warn "EXECUTE : $server, $left, $_";
+ warn "EXECUTE : $server, $left, $_" if $DEBUG;
$sth->execute( $server, $left, $_ )
or warn "execute failed: $!";
while ( my ( $line, $value ) = $sth->fetchrow ) {
unless ( $right =~ /^\d+$/ && $value =~ /\D/ );
warn "result : $value "
. ( $right =~ /\d/ ) . "=="
- . ( $value =~ /\D/?$line:"" ); #= $line";
+ . ( $value =~ /\D/?$line:"" ) if $DEBUG; #= $line";
}
# do a AND with existing list if there is one, otherwise, use the biblionumbers list as 1st result list
if ($results) {
- warn "NZAND";
+ warn "NZAND" if $DEBUG;
$results = NZoperatorAND($biblionumbers,$results);
}
else {
warn "return : $results for LEAF : $string" if $DEBUG;
return $results;
}
- warn "---------" if $DEBUG;
- warn "Leave NZanalyse" if $DEBUG;
- warn "---------" if $DEBUG;
+ warn "---------\nLeave NZanalyse\n---------" if $DEBUG;
}
sub NZoperatorAND{
my $value = $_;
my $countvalue;
( $value, $countvalue ) = ( $1, $2 ) if ($value=~/(.*)-(\d+)$/);
- if ( $rightresult =~ /$value-(\d+);/ ) {
+ if ( $rightresult =~ /\Q$value\E-(\d+);/ ) {
$countvalue = ( $1 > $countvalue ? $countvalue : $1 );
$finalresult .=
"$value-$countvalue;$value-$countvalue;";
}
}
- warn " $finalresult \n" if $DEBUG;
+ warn "NZAND DONE : $finalresult \n" if $DEBUG;
return $finalresult;
}
}
sub NZoperatorNOT{
- my ($rightresult, $leftresult)=@_;
+ my ($leftresult, $rightresult)=@_;
my @leftresult = split /;/, $leftresult;
}
my ( $bntag, $bnsubf ) = GetMarcFromKohaField('biblio.biblionumber');
my ( $itemtag, $itemsubf ) = GetMarcFromKohaField('items.itemnumber');
+ if ($tag eq $itemtag) {
+ # do not allow the embedded item tag to be
+ # edited from here
+ warn "Attempting to edit item tag via C4::Search::ModBiblios -- not allowed";
+ return (0, []);
+ }
foreach my $usmarc (@$listbiblios) {
my $record;
$record = eval { MARC::Record->new_from_usmarc($usmarc) };
if ($@) {
# usmarc is not a valid usmarc May be a biblionumber
- if ( $tag eq $itemtag ) {
- my $bib = GetBiblioFromItemNumber($usmarc);
- $record = GetMarcItem( $bib->{'biblionumber'}, $usmarc );
- $biblionumber = $bib->{'biblionumber'};
- }
- else {
- $record = GetMarcBiblio($usmarc);
- $biblionumber = $usmarc;
- }
+ # FIXME - sorry, please let's figure out whether
+ # this function is to be passed a list of
+ # record numbers or a list of MARC::Record
+ # objects. The former is probably better
+ # because the MARC records supplied by Zebra
+ # may be not current.
+ $record = GetMarcBiblio($usmarc);
+ $biblionumber = $usmarc;
}
else {
if ( $bntag >= 010 ) {
projects / koha.git / blobdiff