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) = 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 arg:>
* $error is a empty unless an error is detected
=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 =
return ( undef, $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 @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;
-
# Initialize & Search Zebra
for ( my $i = 0 ; $i < @servers ; $i++ ) {
eval {
return ( $error, undef );
}
}
- my $hits = 0;
- 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();
+ 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;
}
}
- $hits = 0;
}
+
return ( undef, \@results );
}
}
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();
}
return ( undef, $results_hashref, \@facets_loop );
}
-use C4::Search::PazPar2;
-use XML::Simple;
-use Data::Dumper;
sub pazGetRecords {
my (
$koha_query, $simple_query, $sort_by_ref, $servers_ref,
$query_type, $scan
) = @_;
- my $paz = C4::Search::PazPar2->new('http://localhost:10006/search.pz2');
+ 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);
- $results_hashref->{'biblioserver'}->{'hits'} = $stats->{'hits'};
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];
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'} }, $paz->record($recid, $i);
+ push @{ $result_group->{'RECORDS'} }, $rec;
}
push @{ $results_hashref->{'biblioserver'}->{'GROUPS'} }, $result_group;
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;
$remove_stopwords
) = ( 0, 0, 0, 0, 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";
}
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,
sub searchResults {
my ( $searchdesc, $hits, $results_per_page, $offset, @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
$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;
$oldbiblio->{description} =
$itemtypes{ $oldbiblio->{itemtype} }->{description};
}
-
+ my $aisbn=$oldbiblio->{'isbn'};
+ $aisbn =~ /(\d*[X]*)/;
+ $oldbiblio->{'amazonisbn'} = $1;
# 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
+ # 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 ) {
}
$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;
+
+ # 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;
+ }
}
}
- # 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);
foreach my $code ( keys %subfieldstosearch ) {
$item->{$code} = $field->subfield( $subfieldstosearch{$code} );
}
-
+ 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->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} ) {
- $item->{'branchname'} = $branches{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} };
+ if ($item->{$hbranch}) {
+ $item->{'branchname'} = $branches{$item->{$hbranch}};
}
- # Last resort
- elsif ( $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'holdingbranch':'homebranch'} ) {
- $item->{'branchname'} = $branches{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'holdingbranch':'homebranch'} };
+ 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->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{due_date} = format_date( $item->{onloan} );
- $onloan_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{count}++ if $item->{'homebranch'};
- $onloan_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{branchname} = $item->{'branchname'};
- $onloan_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{location} = $locations{ $item->{location} };
- $onloan_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{due_date} }->{itemcallnumber} = $item->{itemcallnumber};
- $onloan_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $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->{homebranch};
+ $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};
# if something's checked out and lost, mark it as 'long overdue'
if ( $item->{itemlost} ) {
- $onloan_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $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;
}
}
$item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
$other_count++;
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{wthdrawn} = $item->{wthdrawn};
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{itemlost} = $item->{itemlost};
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{damaged} = $item->{damaged};
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{notforloan} = GetAuthorisedValueDesc( '', '', $item->{notforloan}, '', '', $notforloan_authorised_value ) if $notforloan_authorised_value;
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{count}++ if $item->{'homebranch'};
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{branchname} = $item->{'branchname'};
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{location} = $locations{ $item->{location} };
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} . $item->{status} }->{itemcallnumber} = $item->{itemcallnumber};
- $other_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $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}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value;
+ $other_items->{$key}->{count}++ if $item->{homebranch};
+ $other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
+ $other_items->{$key}->{imageurl} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
}
-
# item is available
else {
$can_place_holds = 1;
$available_count++;
- $available_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{count}++ if $item->{'homebranch'};
- $available_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{branchname} = $item->{'branchname'};
- $available_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{location} = $locations{ $item->{location} };
- $available_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{itemcallnumber} = $item->{itemcallnumber};
- $available_items->{ $item->{C4::Context->preference('HomeOrHoldingBranch') eq 'homebranch'?'homebranch':'holdingbranch'} . '--' . $item->{location} . $item->{'itype'} . $item->{'itemcallnumber'} }->{imageurl} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
+ $available_items->{$prefix}->{count}++ if $item->{homebranch};
+ foreach (qw(branchname itemcallnumber)) {
+ $available_items->{$prefix}->{$_} = $item->{$_};
+ }
+ $available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
+ $available_items->{$prefix}->{imageurl} = getitemtypeimagesrc() . "/" . $itemtypes{ $item->{itype} }->{imageurl};
}
}
} # notforloan, item level and biblioitem level
? 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") ) {
+ 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;
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
$left = $1;
$operator = $2;
$right = $3;
-# warn
-# "handling unless (operator)... left:$left operator:$operator right:$right"
-# if $DEBUG;
+ warn
+"handling unless (operator)... left:$left operator:$operator right:$right"
+ if $DEBUG;
}
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;
}
projects / koha.git / blobdiff