BUGFIX : unimarc leader is 24, not 25. Fixing the javascript test

[koha_gimpoz] / cataloguing / addbiblio.pl

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 68c7096..ca07b26 100755 (executable)
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -339,6 +339,25 @@ sub create_input {
           build_authorized_values_list( $tag, $subfield, $value, $dbh,
             $authorised_values_sth,$index_tag,$index_subfield );
 
+    # it's a subfield $9 linking to an authority record - see bug 2206
+    }
+    elsif ($subfield eq "9" and
+           exists($tagslib->{$tag}->{'a'}->{authtypecode}) and
+           defined($tagslib->{$tag}->{'a'}->{authtypecode}) and
+           $tagslib->{$tag}->{'a'}->{authtypecode} ne '') {
+
+        $subfield_data{marc_value} =
+            "<input type=\"text\"
+                    id=\"".$subfield_data{id}."\"
+                    name=\"".$subfield_data{id}."\"
+                    value=\"$value\"
+                    class=\"input_marceditor\"
+                    tabindex=\"1\"
+                    size=\"5\"
+                    maxlength=\"255\" 
+                    readonly=\"readonly\"
+                    \/>";
+
     # it's a thesaurus / authority field
     }
     elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
@@ -482,6 +501,22 @@ sub create_input {
     return \%subfield_data;
 }
 
+
+=item format_indicator
+
+Translate indicator value for output form - specifically, map
+indicator = ' ' to ''.  This is for the convenience of a cataloger
+using a mouse to select an indicator input.
+
+=cut
+
+sub format_indicator {
+    my $ind_value = shift;
+    return '' if not defined $ind_value;
+    return '' if $ind_value eq ' ';
+    return $ind_value;
+}
+
 sub build_tabs ($$$$$) {
     my ( $template, $record, $dbh, $encoding,$input ) = @_;
 
@@ -522,7 +557,7 @@ sub build_tabs ($$$$$) {
         foreach my $tag (@tab_data) {
             $i++;
             next if ! $tag;
-            my $indicator;
+            my ($indicator1, $indicator2);
             my $index_tag = CreateKey;
 
             # if MARC::Record is not empty =>use it as master loop, then add missing subfields that should be in the tab.
@@ -586,8 +621,15 @@ sub build_tabs ($$$$$) {
                         next if ( $tag < 10 );
                         next
                           if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -4 )
-                            or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 5 )
-                          );    #check for visibility flag
+                            or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 5 ) )
+                            and not ( $subfield eq "9" and
+                                      exists($tagslib->{$tag}->{'a'}->{authtypecode}) and
+                                      defined($tagslib->{$tag}->{'a'}->{authtypecode}) and
+                                      $tagslib->{$tag}->{'a'}->{authtypecode} ne ""
+                                    )
+                          ;    #check for visibility flag
+                               # if subfield is $9 in a field whose $a is authority-controlled,
+                               # always include in the form regardless of the hidden setting - bug 2206
                         next if ( defined( $field->subfield($subfield) ) );
                         push(
                             @subfields_data,
@@ -612,7 +654,8 @@ sub build_tabs ($$$$$) {
                             random        => CreateKey,
                         );
                         if ($tag >= 010){ # no indicator for theses tag
-                           $tag_data{indicator} = $field->indicator(1).$field->indicator(2);
+                           $tag_data{indicator1} = format_indicator($field->indicator(1)),
+                           $tag_data{indicator2} = format_indicator($field->indicator(2)),
                         }
                         push( @loop_data, \%tag_data );
                     }
@@ -627,7 +670,14 @@ sub build_tabs ($$$$$) {
                     next
                       if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -5 )
                         or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 4 ) )
+                      and not ( $subfield eq "9" and
+                                exists($tagslib->{$tag}->{'a'}->{authtypecode}) and
+                                defined($tagslib->{$tag}->{'a'}->{authtypecode}) and
+                                $tagslib->{$tag}->{'a'}->{authtypecode} ne ""
+                              )
                       ;    #check for visibility flag
+                           # if subfield is $9 in a field whose $a is authority-controlled,
+                           # always include in the form regardless of the hidden setting - bug 2206
                     next
                       if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
                     push(
@@ -644,7 +694,8 @@ sub build_tabs ($$$$$) {
                         index            => $index_tag,
                         tag_lib          => $tagslib->{$tag}->{lib},
                         repeatable       => $tagslib->{$tag}->{repeatable},
-                        indicator        => $indicator,
+                        indicator1       => $indicator1,
+                        indicator2       => $indicator2,
                         subfield_loop    => \@subfields_data,
                         tagfirstsubfield => $subfields_data[0],
                         fixedfield       => $tag < 10?1:0,
@@ -716,6 +767,7 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|);
   ###NOTICE : This is only valid if a subfield is linked to one and only one authtypecode     
   ###NOTICE : This can be a problem. We should also look into other types and rejected forms.
          my $authtypedata=GetAuthType($data->{authtypecode});
+         next unless $authtypedata;
          my $marcrecordauth=MARC::Record->new();
          my $authfield=MARC::Field->new($authtypedata->{auth_tag_to_report},'','',"a"=>"".$field->subfield('a'));
          map { $authfield->add_subfields($_->[0]=>$_->[1]) if ($_->[0]=~/[A-z]/ && $_->[0] ne "a" )}  $field->subfields();