Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/new/bug_8743'

Browse source 
Conflicts:
	installer/data/mysql/updatedatabase.pl
This commit is contained in:
Paul Poulain 2012-09-14 16:07:36 +02:00
commit 9e7a3ced92
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
C4/AuthoritiesMarc.pm
View file

@ -1363,8 +1363,8 @@ sub merge {
} else {
#zebra connection
my $oConnection=C4::Context->Zconn("biblioserver",0);
my $oldSyntax = $oConnection->option("preferredRecordSyntax");
$oConnection->option("preferredRecordSyntax"=>"XML");
# We used to use XML syntax here, but that no longer works.
# Thankfully, we don't need it.
my $query;
$query= "an=".$mergefrom;
my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query, $oConnection ));
@ -1377,7 +1377,7 @@ sub merge {
my $rec;
$rec=$oResult->record($z);
my $marcdata = $rec->raw();
my $marcrecordzebra= MARC::Record->new_from_xml($marcdata,"utf8",C4::Context->preference("marcflavour"));
my $marcrecordzebra= MARC::Record->new_from_usmarc($marcdata);
my ( $biblionumbertagfield, $biblionumbertagsubfield ) = &GetMarcFromKohaField( "biblio.biblionumber", '' );
my $i = ($biblionumbertagfield < 10) ? $marcrecordzebra->field($biblionumbertagfield)->data : $marcrecordzebra->subfield($biblionumbertagfield, $biblionumbertagsubfield);
my $marcrecorddb=GetMarcBiblio($i);
@ -1385,7 +1385,6 @@ sub merge {
$z++;
}
$oResult->destroy();
$oConnection->option("preferredRecordSyntax"=>$oldSyntax);
}
#warn scalar(@reccache)." biblios to update";
# Get All candidate Tags for the change

2
C4/Search.pm
View file

@ -248,7 +248,7 @@ sub SimpleSearch {
. $@->code() . ") "
. $@->addinfo() . " "
. $@->diagset();
warn $error;
warn $error." for query: $query";
return ( $error, undef, undef );
}
}