zebraqueue_daemon: cleanup whitespace and indents
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
parent
b3fe04b221
commit
132d67639a
1 changed files with 90 additions and 89 deletions
|
@ -19,7 +19,7 @@ use C4::AuthoritiesMarc;
|
||||||
use XML::Simple;
|
use XML::Simple;
|
||||||
use utf8;
|
use utf8;
|
||||||
|
|
||||||
my $dbh=C4::Context->dbh;
|
my $dbh = C4::Context->dbh;
|
||||||
my $ident = "Koha Zebraqueue ";
|
my $ident = "Koha Zebraqueue ";
|
||||||
|
|
||||||
my $debug = 1;
|
my $debug = 1;
|
||||||
|
@ -54,11 +54,11 @@ sub handler_sleep {
|
||||||
sub handler_check {
|
sub handler_check {
|
||||||
# check if we need to do anything, at the moment just checks the zebraqueue, it could check other things too
|
# check if we need to do anything, at the moment just checks the zebraqueue, it could check other things too
|
||||||
my ( $kernel, $heap, $session ) = @_[ KERNEL, HEAP, SESSION ];
|
my ( $kernel, $heap, $session ) = @_[ KERNEL, HEAP, SESSION ];
|
||||||
my $dbh=C4::Context->dbh;
|
my $dbh = C4::Context->dbh;
|
||||||
my $sth = $dbh->prepare("SELECT count(*) AS opcount FROM zebraqueue WHERE done = 0");
|
my $sth = $dbh->prepare("SELECT count(*) AS opcount FROM zebraqueue WHERE done = 0");
|
||||||
$sth->execute;
|
$sth->execute;
|
||||||
my $data = $sth->fetchrow_hashref();
|
my $data = $sth->fetchrow_hashref();
|
||||||
if ($data->{'opcount'} > 0){
|
if ($data->{'opcount'} > 0) {
|
||||||
Unix::Syslog::syslog LOG_INFO, "$data->{'opcount'} operations waiting to be run\n";
|
Unix::Syslog::syslog LOG_INFO, "$data->{'opcount'} operations waiting to be run\n";
|
||||||
$sth->finish();
|
$sth->finish();
|
||||||
$kernel->yield('do_ops');
|
$kernel->yield('do_ops');
|
||||||
|
@ -72,90 +72,91 @@ sub handler_check {
|
||||||
sub zebraop {
|
sub zebraop {
|
||||||
# execute operations waiting in the zebraqueue
|
# execute operations waiting in the zebraqueue
|
||||||
my ( $kernel, $heap, $session ) = @_[ KERNEL, HEAP, SESSION ];
|
my ( $kernel, $heap, $session ) = @_[ KERNEL, HEAP, SESSION ];
|
||||||
my $dbh=C4::Context->dbh;
|
my $dbh = C4::Context->dbh;
|
||||||
my $readsth=$dbh->prepare("SELECT id,biblio_auth_number,operation,server FROM zebraqueue WHERE done=0");
|
my $readsth = $dbh->prepare("SELECT id, biblio_auth_number, operation, server FROM zebraqueue WHERE done = 0");
|
||||||
$readsth->execute();
|
$readsth->execute();
|
||||||
Unix::Syslog::syslog LOG_INFO, "Executing zebra operations\n";
|
Unix::Syslog::syslog LOG_INFO, "Executing zebra operations\n";
|
||||||
while (my $data = $readsth->fetchrow_hashref()){
|
while (my $data = $readsth->fetchrow_hashref()) {
|
||||||
warn "Inside while loop" if $debug;
|
warn "Inside while loop" if $debug;
|
||||||
eval {
|
eval {
|
||||||
my $ok = 0;
|
my $ok = 0;
|
||||||
my $record;
|
my $record;
|
||||||
if ($data->{'operation'} =~ /delete/i ){
|
if ($data->{'operation'} =~ /delete/i ) {
|
||||||
eval {
|
eval {
|
||||||
|
|
||||||
warn "Searching for record to delete" if $debug;
|
warn "Searching for record to delete" if $debug;
|
||||||
# 1st read the record in zebra, we have to get it from zebra as its no longer in the db
|
# 1st read the record in zebra, we have to get it from zebra as its no longer in the db
|
||||||
my $Zconn=C4::Context->Zconn($data->{'server'}, 0, 1,'','xml');
|
my $Zconn = C4::Context->Zconn($data->{'server'}, 0, 1, '', 'xml');
|
||||||
my $results = $Zconn->search_pqf( '@attr 1=Local-number '.$data->{'biblio_auth_number'});
|
my $results = $Zconn->search_pqf( '@attr 1=Local-number '.$data->{'biblio_auth_number'});
|
||||||
$results->option(elementSetName => 'marcxml');
|
$results->option(elementSetName => 'marcxml');
|
||||||
$record = $results->record(0)->raw();
|
$record = $results->record(0)->raw();
|
||||||
};
|
};
|
||||||
if ($@) {
|
if ($@) {
|
||||||
# this doesn't exist, so no need to wail on zebra to delete it
|
# this doesn't exist, so no need to wail on zebra to delete it
|
||||||
if ($@->code() eq 13) {
|
if ($@->code() eq 13) {
|
||||||
$ok = 1;
|
$ok = 1;
|
||||||
|
} else {
|
||||||
|
# caught a ZOOM::Exception
|
||||||
|
my $error =
|
||||||
|
$@->message() . " ("
|
||||||
|
. $@->code() . ") "
|
||||||
|
. $@->addinfo() . " "
|
||||||
|
. $@->diagset();
|
||||||
|
warn "ERROR: $error";
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
# caught a ZOOM::Exception
|
# then, delete the record
|
||||||
my $error =
|
warn "Deleting record" if $debug;
|
||||||
$@->message() . " ("
|
$ok = zebrado($record, $data->{'operation'}, $data->{'server'}, $data->{'biblio_auth_number'});
|
||||||
. $@->code() . ") "
|
|
||||||
. $@->addinfo() . " "
|
|
||||||
. $@->diagset();
|
|
||||||
warn "ERROR: $error";
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
# then, delete the record
|
|
||||||
warn "Deleting record" if $debug;
|
|
||||||
$ok=zebrado($record,$data->{'operation'},$data->{'server'},$data->{'biblio_auth_number'});
|
|
||||||
}
|
}
|
||||||
}
|
else {
|
||||||
else {
|
# it is an update
|
||||||
# it is an update
|
warn "Updating record" if $debug;
|
||||||
warn "Updating record" if $debug;
|
# get the XML
|
||||||
# get the XML
|
my $marcxml;
|
||||||
my $marcxml;
|
if ($data->{'server'} eq "biblioserver") {
|
||||||
if ($data->{'server'} eq "biblioserver") {
|
my $marc = GetMarcBiblio($data->{'biblio_auth_number'});
|
||||||
my $marc = GetMarcBiblio($data->{'biblio_auth_number'});
|
$marcxml = $marc->as_xml_record() if $marc;
|
||||||
$marcxml = $marc->as_xml_record() if $marc;
|
}
|
||||||
|
elsif ($data->{'server'} eq "authorityserver") {
|
||||||
|
$marcxml = C4::AuthoritiesMarc::GetAuthorityXML($data->{'biblio_auth_number'});
|
||||||
|
}
|
||||||
|
# check it's XML, just in case
|
||||||
|
eval {
|
||||||
|
my $hashed = XMLin($marcxml);
|
||||||
|
}; ### is it a proper xml? broken xml may crash ZEBRA- slow but safe
|
||||||
|
## it's Broken XML-- Should not reach here-- but if it does -lets protect ZEBRA
|
||||||
|
if ($@) {
|
||||||
|
Unix::Syslog::syslog LOG_ERR, "$@";
|
||||||
|
my $delsth = $dbh->prepare("UPDATE zebraqueue SET done = 1 WHERE id = ?");
|
||||||
|
$delsth->execute($data->{'id'});
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
# ok, we have everything, do the operation in zebra !
|
||||||
|
$ok = zebrado($marcxml, $data->{'operation'}, $data->{'server'}, $data->{'biblio_auth_number'});
|
||||||
}
|
}
|
||||||
elsif ($data->{'server'} eq "authorityserver") {
|
if ($ok == 1) {
|
||||||
$marcxml =C4::AuthoritiesMarc::GetAuthorityXML($data->{'biblio_auth_number'});
|
$dbh = C4::Context->dbh;
|
||||||
|
my $delsth;
|
||||||
|
# if it's a deletion, we can delete every request on this biblio : in case the user
|
||||||
|
# did a modif (or item deletion) just before biblio deletion, there are some specialUpdate
|
||||||
|
# that are pending and can't succeed, as we don't have the XML anymore
|
||||||
|
# so, delete everything for this biblionumber
|
||||||
|
if ($data->{'operation'} =~ /delete/i) {
|
||||||
|
$delsth = $dbh->prepare("UPDATE zebraqueue SET done=1 WHERE biblio_auth_number = ?");
|
||||||
|
$delsth->execute($data->{'biblio_auth_number'});
|
||||||
|
# if it's not a deletion, delete every pending specialUpdate for this biblionumber
|
||||||
|
# in case the user add biblio, then X items, before this script runs
|
||||||
|
# this avoid indexing X+1 times where just 1 is enough.
|
||||||
|
} else {
|
||||||
|
$delsth = $dbh->prepare("UPDATE zebraqueue SET done = 1
|
||||||
|
WHERE biblio_auth_number = ? and operation = 'specialUpdate'");
|
||||||
|
$delsth->execute($data->{'biblio_auth_number'});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
# check it's XML, just in case
|
|
||||||
eval {
|
|
||||||
my $hashed=XMLin($marcxml);
|
|
||||||
}; ### is it a proper xml? broken xml may crash ZEBRA- slow but safe
|
|
||||||
## it's Broken XML-- Should not reach here-- but if it does -lets protect ZEBRA
|
|
||||||
if ($@){
|
|
||||||
Unix::Syslog::syslog LOG_ERR, "$@";
|
|
||||||
my $delsth=$dbh->prepare("UPDATE zebraqueue SET done=1 WHERE id =?");
|
|
||||||
$delsth->execute($data->{'id'});
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
# ok, we have everything, do the operation in zebra !
|
|
||||||
$ok=zebrado($marcxml,$data->{'operation'},$data->{'server'},$data->{'biblio_auth_number'});
|
|
||||||
}
|
|
||||||
if ($ok == 1){
|
|
||||||
$dbh=C4::Context->dbh;
|
|
||||||
my $delsth;
|
|
||||||
# if it's a deletion, we can delete every request on this biblio : in case the user
|
|
||||||
# did a modif (or item deletion) just before biblio deletion, there are some specialUpdate
|
|
||||||
# that are pending and can't succeed, as we don't have the XML anymore
|
|
||||||
# so, delete everything for this biblionumber
|
|
||||||
if ($data->{'operation'} =~ /delete/i) {
|
|
||||||
$delsth =$dbh->prepare("UPDATE zebraqueue SET done=1 WHERE biblio_auth_number =?");
|
|
||||||
$delsth->execute($data->{'biblio_auth_number'});
|
|
||||||
# if it's not a deletion, delete every pending specialUpdate for this biblionumber
|
|
||||||
# in case the user add biblio, then X items, before this script runs
|
|
||||||
# this avoid indexing X+1 times where just 1 is enough.
|
|
||||||
} else {
|
|
||||||
$delsth =$dbh->prepare("UPDATE zebraqueue SET done=1 WHERE biblio_auth_number =? and operation='specialUpdate'");
|
|
||||||
$delsth->execute($data->{'biblio_auth_number'});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
if ($@){
|
if ($@) {
|
||||||
Unix::Syslog::syslog LOG_ERR, "$@";
|
Unix::Syslog::syslog LOG_ERR, "$@";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -165,22 +166,22 @@ sub zebraop {
|
||||||
|
|
||||||
sub zebrado {
|
sub zebrado {
|
||||||
###Accepts a $server variable thus we can use it to update biblios, authorities or other zebra dbs
|
###Accepts a $server variable thus we can use it to update biblios, authorities or other zebra dbs
|
||||||
my ($record,$op,$server,$biblionumber)=@_;
|
my ($record, $op, $server, $biblionumber) = @_;
|
||||||
|
|
||||||
warn "In zebrado" if $debug;
|
warn "In zebrado" if $debug;
|
||||||
my @port;
|
my @port;
|
||||||
|
|
||||||
my $tried=0;
|
my $tried = 0;
|
||||||
my $recon=0;
|
my $recon = 0;
|
||||||
my $reconnect=0;
|
my $reconnect = 0;
|
||||||
# $record=Encode::encode("UTF-8",$record);
|
# $record=Encode::encode("UTF-8",$record);
|
||||||
my $shadow=$server."shadow";
|
my $shadow = $server."shadow";
|
||||||
$op = 'recordDelete' if $op eq 'delete_record';
|
$op = 'recordDelete' if $op eq 'delete_record';
|
||||||
|
|
||||||
reconnect:
|
reconnect:
|
||||||
warn "At reconnect" if $debug;
|
warn "At reconnect" if $debug;
|
||||||
my $Zconn=C4::Context->Zconn($server, 0, 1,'','xml');
|
my $Zconn = C4::Context->Zconn($server, 0, 1, '', 'xml');
|
||||||
if ($record){
|
if ($record) {
|
||||||
warn "Record found" if $debug;
|
warn "Record found" if $debug;
|
||||||
my $Zpackage = $Zconn->package();
|
my $Zpackage = $Zconn->package();
|
||||||
$Zpackage->option(action => $op);
|
$Zpackage->option(action => $op);
|
||||||
|
@ -194,21 +195,21 @@ retry:
|
||||||
return $@->code();
|
return $@->code();
|
||||||
}
|
}
|
||||||
my($error, $errmsg, $addinfo, $diagset) = $Zconn->error_x();
|
my($error, $errmsg, $addinfo, $diagset) = $Zconn->error_x();
|
||||||
if ($error==10007 && $tried<3) {## timeout --another 30 looonng seconds for this update
|
if ($error == 10007 && $tried < 3) {## timeout --another 30 looonng seconds for this update
|
||||||
sleep 1; ## wait a sec!
|
sleep 1; ## wait a sec!
|
||||||
$tried++;
|
$tried++;
|
||||||
goto "retry";
|
goto "retry";
|
||||||
}elsif ($error==2 && $tried<2) {## timeout --temporary zebra error !whatever that means
|
} elsif ($error == 2 && $tried < 2) {## timeout --temporary zebra error !whatever that means
|
||||||
sleep 2; ## wait two seconds!
|
sleep 2; ## wait two seconds!
|
||||||
$tried++;
|
$tried++;
|
||||||
goto "retry";
|
goto "retry";
|
||||||
}elsif($error==10004 && $recon==0){##Lost connection -reconnect
|
} elsif ($error==10004 && $recon == 0) {##Lost connection -reconnect
|
||||||
sleep 1; ## wait a sec!
|
sleep 1; ## wait a sec!
|
||||||
$recon=1;
|
$recon = 1;
|
||||||
$Zpackage->destroy();
|
$Zpackage->destroy();
|
||||||
$Zconn->destroy();
|
$Zconn->destroy();
|
||||||
goto "reconnect";
|
goto "reconnect";
|
||||||
}elsif ($error){
|
} elsif ($error) {
|
||||||
$Zpackage->destroy();
|
$Zpackage->destroy();
|
||||||
$Zconn->destroy();
|
$Zconn->destroy();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue