X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FAuthoritiesMarc.pm;h=c3b0db30aa766d7bec6f389c98e1a3c6f7844c81;hb=3b0d4e04e09f37e8dcbaba71abd47980bfef7059;hp=427fdb63bac19701335564656dbb05ffd0644801;hpb=efc64f44241efcc8a02ee0a8549a5346cdd026b0;p=koha_gimpoz
diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 427fdb63ba..c3b0db30aa 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -12,19 +12,20 @@ package C4::AuthoritiesMarc;
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+use warnings;
use C4::Context;
-use C4::Koha;
use MARC::Record;
use C4::Biblio;
use C4::Search;
use C4::AuthoritiesMarc::MARC21;
use C4::AuthoritiesMarc::UNIMARC;
use C4::Charset;
+use C4::Log;
use vars qw($VERSION @ISA @EXPORT);
@@ -39,7 +40,6 @@ BEGIN {
&GetAuthType
&GetAuthTypeCode
&GetAuthMARCFromKohaField
- &AUTHhtml2marc
&AddAuthority
&ModAuthority
@@ -57,21 +57,26 @@ BEGIN {
&merge
&FindDuplicateAuthority
+
+ &GuessAuthTypeCode
+ &GuessAuthId
);
}
+
+=head1 NAME
+
+C4::AuthoritiesMarc
+
=head2 GetAuthMARCFromKohaField
-=over 4
+ ( $tag, $subfield ) = &GetAuthMARCFromKohaField ($kohafield,$authtypecode);
-( $tag, $subfield ) = &GetAuthMARCFromKohaField ($kohafield,$authtypecode);
returns tag and subfield linked to kohafield
Comment :
Suppose Kohafield is only linked to ONE subfield
-=back
-
=cut
sub GetAuthMARCFromKohaField {
@@ -90,18 +95,17 @@ sub GetAuthMARCFromKohaField {
=head2 SearchAuthorities
-=over 4
+ (\@finalresult, $nbresults)= &SearchAuthorities($tags, $and_or,
+ $excluding, $operator, $value, $offset,$length,$authtypecode,
+ $sortby[, $skipmetadata])
-(\@finalresult, $nbresults)= &SearchAuthorities($tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby)
returns ref to array result and count of results returned
-=back
-
=cut
sub SearchAuthorities {
- my ($tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby) = @_;
-# warn "CALL : $tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby";
+ my ($tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby,$skipmetadata) = @_;
+ # warn Dumper($tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby);
my $dbh=C4::Context->dbh;
if (C4::Context->preference('NoZebra')) {
@@ -118,10 +122,8 @@ sub SearchAuthorities {
for(my $i = 0 ; $i <= $#{$value} ; $i++)
{
if (@$value[$i]){
- if (@$tags[$i] eq "mainmainentry") {
- $query .=" AND mainmainentry";
- }elsif (@$tags[$i] eq "mainentry") {
- $query .=" AND mainentry";
+ if (@$tags[$i] =~/mainentry|mainmainentry/) {
+ $query .= qq( AND @$tags[$i] );
} else {
$query .=" AND ";
}
@@ -216,40 +218,65 @@ sub SearchAuthorities {
}
my $dosearch;
- my $and;
+ my $and=" \@and " ;
my $q2;
+ my $attr_cnt = 0;
for(my $i = 0 ; $i <= $#{$value} ; $i++)
{
if (@$value[$i]){
- ##If mainentry search $a tag
- if (@$tags[$i] eq "mainmainentry") {
- $attr =" \@attr 1=Heading ";
- }elsif (@$tags[$i] eq "mainentry") {
- $attr =" \@attr 1=Heading ";
- }else{
- $attr =" \@attr 1=Any ";
+ if ( @$tags[$i] eq "mainmainentry" ) {
+ $attr = " \@attr 1=Heading-Main ";
}
- if (@$operator[$i] eq 'is') {
- $attr.=" \@attr 4=1 \@attr 5=100 ";##Phrase, No truncation,all of subfield field must match
- }elsif (@$operator[$i] eq "="){
- $attr.=" \@attr 4=107 "; #Number Exact match
- }elsif (@$operator[$i] eq "start"){
- $attr.=" \@attr 4=1 \@attr 5=1 ";#Phrase, Right truncated
- } else {
- $attr .=" \@attr 5=1 \@attr 4=6 ";## Word list, right truncated, anywhere
+ elsif ( @$tags[$i] eq "mainentry" ) {
+ $attr = " \@attr 1=Heading ";
+ }
+ elsif ( @$tags[$i] eq "any" ) {
+ $attr = " \@attr 1=Any ";
+ }
+ elsif ( @$tags[$i] eq "match" ) {
+ $attr = " \@attr 1=Match ";
+ }
+ elsif ( @$tags[$i] eq "match-heading" ) {
+ $attr = " \@attr 1=Match-heading ";
+ }
+ elsif ( @$tags[$i] eq "see-from" ) {
+ $attr = " \@attr 1=Match-heading-see-from ";
+ }
+ elsif ( @$tags[$i] eq "thesaurus" ) {
+ $attr = " \@attr 1=Subject-heading-thesaurus ";
+ }
+ if ( @$operator[$i] eq 'is' ) {
+ $attr .= " \@attr 4=1 \@attr 5=100 "
+ ; ##Phrase, No truncation,all of subfield field must match
+ }
+ elsif ( @$operator[$i] eq "=" ) {
+ $attr .= " \@attr 4=107 "; #Number Exact match
+ }
+ elsif ( @$operator[$i] eq "start" ) {
+ $attr .= " \@attr 3=2 \@attr 4=1 \@attr 5=1 "
+ ; #Firstinfield Phrase, Right truncated
+ }
+ elsif ( @$operator[$i] eq "exact" ) {
+ $attr .= " \@attr 4=1 \@attr 5=100 \@attr 6=3 "
+ ; ##Phrase, No truncation,all of subfield field must match
+ }
+ else {
+ $attr .= " \@attr 5=1 \@attr 4=6 "
+ ; ## Word list, right truncated, anywhere
}
- $and .=" \@and " ;
+ @$value[$i] =~ s/"/\\"/g; # Escape the double-quotes in the search value
$attr =$attr."\"".@$value[$i]."\"";
$q2 .=$attr;
- $dosearch=1;
+ $dosearch=1;
+ ++$attr_cnt;
}#if value
}
##Add how many queries generated
- if ($query=~/\S+/){
- $query= $and.$query.$q2
+ if (defined $query && $query=~/\S+/){
+ $query= $and x $attr_cnt . $query . (defined $q2 ? $q2 : '');
} else {
- $query=$q2;
- }
+ $query= $q2;
+ }
## Adding order
#$query=' @or @attr 7=2 @attr 1=Heading 0 @or @attr 7=1 @attr 1=Heading 1'.$query if ($sortby eq "HeadingDsc");
my $orderstring= ($sortby eq "HeadingAsc"?
@@ -259,8 +286,9 @@ sub SearchAuthorities {
'@attr 7=2 @attr 1=Heading 0'
:''
);
- $query=($query?"\@or $orderstring $query":"\@or \@attr 1=_ALLRECORDS \@attr 2=103 '' $orderstring ");
-
+ $query=($query?$query:"\@attr 1=_ALLRECORDS \@attr 2=103 ''");
+ $query="\@or $orderstring $query" if $orderstring;
+
$offset=0 unless $offset;
my $counter = $offset;
$length=10 unless $length;
@@ -302,35 +330,42 @@ sub SearchAuthorities {
my $separator=C4::Context->preference('authoritysep');
$authrecord = MARC::File::USMARC::decode($marcdata);
my $authid=$authrecord->field('001')->data();
- my $summary=BuildSummary($authrecord,$authid,$authtypecode);
- my $query_auth_tag = "SELECT auth_tag_to_report FROM auth_types WHERE authtypecode=?";
- my $sth = $dbh->prepare($query_auth_tag);
- $sth->execute($authtypecode);
- my $auth_tag_to_report = $sth->fetchrow;
- my $reported_tag;
- my $mainentry = $authrecord->field($auth_tag_to_report);
- if ($mainentry) {
- foreach ($mainentry->subfields()) {
- $reported_tag .='$'.$_->[0].$_->[1];
- }
- }
my %newline;
- $newline{summary} = $summary;
$newline{authid} = $authid;
- $newline{even} = $counter % 2;
- $newline{reported_tag} = $reported_tag;
+ if ( !$skipmetadata ) {
+ my $summary =
+ BuildSummary( $authrecord, $authid, $authtypecode );
+ my $query_auth_tag =
+"SELECT auth_tag_to_report FROM auth_types WHERE authtypecode=?";
+ my $sth = $dbh->prepare($query_auth_tag);
+ $sth->execute($authtypecode);
+ my $auth_tag_to_report = $sth->fetchrow;
+ my $reported_tag;
+ my $mainentry = $authrecord->field($auth_tag_to_report);
+ if ($mainentry) {
+
+ foreach ( $mainentry->subfields() ) {
+ $reported_tag .= '$' . $_->[0] . $_->[1];
+ }
+ }
+ $newline{summary} = $summary;
+ $newline{even} = $counter % 2;
+ $newline{reported_tag} = $reported_tag;
+ }
$counter++;
push @finalresult, \%newline;
}## while counter
- ###
- for (my $z=0; $z<@finalresult; $z++){
- my $count=CountUsage($finalresult[$z]{authid});
- $finalresult[$z]{used}=$count;
- }# all $z's
-
+ ###
+ if (! $skipmetadata) {
+ for (my $z=0; $z<@finalresult; $z++){
+ my $count=CountUsage($finalresult[$z]{authid});
+ $finalresult[$z]{used}=$count;
+ }# all $z's
+ }
+
}## if nbresult
NOLUCK:
- # $oAResult->destroy();
+ $oAResult->destroy();
# $oAuth[0]->destroy();
return (\@finalresult, $nbresults);
@@ -339,13 +374,10 @@ sub SearchAuthorities {
=head2 CountUsage
-=over 4
+ $count= &CountUsage($authid)
-$count= &CountUsage($authid)
counts Usage of Authid in bibliorecords.
-=back
-
=cut
sub CountUsage {
@@ -357,30 +389,24 @@ sub CountUsage {
return scalar @tab;
} else {
### ZOOM search here
- my $oConnection=C4::Context->Zconn("biblioserver",1);
my $query;
$query= "an=".$authid;
- my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query, $oConnection ));
- my $result;
- while ((my $i = ZOOM::event([ $oConnection ])) != 0) {
- my $ev = $oConnection->last_event();
- if ($ev == ZOOM::Event::ZEND) {
- $result = $oResult->size();
- }
+ my ($err,$res,$result) = C4::Search::SimpleSearch($query,0,10);
+ if ($err) {
+ warn "Error: $err from search $query";
+ $result = 0;
}
- return ($result);
+
+ return $result;
}
}
=head2 CountUsageChildren
-=over 4
+ $count= &CountUsageChildren($authid)
-$count= &CountUsageChildren($authid)
counts Usage of narrower terms of Authid in bibliorecords.
-=back
-
=cut
sub CountUsageChildren {
@@ -389,13 +415,10 @@ sub CountUsageChildren {
=head2 GetAuthTypeCode
-=over 4
+ $authtypecode= &GetAuthTypeCode($authid)
-$authtypecode= &GetAuthTypeCode($authid)
returns authtypecode of an authid
-=back
-
=cut
sub GetAuthTypeCode {
@@ -404,20 +427,115 @@ sub GetAuthTypeCode {
my $dbh=C4::Context->dbh;
my $sth = $dbh->prepare("select authtypecode from auth_header where authid=?");
$sth->execute($authid);
- my ($authtypecode) = $sth->fetchrow;
+ my $authtypecode = $sth->fetchrow;
return $authtypecode;
}
+=head2 GuessAuthTypeCode
+
+ my $authtypecode = GuessAuthTypeCode($record);
+
+Get the record and tries to guess the adequate authtypecode from its content.
+
+=cut
+
+sub GuessAuthTypeCode {
+ my ($record) = @_;
+ return unless defined $record;
+my $heading_fields = {
+ "MARC21"=>{
+ '100'=>{authtypecode=>'PERSO_NAME'},
+ '110'=>{authtypecode=>'CORPO_NAME'},
+ '111'=>{authtypecode=>'MEETI_NAME'},
+ '130'=>{authtypecode=>'UNIF_TITLE'},
+ '148'=>{authtypecode=>'CHRON_TERM'},
+ '150'=>{authtypecode=>'TOPIC_TERM'},
+ '151'=>{authtypecode=>'GEOGR_NAME'},
+ '155'=>{authtypecode=>'GENRE/FORM'},
+ '180'=>{authtypecode=>'GEN_SUBDIV'},
+ '181'=>{authtypecode=>'GEO_SUBDIV'},
+ '182'=>{authtypecode=>'CHRON_SUBD'},
+ '185'=>{authtypecode=>'FORM_SUBD'},
+ },
+#200 Personal name 700, 701, 702 4-- with embedded 700, 701, 702 600
+# 604 with embedded 700, 701, 702
+#210 Corporate or meeting name 710, 711, 712 4-- with embedded 710, 711, 712 601 604 with embedded 710, 711, 712
+#215 Territorial or geographic name 710, 711, 712 4-- with embedded 710, 711, 712 601, 607 604 with embedded 710, 711, 712
+#216 Trademark 716 [Reserved for future use]
+#220 Family name 720, 721, 722 4-- with embedded 720, 721, 722 602 604 with embedded 720, 721, 722
+#230 Title 500 4-- with embedded 500 605
+#240 Name and title (embedded 200, 210, 215, or 220 and 230) 4-- with embedded 7-- and 500 7-- 604 with embedded 7-- and 500 500
+#245 Name and collective title (embedded 200, 210, 215, or 220 and 235) 4-- with embedded 7-- and 501 604 with embedded 7-- and 501 7-- 501
+#250 Topical subject 606
+#260 Place access 620
+#280 Form, genre or physical characteristics 608
+#
+#
+# Could also be represented with :
+#leader position 9
+#a = personal name entry
+#b = corporate name entry
+#c = territorial or geographical name
+#d = trademark
+#e = family name
+#f = uniform title
+#g = collective uniform title
+#h = name/title
+#i = name/collective uniform title
+#j = topical subject
+#k = place access
+#l = form, genre or physical characteristics
+ "UNIMARC"=>{
+ '200'=>{authtypecode=>'NP'},
+ '210'=>{authtypecode=>'CO'},
+ '215'=>{authtypecode=>'SNG'},
+ '216'=>{authtypecode=>'TM'},
+ '220'=>{authtypecode=>'FAM'},
+ '230'=>{authtypecode=>'TU'},
+ '235'=>{authtypecode=>'CO_UNI_TI'},
+ '240'=>{authtypecode=>'SAUTTIT'},
+ '245'=>{authtypecode=>'NAME_COL'},
+ '250'=>{authtypecode=>'SNC'},
+ '260'=>{authtypecode=>'PA'},
+ '280'=>{authtypecode=>'GENRE/FORM'},
+ }
+};
+ foreach my $field (keys %{$heading_fields->{uc(C4::Context->preference('marcflavour'))} }) {
+ return $heading_fields->{uc(C4::Context->preference('marcflavour'))}->{$field}->{'authtypecode'} if (defined $record->field($field));
+ }
+ return;
+}
+
+=head2 GuessAuthId
+
+ my $authtid = GuessAuthId($record);
+
+Get the record and tries to guess the adequate authtypecode from its content.
+
+=cut
+
+sub GuessAuthId {
+ my ($record) = @_;
+ return unless ($record && $record->field('001'));
+# my $authtypecode=GuessAuthTypeCode($record);
+# my ($tag,$subfield)=GetAuthMARCFromKohaField("auth_header.authid",$authtypecode);
+# if ($tag > 010) {return $record->subfield($tag,$subfield)}
+# else {return $record->field($tag)->data}
+ return $record->field('001')->data;
+}
+
=head2 GetTagsLabels
-=over 4
+ $tagslabel= &GetTagsLabels($forlibrarian,$authtypecode)
-$tagslabel= &GetTagsLabels($forlibrarian,$authtypecode)
returns a ref to hashref of authorities tag and subfield structure.
tagslabel usage :
-$tagslabel->{$tag}->{$subfield}->{'attribute'}
+
+ $tagslabel->{$tag}->{$subfield}->{'attribute'}
+
where attribute takes values in :
+
lib
tab
mandatory
@@ -431,8 +549,6 @@ where attribute takes values in :
isurl
link
-=back
-
=cut
sub GetTagsLabels {
@@ -440,7 +556,7 @@ sub GetTagsLabels {
my $dbh=C4::Context->dbh;
$authtypecode="" unless $authtypecode;
my $sth;
- my $libfield = ($forlibrarian eq 1)? 'liblibrarian' : 'libopac';
+ my $libfield = ($forlibrarian == 1)? 'liblibrarian' : 'libopac';
# check that authority exists
@@ -507,14 +623,10 @@ ORDER BY tagfield,tagsubfield"
=head2 AddAuthority
-=over 4
-
-$authid= &AddAuthority($record, $authid,$authtypecode)
-returns authid of the newly created authority
+ $authid= &AddAuthority($record, $authid,$authtypecode)
Either Create Or Modify existing authority.
-
-=back
+returns authid of the newly created authority
=cut
@@ -522,33 +634,89 @@ sub AddAuthority {
# pass the MARC::Record to this function, and it will create the records in the authority table
my ($record,$authid,$authtypecode) = @_;
my $dbh=C4::Context->dbh;
- my $leader=' a ';##Fixme correct leader as this one just adds utf8 to MARC21
+ my $leader=' nz a22 o 4500';#Leader for incomplete MARC21 record
# if authid empty => true add, find a new authid number
- my $format= 'UNIMARCAUTH' if (uc(C4::Context->preference('marcflavour')) eq 'UNIMARC');
- $format= 'MARC21' if (uc(C4::Context->preference('marcflavour')) ne 'UNIMARC');
- if (($format eq "UNIMARCAUTH") && (!$record->subfield('100','a'))){
- $record->leader(" nx j22 ");
+ my $format;
+ if (uc(C4::Context->preference('marcflavour')) eq 'UNIMARC') {
+ $format= 'UNIMARCAUTH';
+ }
+ else {
+ $format= 'MARC21';
+ }
+
+ #update date/time to 005 for marc and unimarc
+ my $time=POSIX::strftime("%Y%m%d%H%M%S",localtime);
+ my $f5=$record->field('005');
+ if (!$f5) {
+ $record->insert_fields_ordered( MARC::Field->new('005',$time.".0") );
+ }
+ else {
+ $f5->update($time.".0");
+ }
+
+ SetUTF8Flag($record);
+ if ($format eq "MARC21") {
+ if (!$record->leader) {
+ $record->leader($leader);
+ }
+ if (!$record->field('003')) {
+ $record->insert_fields_ordered(
+ MARC::Field->new('003',C4::Context->preference('MARCOrgCode'))
+ );
+ }
+ my $date=POSIX::strftime("%y%m%d",localtime);
+ if (!$record->field('008')) {
+ # Get a valid default value for field 008
+ my $default_008 = C4::Context->preference('MARCAuthorityControlField008');
+ if(!$default_008 or length($default_008)<34) {
+ $default_008 = '|| aca||aabn | a|a d';
+ }
+ else {
+ $default_008 = substr($default_008,0,34);
+ }
+
+ $record->insert_fields_ordered( MARC::Field->new('008',$date.$default_008) );
+ }
+ if (!$record->field('040')) {
+ $record->insert_fields_ordered(
+ MARC::Field->new('040','','',
+ 'a' => C4::Context->preference('MARCOrgCode'),
+ 'c' => C4::Context->preference('MARCOrgCode')
+ )
+ );
+ }
+ }
+
+ if ($format eq "UNIMARCAUTH") {
+ $record->leader(" nx j22 ") unless ($record->leader());
my $date=POSIX::strftime("%Y%m%d",localtime);
- if ($record->field('100')){
+ if (my $string=$record->subfield('100',"a")){
+ $string=~s/fre50/frey50/;
+ $record->field('100')->update('a'=>$string);
+ }
+ elsif ($record->field('100')){
$record->field('100')->update('a'=>$date."afrey50 ba0");
- } else {
- $record->append_fields(
- MARC::Field->new('100',' ',' '
- ,'a'=>$date."afrey50 ba0")
- );
- }
+ } else {
+ $record->append_fields(
+ MARC::Field->new('100',' ',' '
+ ,'a'=>$date."afrey50 ba0")
+ );
+ }
}
my ($auth_type_tag, $auth_type_subfield) = get_auth_type_location($authtypecode);
if (!$authid and $format eq "MARC21") {
# only need to do this fix when modifying an existing authority
C4::AuthoritiesMarc::MARC21::fix_marc21_auth_type_location($record, $auth_type_tag, $auth_type_subfield);
}
-
- unless ($record->field($auth_type_tag) && $record->subfield($auth_type_tag, $auth_type_subfield)) {
+ if (my $field=$record->field($auth_type_tag)){
+ $field->update($auth_type_subfield=>$authtypecode);
+ }
+ else {
$record->add_fields($auth_type_tag,'','', $auth_type_subfield=>$authtypecode);
}
+ my $auth_exists=0;
my $oldRecord;
if (!$authid) {
my $sth=$dbh->prepare("select max(authid) from auth_header");
@@ -560,19 +728,23 @@ sub AddAuthority {
$record->delete_field($record->field('001'));
$record->insert_fields_ordered(MARC::Field->new('001',$authid));
}
-# warn $record->as_formatted;
- $sth=$dbh->prepare("insert into auth_header (authid,datecreated,authtypecode,marc,marcxml) values (?,now(),?,?,?)");
- $sth->execute($authid,$authtypecode,$record->as_usmarc,$record->as_xml_record($format));
- $sth->finish;
- }else{
- if (C4::Context->preference('NoZebra')) {
- $oldRecord = GetAuthority($authid);
- }
+ } else {
+ $auth_exists=$dbh->do(qq(select authid from auth_header where authid=?),undef,$authid);
+# warn "auth_exists = $auth_exists";
+ }
+ if ($auth_exists>0){
+ $oldRecord=GetAuthority($authid);
$record->add_fields('001',$authid) unless ($record->field('001'));
- my $sth=$dbh->prepare("update auth_header set marc=?,marcxml=? where authid=?");
- $sth->execute($record->as_usmarc,$record->as_xml_record($format),$authid);
+# warn "\n\n\n enregistrement".$record->as_formatted;
+ my $sth=$dbh->prepare("update auth_header set authtypecode=?,marc=?,marcxml=? where authid=?");
+ $sth->execute($authtypecode,$record->as_usmarc,$record->as_xml_record($format),$authid) or die $sth->errstr;
$sth->finish;
- $dbh->do("unlock tables");
+ }
+ else {
+ my $sth=$dbh->prepare("insert into auth_header (authid,datecreated,authtypecode,marc,marcxml) values (?,now(),?,?,?)");
+ $sth->execute($authid,$authtypecode,$record->as_usmarc,$record->as_xml_record($format));
+ $sth->finish;
+ logaction( "AUTHORITIES", "ADD", $authid, "authority" ) if C4::Context->preference("AuthoritiesLog");
}
ModZebra($authid,'specialUpdate',"authorityserver",$oldRecord,$record);
return ($authid);
@@ -581,96 +753,90 @@ sub AddAuthority {
=head2 DelAuthority
-=over 4
+ $authid= &DelAuthority($authid)
-$authid= &DelAuthority($authid)
Deletes $authid
-=back
-
=cut
-
sub DelAuthority {
my ($authid) = @_;
my $dbh=C4::Context->dbh;
+ logaction( "AUTHORITIES", "DELETE", $authid, "authority" ) if C4::Context->preference("AuthoritiesLog");
ModZebra($authid,"recordDelete","authorityserver",GetAuthority($authid),undef);
- $dbh->do("delete from auth_header where authid=$authid") ;
-
+ my $sth = $dbh->prepare("DELETE FROM auth_header WHERE authid=?");
+ $sth->execute($authid);
}
+=head2 ModAuthority
+
+ $authid= &ModAuthority($authid,$record,$authtypecode)
+
+Modifies authority record, optionally updates attached biblios.
+
+=cut
+
sub ModAuthority {
- my ($authid,$record,$authtypecode,$merge)=@_;
+ my ($authid,$record,$authtypecode)=@_; # deprecated $merge parameter removed
+
my $dbh=C4::Context->dbh;
#Now rewrite the $record to table with an add
my $oldrecord=GetAuthority($authid);
$authid=AddAuthority($record,$authid,$authtypecode);
-### If a library thinks that updating all biblios is a long process and wishes to leave that to a cron job to use merge_authotities.p
-### they should have a system preference "dontmerge=1" otherwise by default biblios will be updated
-### the $merge flag is now depreceated and will be removed at code cleaning
- if (C4::Context->preference('dontmerge') ){
- # save the file in tmp/modified_authorities
- my $cgidir = C4::Context->intranetdir ."/cgi-bin";
- unless (opendir(DIR,"$cgidir")) {
- $cgidir = C4::Context->intranetdir."/";
- closedir(DIR);
- }
-
- my $filename = $cgidir."/tmp/modified_authorities/$authid.authid";
- open AUTH, "> $filename";
- print AUTH $authid;
- close AUTH;
- } else {
+ # If a library thinks that updating all biblios is a long process and wishes
+ # to leave that to a cron job, use misc/migration_tools/merge_authority.pl.
+ # In that case set system preference "dontmerge" to 1. Otherwise biblios will
+ # be updated.
+ unless(C4::Context->preference('dontmerge') eq '1'){
&merge($authid,$oldrecord,$authid,$record);
+ } else {
+ # save a record in need_merge_authorities table
+ my $sqlinsert="INSERT INTO need_merge_authorities (authid, done) ".
+ "VALUES (?,?)";
+ $dbh->do($sqlinsert,undef,($authid,0));
}
+ logaction( "AUTHORITIES", "MODIFY", $authid, "BEFORE=>" . $oldrecord->as_formatted ) if C4::Context->preference("AuthoritiesLog");
return $authid;
}
=head2 GetAuthorityXML
-=over 4
+ $marcxml= &GetAuthorityXML( $authid)
-$marcxml= &GetAuthorityXML( $authid)
returns xml form of record $authid
-=back
-
=cut
sub GetAuthorityXML {
# Returns MARC::XML of the authority passed in parameter.
my ( $authid ) = @_;
- my $format= 'UNIMARCAUTH' if (uc(C4::Context->preference('marcflavour')) eq 'UNIMARC');
- $format= 'MARC21' if (uc(C4::Context->preference('marcflavour')) ne 'UNIMARC');
- if ($format eq "MARC21") {
- # for MARC21, call GetAuthority instead of
- # getting the XML directly since we may
- # need to fix up the location of the authority
- # code -- note that this is reasonably safe
- # because GetAuthorityXML is used only by the
- # indexing processes like zebraqueue_start.pl
- my $record = GetAuthority($authid);
- return $record->as_xml_record($format);
- } else {
- my $dbh=C4::Context->dbh;
- my $sth = $dbh->prepare("select marcxml from auth_header where authid=? " );
- $sth->execute($authid);
- my ($marcxml)=$sth->fetchrow;
- return $marcxml;
+ if (uc(C4::Context->preference('marcflavour')) eq 'UNIMARC') {
+ my $dbh=C4::Context->dbh;
+ my $sth = $dbh->prepare("select marcxml from auth_header where authid=? " );
+ $sth->execute($authid);
+ my ($marcxml)=$sth->fetchrow;
+ return $marcxml;
+ }
+ else {
+ # for MARC21, call GetAuthority instead of
+ # getting the XML directly since we may
+ # need to fix up the location of the authority
+ # code -- note that this is reasonably safe
+ # because GetAuthorityXML is used only by the
+ # indexing processes like zebraqueue_start.pl
+ my $record = GetAuthority($authid);
+ return $record->as_xml_record('MARC21');
}
}
=head2 GetAuthority
-=over 4
+ $record= &GetAuthority( $authid)
-$record= &GetAuthority( $authid)
Returns MARC::Record of the authority passed in parameter.
-=back
-
=cut
sub GetAuthority {
@@ -679,8 +845,9 @@ sub GetAuthority {
my $sth=$dbh->prepare("select authtypecode, marcxml from auth_header where authid=?");
$sth->execute($authid);
my ($authtypecode, $marcxml) = $sth->fetchrow;
- my $record=MARC::Record->new_from_xml(StripNonXmlChars($marcxml),'UTF-8',
- (C4::Context->preference("marcflavour") eq "UNIMARC"?"UNIMARCAUTH":C4::Context->preference("marcflavour")));
+ my $record=eval {MARC::Record->new_from_xml(StripNonXmlChars($marcxml),'UTF-8',
+ (C4::Context->preference("marcflavour") eq "UNIMARC"?"UNIMARCAUTH":C4::Context->preference("marcflavour")))};
+ return undef if ($@);
$record->encoding('UTF-8');
if (C4::Context->preference("marcflavour") eq "MARC21") {
my ($auth_type_tag, $auth_type_subfield) = get_auth_type_location($authtypecode);
@@ -691,11 +858,7 @@ sub GetAuthority {
=head2 GetAuthType
-=over 4
-
-$result = &GetAuthType($authtypecode)
-
-=back
+ $result = &GetAuthType($authtypecode)
If the authority type specified by C<$authtypecode> exists,
returns a hashref of the type's fields. If the type
@@ -719,64 +882,14 @@ sub GetAuthType {
}
-sub AUTHhtml2marc {
- my ($rtags,$rsubfields,$rvalues,%indicators) = @_;
- my $dbh=C4::Context->dbh;
- my $prevtag = -1;
- my $record = MARC::Record->new();
-#---- TODO : the leader is missing
-
-# my %subfieldlist=();
- my $prevvalue; # if tag <10
- my $field; # if tag >=10
- for (my $i=0; $i< @$rtags; $i++) {
- # rebuild MARC::Record
- if (@$rtags[$i] ne $prevtag) {
- if ($prevtag < 10) {
- if ($prevvalue) {
- $record->add_fields((sprintf "%03s",$prevtag),$prevvalue);
- }
- } else {
- if ($field) {
- $record->add_fields($field);
- }
- }
- $indicators{@$rtags[$i]}.=' ';
- if (@$rtags[$i] <10) {
- $prevvalue= @$rvalues[$i];
- undef $field;
- } else {
- undef $prevvalue;
- $field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
- }
- $prevtag = @$rtags[$i];
- } else {
- if (@$rtags[$i] <10) {
- $prevvalue=@$rvalues[$i];
- } else {
- if (length(@$rvalues[$i])>0) {
- $field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
- }
- }
- $prevtag= @$rtags[$i];
- }
- }
- # the last has not been included inside the loop... do it now !
- $record->add_fields($field) if $field;
- return $record;
-}
-
=head2 FindDuplicateAuthority
-=over 4
+ $record= &FindDuplicateAuthority( $record, $authtypecode)
-$record= &FindDuplicateAuthority( $record, $authtypecode)
return $authid,Summary if duplicate is found.
Comments : an improvement would be to return All the records that match.
-=back
-
=cut
sub FindDuplicateAuthority {
@@ -792,10 +905,15 @@ sub FindDuplicateAuthority {
# warn "record :".$record->as_formatted." auth_tag_to_report :$auth_tag_to_report";
# build a request for SearchAuthorities
my $query='at='.$authtypecode.' ';
- map {$query.= " and he=\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/)} $record->field($auth_tag_to_report)->subfields() if $record->field($auth_tag_to_report);
- my ($error, $results, $total_hits)=SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
+ 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.= " and he,wrdl=\"".$_->[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 (@$results>0) {
+ if (!defined $error && @{$results} ) {
my $marcrecord = MARC::File::USMARC::decode($results->[0]);
return $marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
}
@@ -805,17 +923,14 @@ sub FindDuplicateAuthority {
=head2 BuildSummary
-=over 4
+ $text= &BuildSummary( $record, $authid, $authtypecode)
-$text= &BuildSummary( $record, $authid, $authtypecode)
return HTML encoded Summary
Comment : authtypecode can be infered from both record and authid.
Moreover, authid can also be inferred from $record.
Would it be interesting to delete those things.
-=back
-
=cut
sub BuildSummary{
@@ -854,10 +969,12 @@ sub BuildSummary{
if ($summary and C4::Context->preference('marcflavour') eq 'UNIMARC') {
my @fields = $record->fields();
# $reported_tag = '$9'.$result[$counter];
+ my @stringssummary;
foreach my $field (@fields) {
my $tag = $field->tag();
my $tagvalue = $field->as_string();
- $summary =~ s/\[(.?.?.?.?)$tag\*(.*?)]/$1$tagvalue$2\[$1$tag$2]/g;
+ my $localsummary= $summary;
+ $localsummary =~ s/\[(.?.?.?.?)$tag\*(.*?)\]/$1$tagvalue$2\[$1$tag$2\]/g;
if ($tag<10) {
if ($tag eq '001') {
$reported_tag.='$3'.$field->data();
@@ -868,47 +985,51 @@ sub BuildSummary{
my $subfieldcode = $subf[$i][0];
my $subfieldvalue = $subf[$i][1];
my $tagsubf = $tag.$subfieldcode;
- $summary =~ s/\[(.?.?.?.?)$tagsubf(.*?)]/$1$subfieldvalue$2\[$1$tagsubf$2]/g;
+ $localsummary =~ s/\[(.?.?.?.?)$tagsubf(.*?)\]/$1$subfieldvalue$2\[$1$tagsubf$2\]/g;
}
}
+ push @stringssummary, $localsummary if ($localsummary ne $summary);
}
- $summary =~ s/\[(.*?)]//g;
- $summary =~ s/\n/
/g;
+ my $resultstring;
+ $resultstring = join(" -- ",@stringssummary);
+ $resultstring =~ s/\[(.*?)\]//g;
+ $resultstring =~ s/\n/
/g;
+ $summary = $resultstring;
} else {
- my $heading;
- my $authid;
- my $altheading;
- my $seealso;
- my $broaderterms;
- my $narrowerterms;
- my $see;
- my $seeheading;
- my $notes;
+ my $heading = '';
+ my $altheading = '';
+ my $seealso = '';
+ my $broaderterms = '';
+ my $narrowerterms = '';
+ my $see = '';
+ my $seeheading = '';
+ my $notes = '';
my @fields = $record->fields();
if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
# construct UNIMARC summary, that is quite different from MARC21 one
# accepted form
foreach my $field ($record->field('2..')) {
- $heading.= $field->subfield('a');
- $authid=$field->subfield('3');
+ $heading.= $field->as_string('abcdefghijlmnopqrstuvwxyz');
}
# rejected form(s)
foreach my $field ($record->field('3..')) {
$notes.= ''.$field->subfield('a')."\n";
}
foreach my $field ($record->field('4..')) {
- my $thesaurus = "thes. : ".$thesaurus{"$field->subfield('2')"}." : " if ($field->subfield('2'));
- $see.= ''.$thesaurus.$field->subfield('a')." -- \n";
+ if ($field->subfield('2')) {
+ my $thesaurus = "thes. : ".$thesaurus{"$field->subfield('2')"}." : ";
+ $see.= ''.$thesaurus.$field->as_string('abcdefghijlmnopqrstuvwxyz')." -- \n";
+ }
}
# see :
foreach my $field ($record->field('5..')) {
if (($field->subfield('5')) && ($field->subfield('a')) && ($field->subfield('5') eq 'g')) {
- $broaderterms.= ' '.$field->subfield('a')." -- \n";
- } elsif (($field->subfield('5')) && ($field->subfield('a')) && ($field->subfield('5') eq 'h')){
- $narrowerterms.= ''.$field->subfield('a')." -- \n";
+ $broaderterms.= ' '.$field->as_string('abcdefgjxyz')." -- \n";
+ } elsif (($field->subfield('5')) && ($field->as_string) && ($field->subfield('5') eq 'h')){
+ $narrowerterms.= ''.$field->as_string('abcdefgjxyz')." -- \n";
} elsif ($field->subfield('a')) {
- $seealso.= ''.$field->subfield('a')." -- \n";
+ $seealso.= ''.$field->as_string('abcdefgxyz')." -- \n";
}
}
# // form
@@ -920,7 +1041,7 @@ sub BuildSummary{
$narrowerterms =~s/-- \n$//;
$seealso =~s/-- \n$//;
$see =~s/-- \n$//;
- $summary = "".$heading."
".($notes?"$notes
":"");
+ $summary = $heading."
".($notes?"$notes
":"");
$summary.= 'TG : '.$broaderterms.'
' if ($broaderterms);
$summary.= 'TS : '.$narrowerterms.'
' if ($narrowerterms);
$summary.= 'TA : '.$seealso.'
' if ($seealso);
@@ -945,8 +1066,8 @@ sub BuildSummary{
} elsif ($record->field('148')) {
$heading.= $field->as_string('abvxyz68');
} elsif ($record->field('150')) {
- # $heading.= $field->as_string('abvxyz68');
- $heading.= $field->as_formatted();
+ $heading.= $field->as_string('abvxyz68');
+ #$heading.= $field->as_formatted();
my $tag=$field->tag();
$heading=~s /^$tag//g;
$heading =~s /\_/\$/g;
@@ -981,17 +1102,14 @@ sub BuildSummary{
=head2 BuildUnimarcHierarchies
-=over 4
+ $text= &BuildUnimarcHierarchies( $authid, $force)
-$text= &BuildUnimarcHierarchies( $authid, $force)
return text containing trees for hierarchies
for them to be stored in auth_header
Example of text:
122,1314,2452;1324,2342,3,2452
-=back
-
=cut
sub BuildUnimarcHierarchies{
@@ -1004,17 +1122,20 @@ sub BuildUnimarcHierarchies{
my $data = GetHeaderAuthority($authid);
if ($data->{'authtrees'} and not $force){
return $data->{'authtrees'};
- } elsif ($data->{'authtrees'}){
- $hierarchies=$data->{'authtrees'};
+# } elsif ($data->{'authtrees'}){
+# $hierarchies=$data->{'authtrees'};
} else {
my $record = GetAuthority($authid);
my $found;
- foreach my $field ($record->field('550')){
+ return unless $record;
+ foreach my $field ($record->field('5..')){
if ($field->subfield('5') && $field->subfield('5') eq 'g'){
- my $parentrecord = GetAuthority($field->subfield('3'));
+ my $subfauthid=_get_authid_subfield($field);
+ next if ($subfauthid eq $authid);
+ my $parentrecord = GetAuthority($subfauthid);
my $localresult=$hierarchies;
my $trees;
- $trees = BuildUnimarcHierarchies($field->subfield('3'));
+ $trees = BuildUnimarcHierarchies($subfauthid);
my @trees;
if ($trees=~/;/){
@trees = split(/;/,$trees);
@@ -1038,9 +1159,8 @@ sub BuildUnimarcHierarchies{
=head2 BuildUnimarcHierarchy
-=over 4
+ $ref= &BuildUnimarcHierarchy( $record, $class,$authid)
-$ref= &BuildUnimarcHierarchy( $record, $class,$authid)
return a hashref in order to display hierarchy for record and final Authid $authid
"loopparents"
@@ -1054,27 +1174,28 @@ return a hashref in order to display hierarchy for record and final Authid $auth
"ifchildren"
Those two latest ones should disappear soon.
-=back
-
=cut
sub BuildUnimarcHierarchy{
my $record = shift @_;
my $class = shift @_;
my $authid_constructed = shift @_;
- my $authid=$record->subfield('250','3');
+ return undef unless ($record);
+ my $authid=$record->field('001')->data();
my %cell;
my $parents=""; my $children="";
my (@loopparents,@loopchildren);
- foreach my $field ($record->field('550')){
- if ($field->subfield('5') && $field->subfield('a')){
- if ($field->subfield('5') eq 'h'){
- push @loopchildren, { "childauthid"=>$field->subfield('3'),"childvalue"=>$field->subfield('a')};
- }elsif ($field->subfield('5') eq 'g'){
- push @loopparents, { "parentauthid"=>$field->subfield('3'),"parentvalue"=>$field->subfield('a')};
- }
+ foreach my $field ($record->field('5..')){
+ my $subfauthid=_get_authid_subfield($field);
+ if ($subfauthid && $field->subfield('5') && $field->subfield('a')){
+ if ($field->subfield('5') eq 'h'){
+ push @loopchildren, { "childauthid"=>$field->subfield('3'),"childvalue"=>$field->subfield('a')};
+ }
+ elsif ($field->subfield('5') eq 'g'){
+ push @loopparents, { "parentauthid"=>$field->subfield('3'),"parentvalue"=>$field->subfield('a')};
+ }
# brothers could get in there with an else
- }
+ }
}
$cell{"ifparents"}=1 if (scalar(@loopparents)>0);
$cell{"ifchildren"}=1 if (scalar(@loopchildren)>0);
@@ -1083,19 +1204,20 @@ sub BuildUnimarcHierarchy{
$cell{"class"}=$class;
$cell{"loopauthid"}=$authid;
$cell{"current_value"} =1 if $authid eq $authid_constructed;
- $cell{"value"}=$record->subfield('250',"a");
+ $cell{"value"}=$record->subfield('2..',"a");
return \%cell;
}
+sub _get_authid_subfield{
+ my ($field)=@_;
+ return $field->subfield('9')||$field->subfield('3');
+}
=head2 GetHeaderAuthority
-=over 4
+ $ref= &GetHeaderAuthority( $authid)
-$ref= &GetHeaderAuthority( $authid)
return a hashref in order auth_header table data
-=back
-
=cut
sub GetHeaderAuthority{
@@ -1110,13 +1232,10 @@ sub GetHeaderAuthority{
=head2 AddAuthorityTrees
-=over 4
+ $ref= &AddAuthorityTrees( $authid, $trees)
-$ref= &AddAuthorityTrees( $authid, $trees)
return success or failure
-=back
-
=cut
sub AddAuthorityTrees{
@@ -1130,16 +1249,11 @@ sub AddAuthorityTrees{
=head2 merge
-=over 4
-
-$ref= &merge(mergefrom,$MARCfrom,$mergeto,$MARCto)
-
+ $ref= &merge(mergefrom,$MARCfrom,$mergeto,$MARCto)
Could add some feature : Migrating from a typecode to an other for instance.
Then we should add some new parameter : bibliotargettag, authtargettag
-=back
-
=cut
sub merge {
@@ -1148,20 +1262,21 @@ sub merge {
my $dbh=C4::Context->dbh;
my $authtypecodefrom = GetAuthTypeCode($mergefrom);
my $authtypecodeto = GetAuthTypeCode($mergeto);
+# warn "mergefrom : $authtypecodefrom $mergefrom mergeto : $authtypecodeto $mergeto ";
# return if authority does not exist
- my @X = $MARCfrom->fields();
- return "error MARCFROM not a marcrecord ".Data::Dumper::Dumper($MARCfrom) if $#X == -1;
- @X = $MARCto->fields();
- return "error MARCTO not a marcrecord".Data::Dumper::Dumper($MARCto) if $#X == -1;
+ return "error MARCFROM not a marcrecord ".Data::Dumper::Dumper($MARCfrom) if scalar($MARCfrom->fields()) == 0;
+ return "error MARCTO not a marcrecord".Data::Dumper::Dumper($MARCto) if scalar($MARCto->fields()) == 0;
# search the tag to report
my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
$sth->execute($authtypecodefrom);
- my ($auth_tag_to_report) = $sth->fetchrow;
+ my ($auth_tag_to_report_from) = $sth->fetchrow;
+ $sth->execute($authtypecodeto);
+ my ($auth_tag_to_report_to) = $sth->fetchrow;
my @record_to;
- @record_to = $MARCto->field($auth_tag_to_report)->subfields() if $MARCto->field($auth_tag_to_report);
+ @record_to = $MARCto->field($auth_tag_to_report_to)->subfields() if $MARCto->field($auth_tag_to_report_to);
my @record_from;
- @record_from = $MARCfrom->field($auth_tag_to_report)->subfields() if $MARCfrom->field($auth_tag_to_report);
+ @record_from = $MARCfrom->field($auth_tag_to_report_from)->subfields() if $MARCfrom->field($auth_tag_to_report_from);
my @reccache;
# search all biblio tags using this authority.
@@ -1173,30 +1288,37 @@ sub merge {
$rq->execute;
while (my $biblionumbers=$rq->fetchrow){
my @biblionumbers=split /;/,$biblionumbers;
- map {
- my $biblionumber=$1 if ($_=~/(\d+),.*/);
- my $marc=GetMarcBiblio($biblionumber);
- push @reccache,$marc;
- } @biblionumbers;
+ foreach (@biblionumbers) {
+ if ($_=~/(\d+),.*/) {
+ my $marc=GetMarcBiblio($1);
+ push @reccache,$marc;
+ }
+ }
}
} else {
#zebra connection
my $oConnection=C4::Context->Zconn("biblioserver",0);
+ my $oldSyntax = $oConnection->option("preferredRecordSyntax");
+ $oConnection->option("preferredRecordSyntax"=>"XML");
my $query;
$query= "an=".$mergefrom;
my $oResult = $oConnection->search(new ZOOM::Query::CCL2RPN( $query, $oConnection ));
- my $count=$oResult->size() if ($oResult);
+ my $count = 0;
+ if ($oResult) {
+ $count=$oResult->size();
+ }
my $z=0;
while ( $z<$count ) {
my $rec;
$rec=$oResult->record($z);
my $marcdata = $rec->raw();
push @reccache, $marcdata;
- $z++;
+ $z++;
}
- $oConnection->destroy();
+ $oResult->destroy();
+ $oConnection->option("preferredRecordSyntax"=>$oldSyntax);
}
- warn scalar(@reccache)." biblios to update";
+ #warn scalar(@reccache)." biblios to update";
# Get All candidate Tags for the change
# (This will reduce the search scope in marc records).
$sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
@@ -1210,37 +1332,58 @@ sub merge {
# If many tags, take the first
$sth->execute($authtypecodeto);
$tag_to=$sth->fetchrow;
- warn $tag_to;
+ #warn $tag_to;
}
# BulkEdit marc records
# May be used as a template for a bulkedit field
foreach my $marcrecord(@reccache){
my $update;
- $marcrecord= MARC::File::USMARC::decode($marcrecord) unless(C4::Context->preference('NoZebra'));
+ $marcrecord= MARC::Record->new_from_xml($marcrecord,"utf8",C4::Context->preference("marcflavour")) unless(C4::Context->preference('NoZebra'));
foreach my $tagfield (@tags_using_authtype){
+# warn "tagfield : $tagfield ";
foreach my $field ($marcrecord->field($tagfield)){
my $auth_number=$field->subfield("9");
my $tag=$field->tag();
if ($auth_number==$mergefrom) {
- my $field_to=MARC::Field->new(($tag_to?$tag_to:$tag),$field->indicator(1),$field->indicator(2),"9"=>$mergeto);
- foreach my $subfield (@record_to) {
- $field_to->add_subfields($subfield->[0] =>$subfield->[1]);
- }
- $marcrecord->delete_field($field);
- $marcrecord->insert_grouped_field($field_to);
- $update=1;
+ my $field_to=MARC::Field->new(($tag_to?$tag_to:$tag),$field->indicator(1),$field->indicator(2),"9"=>$mergeto);
+ my $exclude='9';
+ foreach my $subfield (@record_to) {
+ $field_to->add_subfields($subfield->[0] =>$subfield->[1]);
+ $exclude.= $subfield->[0];
+ }
+ $exclude='['.$exclude.']';
+# add subfields in $field not included in @record_to
+ my @restore= grep {$_->[0]!~/$exclude/} $field->subfields();
+ foreach my $subfield (@restore) {
+ $field_to->add_subfields($subfield->[0] =>$subfield->[1]);
+ }
+ $marcrecord->delete_field($field);
+ $marcrecord->insert_grouped_field($field_to);
+ $update=1;
}
}#for each tag
}#foreach tagfield
- my $oldbiblio = TransformMarcToKoha($dbh,$marcrecord,"") ;
+ my ($bibliotag,$bibliosubf) = GetMarcFromKohaField("biblio.biblionumber","") ;
+ my $biblionumber;
+ if ($bibliotag<10){
+ $biblionumber=$marcrecord->field($bibliotag)->data;
+ }
+ else {
+ $biblionumber=$marcrecord->subfield($bibliotag,$bibliosubf);
+ }
+ unless ($biblionumber){
+ warn "pas de numéro de notice bibliographique dans : ".$marcrecord->as_formatted;
+ next;
+ }
if ($update==1){
- &ModBiblio($marcrecord,$oldbiblio->{'biblionumber'},GetFrameworkCode($oldbiblio->{'biblionumber'})) ;
+ &ModBiblio($marcrecord,$biblionumber,GetFrameworkCode($biblionumber)) ;
$counteditedbiblio++;
warn $counteditedbiblio if (($counteditedbiblio % 10) and $ENV{DEBUG});
}
}#foreach $marc
return $counteditedbiblio;
# now, find every other authority linked with this authority
+ # now, find every other authority linked with this authority
# my $oConnection=C4::Context->Zconn("authorityserver");
# my $query;
# # att 9210 Auth-Internal-authtype
@@ -1291,11 +1434,7 @@ sub merge {
=head2 get_auth_type_location
-=over 4
-
-my ($tag, $subfield) = get_auth_type_location($auth_type_code);
-
-=back
+ my ($tag, $subfield) = get_auth_type_location($auth_type_code);
Get the tag and subfield used to store the heading type
for indexing purposes. The C<$auth_type> parameter is
@@ -1313,7 +1452,7 @@ sub get_auth_type_location {
my $auth_type_code = @_ ? shift : '';
my ($tag, $subfield) = GetAuthMARCFromKohaField('auth_header.authtypecode', $auth_type_code);
- if (defined $tag and defined $subfield and $tag != 0 and $subfield != 0) {
+ if (defined $tag and defined $subfield and $tag != 0 and $subfield ne '' and $subfield ne ' ') {
return ($tag, $subfield);
} else {
if (C4::Context->preference('marcflavour') eq "MARC21") {
@@ -1331,7 +1470,7 @@ __END__
=head1 AUTHOR
-Koha Developement team
+Koha Development Team
Paul POULAIN paul.poulain@free.fr