remove warning

[koha.git] / C4 / AuthoritiesMarc.pm

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 72d0992..c2c1786 100644 (file)
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -246,7 +246,7 @@ sub SearchAuthorities {
             }#if value
         }
         ##Add how many queries generated
-               my $query;
+               $query='';
                foreach my $query_part (@queries){
                        $query=($query?$and.$query_part.$query:$query_part);
                }
@@ -526,8 +526,9 @@ sub AddAuthority {
        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');
+  my $format = uc(C4::Context->preference('marcflavour')) eq 'UNIMARC'
+    ? 'UNIMARCAUTH' : 'MARC21'
+  ; 
 
        if ($format eq "MARC21") {
                if (!$record->leader) {
@@ -590,12 +591,10 @@ sub AddAuthority {
     my $sth=$dbh->prepare("select max(authid) from auth_header");
     $sth->execute;
     ($authid)=$sth->fetchrow;
-    $authid=$authid+1;
-  ##Insert the recordID in MARC record 
-    unless ($record->field('001') && $record->field('001')->data() eq $authid){
-        $record->delete_field($record->field('001'));
-        $record->insert_fields_ordered(MARC::Field->new('001',$authid));
-    }
+    ( $authid ||= 0 )++; # $authid is undef for the first authority
+    ## Insert the recordID in MARC record
+    if   ( my $field = $record->field('001') ) { $field->data($authid) }
+    else { $record->insert_fields_ordered(MARC::Field->new('001',$authid)) }
   } else {
     $auth_exists=$dbh->do(qq(select authid from auth_header where authid=?),undef,$authid);
 #     warn "auth_exists = $auth_exists";
@@ -920,7 +919,6 @@ sub BuildSummary{
     $summary =~ s/\n/<br>/g;
   } else {
     my $heading; 
-    my $authid; 
     my $altheading;
     my $seealso;
     my $broaderterms;
@@ -934,7 +932,6 @@ sub BuildSummary{
       # accepted form
       foreach my $field ($record->field('2..')) {
         $heading.= $field->subfield('a');
-                $authid=$field->subfield('3');
       }
       # rejected form(s)
       foreach my $field ($record->field('3..')) {
@@ -948,13 +945,13 @@ sub BuildSummary{
       }
       # see :
       foreach my $field ($record->field('5..')) {
-            
+        my $authid=_get_authid_subfield($field);    
         if (($field->subfield('5')) && ($field->subfield('a')) && ($field->subfield('5') eq 'g')) {
-          $broaderterms.= '<span class="BT"> <a href="detail.pl?authid='.$field->subfield('3').'">'.$field->subfield('a')."</a></span> -- \n";
+          $broaderterms.= '<span class="BT"> <a href="detail.pl?authid='.$authid.'">'.$field->subfield('a')."</a></span> -- \n";
         } elsif (($field->subfield('5')) && ($field->subfield('a')) && ($field->subfield('5') eq 'h')){
-          $narrowerterms.= '<span class="NT"><a href="detail.pl?authid='.$field->subfield('3').'">'.$field->subfield('a')."</a></span> -- \n";
+          $narrowerterms.= '<span class="NT"><a href="detail.pl?authid='.$authid.'">'.$field->subfield('a')."</a></span> -- \n";
         } elsif ($field->subfield('a')) {
-          $seealso.= '<span class="RT"><a href="detail.pl?authid='.$field->subfield('3').'">'.$field->subfield('a')."</a></span> -- \n";
+          $seealso.= '<span class="RT"><a href="detail.pl?authid='.$authid.'">'.$field->subfield('a')."</a></span> -- \n";
         }
       }
       # // form
@@ -1025,6 +1022,10 @@ sub BuildSummary{
   return $summary;
 }
 
+sub _get_authid_subfield{
+       my ($field)=@_;
+       return $field->subfield('9')||$field->subfield('3');
+}
 =head2 BuildUnimarcHierarchies
 
 =over 4
@@ -1057,10 +1058,11 @@ sub BuildUnimarcHierarchies{
     my $found;
     foreach my $field ($record->field('550')){
       if ($field->subfield('5') && $field->subfield('5') eq 'g'){
-        my $parentrecord = GetAuthority($field->subfield('3'));
+               my $subfauthid=_get_authid_subfield($field);
+        my $parentrecord = GetAuthority($subfauthid);
         my $localresult=$hierarchies;
         my $trees;
-        $trees = BuildUnimarcHierarchies($field->subfield('3'));
+        $trees = BuildUnimarcHierarchies($subfauthid);
         my @trees;
         if ($trees=~/;/){
            @trees = split(/;/,$trees);
@@ -1108,16 +1110,17 @@ sub BuildUnimarcHierarchy{
   my $record = shift @_;
   my $class = shift @_;
   my $authid_constructed = shift @_;
-  my $authid=$record->subfield('2..','3');
+  my $authid=$record->field('001')->data();
   my %cell;
   my $parents=""; my $children="";
   my (@loopparents,@loopchildren);
   foreach my $field ($record->field('550')){
+       my $subfauthid=_get_authid_subfield($field);
     if ($field->subfield('5') && $field->subfield('a')){
       if ($field->subfield('5') eq 'h'){
-        push @loopchildren, { "childauthid"=>$field->subfield('3'),"childvalue"=>$field->subfield('a')};
+        push @loopchildren, { "childauthid"=>$subfauthid,"childvalue"=>$field->subfield('a')};
       }elsif ($field->subfield('5') eq 'g'){
-        push @loopparents, { "parentauthid"=>$field->subfield('3'),"parentvalue"=>$field->subfield('a')};
+        push @loopparents, { "parentauthid"=>$subfauthid,"parentvalue"=>$field->subfield('a')};
       }
           # brothers could get in there with an else
     }