use C4::Branch; # XXX subfield_is_koha_internal_p
use C4::ClassSource;
use C4::ImportBatch;
+use C4::Charset;
use Date::Calc qw(Today);
use MARC::File::USMARC;
}
}
- if ( ref($record) eq undef ) {
+ if ( !defined(ref($record)) ) {
return -1;
}
else {
$value =~ s/"/"/g;
+ # determine maximum length; 9999 bytes per ISO 2709 except for leader and MARC21 008
+ my $max_length = 9999;
+ if ($tag eq '000') {
+ $max_length = 24;
+ } elsif ($tag eq '008' and C4::Context->preference('marcflavour') eq 'MARC21') {
+ $max_length = 40;
+ }
+
# if there is no value provided but a default value in parameters, get it
unless ($value) {
$value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
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=\"$max_length\"
+ readonly=\"readonly\"
+ \/>";
+
# it's a thesaurus / authority field
}
elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
class=\"input_marceditor\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
\/>
<a href=\"#\" class=\"buttonDot\"
onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
class=\"input_marceditor\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
readonly=\"readonly\"
\/>
<a href=\"#\" class=\"buttonDot\"
class=\"input_marceditor\"
onfocus=\"Focus$function_name($index_tag)\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
onblur=\"Blur$function_name($index_tag); \" \/>
<a href=\"#\" class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
$javascript";
value=\"$value\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
class=\"input_marceditor\"
\/>
";
id=\"".$subfield_data{id}."\"
name=\"".$subfield_data{id}."\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
value=\"$value\" \/>
";
}
class=\"input_marceditor\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
value=\"$value\"
\/>";
value=\"$value\"
tabindex=\"1\"
size=\"67\"
- maxlength=\"255\"
+ maxlength=\"$max_length\"
class=\"input_marceditor\"
\/>
";
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 ) = @_;
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.
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,
index => $index_tag,
tag_lib => $tagslib->{$tag}->{lib},
repeatable => $tagslib->{$tag}->{repeatable},
+ mandatory => $tagslib->{$tag}->{mandatory},
subfield_loop => \@subfields_data,
fixedfield => $tag < 10?1:0,
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 );
}
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(
index => $index_tag,
tag_lib => $tagslib->{$tag}->{lib},
repeatable => $tagslib->{$tag}->{repeatable},
- indicator => $indicator,
+ mandatory => $tagslib->{$tag}->{mandatory},
+ indicator1 => $indicator1,
+ indicator2 => $indicator2,
subfield_loop => \@subfields_data,
tagfirstsubfield => $subfields_data[0],
fixedfield => $tag < 10?1:0,
###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();
$marcrecordauth->insert_fields_ordered($authfield);
+
+ # bug 2317: ensure new authority knows it's using UTF-8; currently
+ # only need to do this for MARC21, as MARC::Record->as_xml_record() handles
+ # automatically for UNIMARC (by not transcoding)
+ # FIXME: AddAuthority() instead should simply explicitly require that the MARC::Record
+ # use UTF-8, but as of 2008-08-05, did not want to introduce that kind
+ # of change to a core API just before the 3.0 release.
+ if (C4::Context->preference('marcflavour') eq 'MARC21') {
+ SetMarcUnicodeFlag($marcrecordauth, 'MARC21');
+ }
+
# warn "AUTH RECORD ADDED : ".$marcrecordauth->as_formatted;
+
my $authid=AddAuthority($marcrecordauth,'',$data->{authtypecode});
$countcreated++;
$field->add_subfields('9'=>$authid);
projects / koha_fer / blobdiff