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'};
return $weighted_query;
}
+=head2 getIndexes
+
+Return an array with available indexes.
+
+=cut
+
+sub getIndexes{
+ my @indexes = (
+ # biblio indexes
+ 'ab',
+ 'Abstract',
+ 'acqdate',
+ 'allrecords',
+ 'an',
+ 'Any',
+ 'at',
+ 'au',
+ 'aub',
+ 'aud',
+ 'audience',
+ 'auo',
+ 'aut',
+ 'Author',
+ 'Author-in-order ',
+ 'Author-personal-bibliography',
+ 'Authority-Number',
+ 'authtype',
+ 'bc',
+ 'biblionumber',
+ 'bio',
+ 'biography',
+ 'callnum',
+ 'cfn',
+ 'Chronological-subdivision',
+ 'cn-bib-source',
+ 'cn-bib-sort',
+ 'cn-class',
+ 'cn-item',
+ 'cn-prefix',
+ 'cn-suffix',
+ 'cpn',
+ 'Code-institution',
+ 'Conference-name',
+ 'Conference-name-heading',
+ 'Conference-name-see',
+ 'Conference-name-seealso',
+ 'Content-type',
+ 'Control-number',
+ 'copydate',
+ 'Corporate-name',
+ 'Corporate-name-heading',
+ 'Corporate-name-see',
+ 'Corporate-name-seealso',
+ 'ctype',
+ 'date-entered-on-file',
+ 'Date-of-acquisition',
+ 'Date-of-publication',
+ 'Dewey-classification',
+ 'extent',
+ 'fic',
+ 'fiction',
+ 'Form-subdivision',
+ 'format',
+ 'Geographic-subdivision',
+ 'he',
+ 'Heading',
+ 'Heading-use-main-or-added-entry',
+ 'Heading-use-series-added-entry ',
+ 'Heading-use-subject-added-entry',
+ 'Host-item',
+ 'id-other',
+ 'Illustration-code',
+ 'ISBN',
+ 'ISSN',
+ 'itemtype',
+ 'kw',
+ 'Koha-Auth-Number',
+ 'l-format',
+ 'language',
+ 'lc-card',
+ 'LC-card-number',
+ 'lcn',
+ 'llength',
+ 'ln',
+ 'Local-classification',
+ 'Local-number',
+ 'Match-heading',
+ 'Match-heading-see-from',
+ 'Material-type',
+ 'mc-itemtype',
+ 'mc-rtype',
+ 'mus',
+ 'Name-geographic',
+ 'Name-geographic-heading',
+ 'Name-geographic-see',
+ 'Name-geographic-seealso',
+ 'nb',
+ 'Note',
+ 'ns',
+ 'nt',
+ 'pb',
+ 'Personal-name',
+ 'Personal-name-heading',
+ 'Personal-name-see',
+ 'Personal-name-seealso',
+ 'pl',
+ 'Place-publication',
+ 'pn',
+ 'popularity',
+ 'pubdate',
+ 'Publisher',
+ 'Record-type',
+ 'rtype',
+ 'se',
+ 'See',
+ 'See-also',
+ 'sn',
+ 'Stock-number',
+ 'su',
+ 'Subject',
+ 'Subject-heading-thesaurus',
+ 'Subject-name-personal',
+ 'Subject-subdivision',
+ 'Summary',
+ 'Suppress',
+ 'su-geo',
+ 'su-na',
+ 'su-to',
+ 'su-ut',
+ 'ut',
+ 'Term-genre-form',
+ 'Term-genre-form-heading',
+ 'Term-genre-form-see',
+ 'Term-genre-form-seealso',
+ 'ti',
+ 'Title',
+ 'Title-cover',
+ 'Title-series',
+ 'Title-uniform',
+ 'Title-uniform-heading',
+ 'Title-uniform-see',
+ 'Title-uniform-seealso',
+ 'totalissues',
+ 'yr',
+
+ # items indexes
+ 'acqsource',
+ 'barcode',
+ 'bc',
+ 'branch',
+ 'ccode',
+ 'classification-source',
+ 'cn-sort',
+ 'coded-location-qualifier',
+ 'copynumber',
+ 'damaged',
+ 'datelastborrowed',
+ 'datelastseen',
+ 'holdingbranch',
+ 'homebranch',
+ 'issues',
+ 'itemnumber',
+ 'itype',
+ 'Local-classification',
+ 'location',
+ 'lost',
+ 'materials-specified',
+ 'mc-ccode',
+ 'mc-itype',
+ 'mc-loc',
+ 'notforloan',
+ 'onloan',
+ 'price',
+ 'renewals',
+ 'replacementprice',
+ 'replacementpricedate',
+ 'reserves',
+ 'restricted',
+ 'stack',
+ 'uri',
+ 'withdrawn',
+
+ # subject related
+ );
+
+ return \@indexes;
+}
+
=head2 buildQuery
( $error, $query,
my $stopwords_removed; # flag to determine if stopwords have been removed
+ my $cclq;
+ my $indexes = getIndexes();
+ if( $query !~ /\s*ccl=/ ){
+ for my $index (@$indexes){
+ if($query =~ /($index)(,?\w)*:/){
+ $cclq = 1;
+ }
+ }
+ $query = "ccl=$query" if($cclq);
+ }
+
# for handling ccl, cql, pqf queries in diagnostic mode, skip the rest of the steps
# DIAGNOSTIC ONLY!!
if ( $query =~ /^ccl=/ ) {
) = ( 0, 0, 0, 0, 0 );
}
+
+ if(not $index){
+ $index = 'kw';
+ }
+
# Set default structure attribute (word list)
my $struct_attr;
unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl)/ ) {
sub searchResults {
my ( $searchdesc, $hits, $results_per_page, $offset, $scan, @marcresults ) = @_;
my $dbh = C4::Context->dbh;
- my $even = 1;
my @newresults;
- # add search-term highlighting via <span>s on the search terms
- my $span_terms_hashref;
- for my $span_term ( split( / /, $searchdesc ) ) {
- $span_term =~ s/(.*=|\)|\(|\+|\.|\*)//g;
- $span_terms_hashref->{$span_term}++;
- }
-
#Build branchnames hash
#find branchname
#get branch information.....
my %branches;
- my $bsth =
- $dbh->prepare("SELECT branchcode,branchname FROM branches")
- ; # FIXME : use C4::Koha::GetBranches
+ my $bsth =$dbh->prepare("SELECT branchcode,branchname FROM branches"); # FIXME : use C4::Branch::GetBranches
$bsth->execute();
while ( my $bdata = $bsth->fetchrow_hashref ) {
$branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
else {
$times = $hits; # FIXME: if $hits is undefined, why do we want to equal it?
}
+ my $marcflavour = C4::Context->preference("marcflavour");
+ # We get the biblionumber position in MARC
+ my ($bibliotag,$bibliosubf)=GetMarcFromKohaField('biblio.biblionumber','');
+ my $fw;
+
# loop through all of the records we've retrieved
for ( my $i = $offset ; $i <= $times - 1 ; $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, '');
+
+ if ($bibliotag<10){
+ $fw = GetFrameworkCode($marcrecord->field($bibliotag)->data);
+ }else{
+ $fw = GetFrameworkCode($marcrecord->subfield($bibliotag,$bibliosubf));
+ }
+
+ my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, $fw );
+ $oldbiblio->{subtitle} = GetRecordValue('subtitle', $marcrecord, $fw);
$oldbiblio->{result_number} = $i + 1;
# add imageurl to itemtype if there is one
$oldbiblio->{normalized_oclc} = GetNormalizedOCLCNumber($marcrecord,$marcflavour);
$oldbiblio->{normalized_isbn} = GetNormalizedISBN(undef,$marcrecord,$marcflavour);
$oldbiblio->{content_identifier_exists} = 1 if ($oldbiblio->{normalized_isbn} or $oldbiblio->{normalized_oclc} or $oldbiblio->{normalized_ean} or $oldbiblio->{normalized_upc});
-
- # edition information, if any
$oldbiblio->{edition} = $oldbiblio->{editionstatement};
$oldbiblio->{description} = $itemtypes{ $oldbiblio->{itemtype} }->{description};
# Build summary if there is one (the summary is defined in the itemtypes table)
$oldbiblio->{summary} = $summary;
}
- # 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'};
- $oldbiblio->{'subtitle_nospan'} = $oldbiblio->{'subtitle'};
- # 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 = ' ... '.$searchhighlightblob if $searchhighlightblob;
- $oldbiblio->{'searchhighlightblob'} = $searchhighlightblob;
- }
-
- # 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;
- foreach(qw(title subtitle author publishercode place pages notes size)) {
- $oldbiblio->{$_} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
- }
- }
- }
-
- ($i % 2) and $oldbiblio->{'toggle'} = 1;
-
# Pull out the items fields
my @fields = $marcrecord->field($itemtag);
projects / koha.git / blobdiff