=head2 SimpleSearch
-($error,$results) = SimpleSearch( $query, $offset, $max_results, [ @servers ] );
+( $error, $results, $total_hits ) = SimpleSearch( $query, $offset, $max_results, [@servers] );
This function provides a simple search API on the bibliographic catalog
* $max_results - if present, determines the maximum number of records to fetch. undef is All. defaults to undef.
-=item C<Output arg:>
+=item C<Output:>
+
* $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,'');
# 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;
my $total_hits;
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 =
}
}
+ foreach my $result (@tmpresults) {
+ $result->destroy();
+ }
+ foreach my $zoom_query (@zoom_queries) {
+ $zoom_query->destroy();
+ }
+
return ( undef, \@results, $total_hits );
}
}
expandable => $expandable,
expand => $link_value,
}
- );
+ ) unless ( ($facets_info->{$link_value}->{'label_value'} =~ /Libraries/) and (C4::Context->preference('singleBranchMode')) );
}
}
}
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' );
# 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 $even = 1;
my @newresults;
$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};
- } else {
- $oldbiblio->{imageurl} =
- getitemtypeimagesrc() . "/"
- . $itemtypes{ $oldbiblio->{itemtype} }->{imageurl}
- if ( $itemtypes{ $oldbiblio->{itemtype} }->{imageurl} );
- }
+ $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'};
- $aisbn =~ /(\d*[X]*)/;
- $oldbiblio->{amazonisbn} = $1;
+ (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
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') )
$onloan_count++;
my $key = $prefix . $item->{due_date};
$onloan_items->{$key}->{due_date} = format_date($item->{onloan});
- $onloan_items->{$key}->{count}++ if $item->{homebranch};
+ $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} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
+ $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->{$prefix}->{longoverdue}++;
$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++;
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->{homebranch};
+ $other_items->{$key}->{count}++ if $item->{$hbranch};
$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
- $other_items->{$key}->{imageurl} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
+ $other_items->{$key}->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes{ $item->{itype} }->{imageurl} );
}
# item is available
else {
$can_place_holds = 1;
$available_count++;
- $available_items->{$prefix}->{count}++ if $item->{homebranch};
+ $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} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
+ $available_items->{$prefix}->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes{ $item->{itype} }->{imageurl} );
}
}
} # notforloan, item level and biblioitem level
}
# XSLT processing of some stuff
- if (C4::Context->preference("XSLTResultsDisplay") ) {
+ if (C4::Context->preference("XSLTResultsDisplay") && !$scan) {
my $newxmlrecord = XSLTParse4Display($oldbiblio->{biblionumber},C4::Context->config('opachtdocs')."/prog/en/xslt/MARC21slim2OPACResults.xsl");
$oldbiblio->{XSLTResultsRecord} = $newxmlrecord;
}
$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
projects / koha_gimpoz / blobdiff