fixes for authorities

This commit is contained in:
tipaul 2004-09-13 15:21:00 +00:00
parent da5c8dd25b
commit a712d1cc30
2 changed files with 34 additions and 17 deletions

View file

@ -160,7 +160,7 @@ sub create_input () {
sub build_tabs ($$$$) { sub build_tabs ($$$$) {
my($template, $record, $dbh,$encoding) = @_; my($template, $record, $dbh,$encoding) = @_;
warn "=>".$record->as_formatted; # warn "=>".$record->as_formatted;
# fill arrays # fill arrays
my @loop_data =(); my @loop_data =();
my $tag; my $tag;
@ -334,7 +334,6 @@ if ($op eq "add") {
} }
my $record = AUTHhtml2marc($dbh,\@tags,\@subfields,\@values,%indicators); my $record = AUTHhtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
# MARC::Record built => now, record in DB # MARC::Record built => now, record in DB
warn "IN ADD : ".$record->as_formatted();
if ($is_a_modif) { if ($is_a_modif) {
AUTHmodauthority($dbh,$authid,$record,$authtypecode); AUTHmodauthority($dbh,$authid,$record,$authtypecode);
} else { } else {

View file

@ -61,7 +61,7 @@ my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode); my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
my $auth_type = AUTHgetauth_type($authtypecode); my $auth_type = AUTHgetauth_type($authtypecode);
warn "XX = ".$auth_type->{auth_tag_to_report}; # warn "XX = ".$auth_type->{auth_tag_to_report};
my $record =AUTHgetauthority($dbh,$authid); my $record =AUTHgetauthority($dbh,$authid);
# open template # open template
@ -78,25 +78,43 @@ my ($template, $loggedinuser, $cookie)
my @loop_data =(); my @loop_data =();
my $tag; my $tag;
my @loop_data =(); my @loop_data =();
foreach my $field ($record->fields($auth_type->{auth_tag_to_report})) { if ($authid) {
my @subfields_data; foreach my $field ($record->fields($auth_type->{auth_tag_to_report})) {
my @subf=$field->subfields; my @subfields_data;
# loop through each subfield my @subf=$field->subfields;
for my $i (0..$#subf) { # loop through each subfield
$subf[$i][0] = "@" unless $subf[$i][0]; for my $i (0..$#subf) {
my %subfield_data; $subf[$i][0] = "@" unless $subf[$i][0];
my %subfield_data;
$subfield_data{marc_value}=$subf[$i][1]; $subfield_data{marc_value}=$subf[$i][1];
$subfield_data{marc_subfield}=$subf[$i][0]; $subfield_data{marc_subfield}=$subf[$i][0];
$subfield_data{marc_tag}=$field->tag(); $subfield_data{marc_tag}=$field->tag();
push(@subfields_data, \%subfield_data); push(@subfields_data, \%subfield_data);
}
if ($#subfields_data>=0) {
my %tag_data;
$tag_data{tag}=$field->tag().' -'. $tagslib->{$field->tag()}->{lib};
$tag_data{subfield} = \@subfields_data;
push (@loop_data, \%tag_data);
}
} }
if ($#subfields_data>=0) { } else {
# authid is empty => the user want to empty the entry.
my @subfields_data;
foreach my $subfield ('a'..'z') {
my %subfield_data;
$subfield_data{marc_value}='';
$subfield_data{marc_subfield}=$subfield;
push(@subfields_data, \%subfield_data);
}
# if ($#subfields_data>=0) {
my %tag_data; my %tag_data;
$tag_data{tag}=$field->tag().' -'. $tagslib->{$field->tag()}->{lib}; # $tag_data{tag}=$field->tag().' -'. $tagslib->{$field->tag()}->{lib};
$tag_data{subfield} = \@subfields_data; $tag_data{subfield} = \@subfields_data;
push (@loop_data, \%tag_data); push (@loop_data, \%tag_data);
} # }
} }
$template->param("0XX" =>\@loop_data); $template->param("0XX" =>\@loop_data);
# my $authtypes = getauthtypes; # my $authtypes = getauthtypes;
@ -110,7 +128,7 @@ $template->param("0XX" =>\@loop_data);
# push @authtypesloop, \%row; # push @authtypesloop, \%row;
# } # }
$template->param(authid => $authid, $template->param(authid => $authid?$authid:"",
# authtypesloop => \@authtypesloop, # authtypesloop => \@authtypesloop,
index => $index); index => $index);
output_html_with_http_headers $query, $cookie, $template->output; output_html_with_http_headers $query, $cookie, $template->output;