##Here we have to extract MARC record and $authid from ZEBRA AUTHORITIES
my $rec=$oAResult->record($counter);
- my $marcdata=$rec->raw();
- my $authrecord;
my $separator=C4::Context->preference('authoritysep');
- $authrecord = MARC::File::USMARC::decode($marcdata);
+ my $authrecord = C4::Search::new_record_from_zebra(
+ 'authorityserver',
+ $rec->raw()
+ );
+
+ if ( !defined $authrecord or !defined $authrecord->field('001') ) {
+ $counter++;
+ next;
+ }
+
my $authid=$authrecord->field('001')->data();
my %newline;
$newline{authid} = $authid;
my $query='at:'.$authtypecode.' ';
my $filtervalues=qr([\001-\040\!\'\"\`\#\$\%\&\*\+,\-\./:;<=>\?\@\(\)\{\[\]\}_\|\~]);
if ($record->field($auth_tag_to_report)) {
- foreach ($record->field($auth_tag_to_report)->subfields()) {
- $_->[1]=~s/$filtervalues/ /g; $query.= " $op he:\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/);
- }
+ foreach ($record->field($auth_tag_to_report)->subfields()) {
+ $_->[1]=~s/$filtervalues/ /g; $query.= " $op he:\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/);
+ }
}
my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
# there is at least 1 result => return the 1st one
if (!defined $error && @{$results} ) {
- my $marcrecord = MARC::File::USMARC::decode($results->[0]);
- return $marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
+ my $marcrecord = C4::Search::new_record_from_zebra(
+ 'authorityserver',
+ $results->[0]
+ );
+ return $marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
}
# no result, returns nothing
return;
}
my $z=0;
while ( $z<$count ) {
- my $rec;
- $rec=$oResult->record($z);
- my $marcdata = $rec->raw();
- my $marcrecordzebra= MARC::Record->new_from_usmarc($marcdata);
+ my $marcrecordzebra = C4::Search::new_record_from_zebra(
+ 'biblioserver',
+ $oResult->record($z)->raw()
+ );
my ( $biblionumbertagfield, $biblionumbertagsubfield ) = &GetMarcFromKohaField( "biblio.biblionumber", '' );
- my $i = ($biblionumbertagfield < 10) ? $marcrecordzebra->field($biblionumbertagfield)->data : $marcrecordzebra->subfield($biblionumbertagfield, $biblionumbertagsubfield);
- my $marcrecorddb=GetMarcBiblio($i);
+ my $i = ($biblionumbertagfield < 10)
+ ? $marcrecordzebra->field( $biblionumbertagfield )->data
+ : $marcrecordzebra->subfield( $biblionumbertagfield, $biblionumbertagsubfield );
+ my $marcrecorddb = GetMarcBiblio($i);
push @reccache, $marcrecorddb;
$z++;
}
$context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
$context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
- $context->{ Zconn }->{ $server }->option(
- preferredRecordSyntax => C4::Context->preference("marcflavour") );
return $context->{"Zconn"}->{$server};
}
}
my $tried=0; # first attempt
my $Zconn; # connection object
- $server = "biblioserver" unless $server;
- $syntax = "usmarc" unless $syntax;
+ my $elementSetName;
+ my $index_mode;
+
+ $server //= "biblioserver";
+ $syntax //= "XML";
+
+ if ( $server eq 'biblioserver' ) {
+ $index_mode = $context->{'config'}->{'zebra_bib_index_mode'} // 'grs1';
+ } elsif ( $server eq 'authorityserver' ) {
+ $index_mode = $context->{'config'}->{'zebra_auth_index_mode'} // 'dom';
+ }
+
+ if ( $index_mode eq 'grs1' ) {
+
+ $elementSetName = 'F';
+ $syntax = ( $context->preference("marcflavour") eq 'UNIMARC' )
+ ? 'unimarc'
+ : 'usmarc';
+
+ } else {
+
+ $elementSetName = 'marcxml';
+ $syntax = 'XML';
+ }
my $host = $context->{'listen'}->{$server}->{'content'};
my $servername = $context->{"config"}->{$server};
my $user = $context->{"serverinfo"}->{$server}->{"user"};
my $password = $context->{"serverinfo"}->{$server}->{"password"};
- $auth = 1 if($user && $password);
+ $auth = 1 if($user && $password);
retry:
eval {
# set options
$o->option(cqlfile=> $context->{"server"}->{$server}->{"cql2rpn"});
$o->option(cclfile=> $context->{"serverinfo"}->{$server}->{"ccl2rpn"});
$o->option(preferredRecordSyntax => $syntax);
- $o->option(elementSetName => "F"); # F for 'full' as opposed to B for 'brief'
+ $o->option(elementSetName => $elementSetName);
$o->option(databaseName => ($servername?$servername:"biblios"));
# create a new connection object
}
};
-# if ($@) {
-# # Koha manages the Zebra server -- this doesn't work currently for me because of permissions issues
-# # Also, I'm skeptical about whether it's the best approach
-# warn "problem with Zebra";
-# if ( C4::Context->preference("ManageZebra") ) {
-# if ($@->code==10000 && $tried==0) { ##No connection try restarting Zebra
-# $tried=1;
-# warn "trying to restart Zebra";
-# my $res=system("zebrasrv -f $ENV{'KOHA_CONF'} >/koha/log/zebra-error.log");
-# goto "retry";
-# } else {
-# warn "Error ", $@->code(), ": ", $@->message(), "\n";
-# $Zconn="error";
-# return $Zconn;
-# }
-# }
-# }
+
return $Zconn;
}
'MARC::Record' => {
'usage' => 'Core',
'required' => '1',
- 'min_ver' => '2'
+ 'min_ver' => '2.0.6'
},
'Locale::Currency::Format' => {
'usage' => 'Core',
'MARC::File::XML' => {
'usage' => 'Core',
'required' => '1',
- 'min_ver' => '0.88'
+ 'min_ver' => '1.0.1'
},
'XML::SAX::Writer' => {
'usage' => 'Core',
if ($self->{'record_type'} eq 'biblio') {
require C4::Biblio;
foreach my $marcblob (keys %matches) {
- my $target_record = MARC::Record->new_from_usmarc($marcblob);
+ my $target_record = C4::Search::new_record_from_zebra('biblioserver',$marcblob);
my $record_number;
my $result = C4::Biblio::TransformMarcToKoha(C4::Context->dbh, $target_record, '');
$record_number = $result->{'biblionumber'};
my @results;
if (!defined $error) {
foreach my $possible_duplicate_record (@{$searchresults}) {
- my $marcrecord =
- MARC::Record->new_from_usmarc($possible_duplicate_record);
+ my $marcrecord = new_record_from_zebra(
+ 'biblioserver',
+ $possible_duplicate_record
+ );
+
my $result = TransformMarcToKoha( $dbh, $marcrecord, '' );
# FIXME :: why 2 $biblionumber ?
}
for my $j ( $first_record .. $last_record ) {
- my $record =
+ my $record = eval {
$tmpresults[ $i - 1 ]->record( $j - 1 )->raw()
; # 0 indexed
- push @{$results}, $record;
+ };
+ push @{$results}, $record if defined $record;
}
}
);
else {
$times = $size;
}
+
for ( my $j = $offset ; $j < $times ; $j++ ) {
my $records_hash;
my $record;
# not an index scan
else {
$record = $results[ $i - 1 ]->record($j)->raw();
-
# warn "RECORD $j:".$record;
$results_hash->{'RECORDS'}[$j] = $record;
}
$size > $facets_maxrecs ? $facets_maxrecs : $size;
for my $facet (@$facets) {
for ( my $j = 0 ; $j < $jmax ; $j++ ) {
- my $render_record =
- $results[ $i - 1 ]->record($j)->render();
+
+ my $marc_record = new_record_from_zebra (
+ 'biblioserver',
+ $results[ $i - 1 ]->record($j)->raw()
+ );
+
+ if ( ! defined $marc_record ) {
+ warn "ERROR DECODING RECORD - $@: " .
+ $results[ $i - 1 ]->record($j)->raw();
+ next;
+ }
+
my @used_datas = ();
+
foreach my $tag ( @{ $facet->{tags} } ) {
# avoid first line
my $tag_num = substr( $tag, 0, 3 );
- my $letters = substr( $tag, 3 );
- my $field_pattern =
- '\n' . $tag_num . ' ([^z][^\n]+)';
- $field_pattern = '\n' . $tag_num . ' ([^\n]+)'
- if ( int($tag_num) < 10 );
- my @field_tokens =
- ( $render_record =~ /$field_pattern/g );
- foreach my $field_token (@field_tokens) {
- my @subf = ( $field_token =~
- /\$([a-zA-Z0-9]) ([^\$]+)/g );
- my @values;
- for ( my $i = 0 ; $i < @subf ; $i += 2 ) {
- if ( $letters =~ $subf[$i] ) {
- my $value = $subf[ $i + 1 ];
- $value =~ s/^ *//;
- $value =~ s/ *$//;
- push @values, $value;
- }
- }
- my $data = join( $facet->{sep}, @values );
+ my $subfield_letters = substr( $tag, 3 );
+ # Removed when as_string fixed
+ my @subfields = $subfield_letters =~ /./sg;
+
+ my @fields = $marc_record->field($tag_num);
+ foreach my $field (@fields) {
+ my $data = $field->as_string( $subfield_letters, $facet->{sep} );
+
unless ( $data ~~ @used_datas ) {
- $facets_counter->{ $facet->{idx} }
- ->{$data}++;
push @used_datas, $data;
+ $facets_counter->{ $facet->{idx} }->{$data}++;
}
- } # fields
+ } # fields
} # field codes
} # records
$facets_info->{ $facet->{idx} }->{label_value} =
$times = $hits; # FIXME: if $hits is undefined, why do we want to equal it?
}
- my $marcflavour = C4::Context->preference("marcflavour");
+ my $marcflavour = C4::Context->preference("marcflavour");
# We get the biblionumber position in MARC
my ($bibliotag,$bibliosubf)=GetMarcFromKohaField('biblio.biblionumber','');
# loop through all of the records we've retrieved
for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
- my $marcrecord = eval { MARC::File::USMARC::decode( $marcresults->[$i] ); };
- if ( $@ ) {
- warn "ERROR DECODING RECORD - $@: " . $marcresults->[$i];
- next;
+
+ my $marcrecord;
+ if ($scan) {
+ # For Scan searches we built USMARC data
+ $marcrecord = MARC::Record->new_from_usmarc( $marcresults->[$i]);
+ } else {
+ # Normal search, render from Zebra's output
+ $marcrecord = new_record_from_zebra(
+ 'biblioserver',
+ $marcresults->[$i]
+ );
+
+ if ( ! defined $marcrecord ) {
+ warn "ERROR DECODING RECORD - $@: " . $marcresults->[$i];
+ next;
+ }
}
my $fw = $scan
}
}
+=head2 new_record_from_zebra
+
+Given raw data from a Zebra result set, return a MARC::Record object
+
+This helper function is needed to take into account all the involved
+system preferences and configuration variables to properly create the
+MARC::Record object.
+
+If we are using GRS-1, then the raw data we get from Zebra should be USMARC
+data. If we are using DOM, then it has to be MARCXML.
+
+=cut
+
+sub new_record_from_zebra {
+
+ my $server = shift;
+ my $raw_data = shift;
+ # Set the default indexing modes
+ my $index_mode = ( $server eq 'biblioserver' )
+ ? C4::Context->config('zebra_bib_index_mode') // 'grs1'
+ : C4::Context->config('zebra_auth_index_mode') // 'dom';
+
+ my $marc_record = eval {
+ if ( $index_mode eq 'dom' ) {
+ MARC::Record->new_from_xml( $raw_data, 'UTF-8' );
+ } else {
+ MARC::Record->new_from_usmarc( $raw_data );
+ }
+ };
+
+ if ($@) {
+ return;
+ } else {
+ return $marc_record;
+ }
+
+}
END { } # module clean-up code here (global destructor)
my ( $errors, $results, $total_hits ) = C4::Search::SimpleSearch( "nb=$xisbn", 0, 1 );
return unless ( !$errors && scalar @$results );
- my $record = MARC::Record::new_from_usmarc( $results->[0] );
+ my $record = C4::Search::new_record_from_zebra( 'biblioserver', $results->[0] );
my $biblionumber = C4::Biblio::get_koha_field_from_marc('biblio', 'biblionumber', $record, '');
return unless $biblionumber;
my @results;
foreach my $result ( @{$marcresults} ) {
- my $marcrecord = MARC::File::USMARC::decode( $result );
+ my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result );
my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
$biblio->{booksellerid} = $booksellerid;
elsif ($server =~/authorityserver/) { # this is the local authority server
my @inner_sup_results_array;
for my $sup_record ( @{$results_hashref->{$server}->{"RECORDS"}} ) {
- my $marc_record_object = MARC::Record->new_from_usmarc($sup_record);
+ my $marc_record_object = C4::Search::new_record_from_zebra(
+ 'authorityserver',
+ $sup_record
+ );
# warn "Authority Found: ".$marc_record_object->as_formatted();
push @inner_sup_results_array, {
'title' => $marc_record_object->field(100)->subfield('a'),
my @arrayresults;
my @field_data = ($search);
for ( my $i = 0 ; $i < $resultsperpage ; $i++ ) {
- my $record = MARC::Record::new_from_usmarc( $results->[$i] );
+ my $record = C4::Search::new_record_from_zebra( 'biblioserver', $results->[$i] );
my $rechash = TransformMarcToKoha( $dbh, $record );
my $pos;
my $countitems = $rechash->{itembumber} ? 1 : 0;
$i++
)
{
- my $record = MARC::Record::new_from_usmarc( $results->[$i] );
+ my $record = C4::Search::new_record_from_zebra( 'biblioserver', $results->[$i] );
my $rechash = TransformMarcToKoha( $dbh, $record );
my $pos;
my $countitems;
foreach my $hit ( @{$results} ) {
my $chosen =
TransformMarcToKoha( C4::Context->dbh,
- MARC::Record->new_from_usmarc($hit) );
+ C4::Search::new_record_from_zebra('biblioserver',$hit) );
# offer all barcodes individually
foreach my $barcode ( sort split(/\s*\|\s*/, $chosen->{barcode}) ) {
for ( my $i = 0 ; $i < $hits ; $i++ ) {
my @row_data= ();
#DEBUG Notes: Decode the MARC record from each resulting MARC record...
- my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
+ my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $marcresults->[$i] );
#DEBUG Notes: Transform it to Koha form...
my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
#DEBUG Notes: Stuff the bib into @biblio_data...
die "unable to search the database for duplicates : $error" if ( defined $error );
$debug && warn "$query $server : $totalhits";
if ( $results && scalar(@$results) == 1 ) {
- my $marcrecord = MARC::File::USMARC::decode( $results->[0] );
+ my $marcrecord = C4::Search::new_record_from_zebra( $server, $results->[0] );
SetUTF8Flag($marcrecord);
$id = GetRecordId( $marcrecord, $tagid, $subfieldid );
if ( $authorities && $marcFlavour ) {
for ( my $i = 0 ; $i < $total ; $i++ ) {
my %resultsloop;
- my $marcrecord = MARC::File::USMARC::decode( $marcrecords->[$i] );
+ my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $marcrecords->[$i] );
my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
#build the hash for the template.
getRecords('au:Lessig', 'au:Lessig', [], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
is($results_hashref->{biblioserver}->{hits}, 4, "getRecords title search for 'Australia' matched right number of records");
+if ( $indexing_mode eq 'dom' ) {
+ ( undef, $results_hashref, $facets_loop ) =
+ getRecords('salud', 'salud', [], [ 'biblioserver' ], '19', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
+ ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/^Efectos del ambiente/ &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() eq 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies' &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/
+ , "Simple relevance sorting in getRecords matches old behavior");
+
+ ( undef, $results_hashref, $facets_loop ) =
+ getRecords('salud', 'salud', [ 'author_az' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
+ ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/la enfermedad laboral\^ies$/ &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[6],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() eq 'World health statistics 2009^ien'
+ , "Simple ascending author sorting in getRecords matches old behavior");
+
+ ( undef, $results_hashref, $facets_loop ) =
+ getRecords('salud', 'salud', [ 'author_za' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
+ ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() eq 'World health statistics 2009^ien' &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[12],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/la enfermedad laboral\^ies$/
+ , "Simple descending author sorting in getRecords matches old behavior");
+
+ ( undef, $results_hashref, $facets_loop ) =
+ getRecords('salud', 'salud', [ 'pubdate_asc' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
+ ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() eq 'Manual de higiene industrial^ies' &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() =~ m/seguridad e higiene del trabajo\^ies$/ &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/
+ , "Simple ascending publication date sorting in getRecords matches old behavior");
+
+ ( undef, $results_hashref, $facets_loop ) =
+ getRecords('salud', 'salud', [ 'pubdate_dsc' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
+ ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/^Estado de salud/ &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() eq 'World health statistics 2009^ien' &&
+ MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() eq 'Manual de higiene industrial^ies'
+ , "Simple descending publication date sorting in getRecords matches old behavior");
+
+} elsif ( $indexing_mode eq 'grs1' ){
( undef, $results_hashref, $facets_loop ) =
getRecords('salud', 'salud', [], [ 'biblioserver' ], '19', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
ok(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper() =~ m/^Efectos del ambiente/ &&
MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[7])->title_proper() eq 'World health statistics 2009^ien' &&
MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[18])->title_proper() eq 'Manual de higiene industrial^ies'
, "Simple descending publication date sorting in getRecords matches old behavior");
+}
+TODO: {
+ local $TODO = "Switch relevance search to MARCXML too";
( undef, $results_hashref, $facets_loop ) =
getRecords('books', 'books', [ 'relevance' ], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, undef, 1);
$record = MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0]);
is($record->title_proper(), 'books', "Scan returned requested item");
is($record->subfield('100', 'a'), 2, "Scan returned correct number of records matching term");
-
# Time to test buildQuery and searchResults too.
+}
my ( $query, $simple_query, $query_cgi,
$query_desc, $limit, $limit_cgi, $limit_desc,
is(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first");
} else {
local $TODO = "Query weighting does not behave exactly the same in DOM vs. GRS";
- is(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first");
+ is(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first");
}
$QueryStemming = $QueryWeightFields = $QueryFuzzy = $QueryRemoveStopwords = 0;