use HTML::Template;
use MARC::File::USMARC;
-use vars qw( $tagslib );
+use vars qw( $tagslib);
+use vars qw( $authorised_values_sth);
use vars qw( $is_a_modif );
-
=item find_value
- ($indicators, $value) = find_value($tag, $subfield, $record);
+ ($indicators, $value) = find_value($tag, $subfield, $record,$encoding);
Find the given $subfield in the given $tag in the given
MARC::Record $record. If the subfield is found, returns
=cut
sub find_value {
- my ($tagfield,$insubfield,$record) = @_;
-# warn "$tagfield / $insubfield // ";
- my $result;
+ my ($tagfield,$insubfield,$record,$encoding) = @_;
+ my @result;
my $indicator;
- foreach my $field ($record->field($tagfield)) {
- my @subfields = $field->subfields();
- foreach my $subfield (@subfields) {
- if (@$subfield[0] eq $insubfield) {
- $result .= @$subfield[1];
- $indicator = $field->indicator(1).$field->indicator(2);
+ if ($tagfield <10) {
+ if ($record->field($tagfield)) {
+ push @result, $record->field($tagfield)->data();
+ } else {
+ push @result,"";
+ }
+ } else {
+ foreach my $field ($record->field($tagfield)) {
+ my @subfields = $field->subfields();
+ foreach my $subfield (@subfields) {
+ if (@$subfield[0] eq $insubfield) {
+ push @result,char_decode(@$subfield[1],$encoding);
+ $indicator = $field->indicator(1).$field->indicator(2);
+ }
}
}
}
- return($indicator,$result);
+ return($indicator,@result);
}
-=item find_value
+=item MARCfindbreeding
$record = MARCfindbreeding($dbh, $breedingid);
Look up the breeding farm with database handle $dbh, for the
record with id $breedingid. If found, returns the decoded
MARC::Record; otherwise, -1 is returned (FIXME).
+Returns as second parameter the character encoding.
=cut
sub MARCfindbreeding {
my ($dbh,$id) = @_;
- my $sth = $dbh->prepare("select file,marc from marc_breeding where id=?");
+ my $sth = $dbh->prepare("select file,marc,encoding from marc_breeding where id=?");
$sth->execute($id);
- my ($file,$marc) = $sth->fetchrow;
+ my ($file,$marc,$encoding) = $sth->fetchrow;
if ($marc) {
my $record = MARC::File::USMARC::decode($marc);
if (ref($record) eq undef) {
return -1;
} else {
- return $record;
+ return $record,$encoding;
}
}
return -1;
=cut
sub build_authorized_values_list ($$$$$) {
- my($tag, $subfield, $value, $dbh, $authorised_values_sth) = @_;
+ my($tag, $subfield, $value, $dbh,$authorised_values_sth) = @_;
my @authorised_values;
my %authorised_lib;
-multiple => 0 );
}
-sub build_tabs ($$$) {
- my($template, $record, $dbh) = @_;
+=item create_input
+ builds the <input ...> entry for a subfield.
+=cut
+sub create_input () {
+ my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth) = @_;
+ my $dbh = C4::Context->dbh;
+ my %subfield_data;
+ $subfield_data{tag}=$tag;
+ $subfield_data{subfield}=$subfield;
+ $subfield_data{marc_lib}="<DIV id=\"error$i\">".$tagslib->{$tag}->{$subfield}->{lib}."</div>";
+ $subfield_data{tag_mandatory}=$tagslib->{$tag}->{mandatory};
+ $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
+ $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
+ $subfield_data{kohafield}=$tagslib->{$tag}->{$subfield}->{kohafield};
+ if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
+ $subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth);
+ } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" size=47 maxlength=255 DISABLE READONLY> <a href=\"javascript:Dopop('../thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>";
+ } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
+ my $plugin="../value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
+ require $plugin;
+ my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
+ my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" DISABLE READONLY size=47 maxlength=255 OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i)\"> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
+ } else {
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=50 maxlength=255>"; #"
+ }
+ return \%subfield_data;
+}
+
+sub build_tabs ($$$$) {
+ my($template, $record, $dbh,$encoding) = @_;
# fill arrays
my @loop_data =();
my $tag;
my $i=0;
- my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
- from authorised_values
- where category=? order by authorised_value");
-
- # loop through each tab 0 through 9
- for (my $tabloop = 0; $tabloop <= 9; $tabloop++) {
- # my @fields = $record->fields();
- my @loop_data = ();
- foreach my $tag (sort(keys (%{$tagslib}))) {
- my $previous_tag = '';
- my @subfields_data;
- my $indicator;
-
- # loop through each subfield
- foreach my $subfield (sort(keys %{$tagslib->{$tag}})) {
- next if subfield_is_koha_internal_p($subfield);
- next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
- my %subfield_data;
- $subfield_data{tag}=$tag;
- $subfield_data{subfield}=$subfield;
- $subfield_data{marc_lib}="<DIV id=\"error$i\">".$tagslib->{$tag}->{$subfield}->{lib}."</div>";
- $subfield_data{tag_mandatory}=$tagslib->{$tag}->{mandatory};
- $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
- $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
- # if breeding is not empty
- if ($record ne -1) {
- my ($x,$value) = find_value($tag,$subfield,$record);
- $value=char_decode($value) unless ($is_a_modif);
- $indicator = $x if $x; #XXX
- if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
- $subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh, $authorised_values_sth);
- } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" size=47 maxlength=255> <a href=\"javascript:Dopop('../thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>"; #"
- } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
- my $plugin="../value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
- require $plugin;
- my $extended_param = plugin_parameters($dbh,$record,$tagslib,$i,$tabloop);
- my ($function_name,$javascript) = plugin_javascript($dbh,$record,$tagslib,$i,$tabloop);
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=47 maxlength=255 OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i)\"> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
- } else {
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=50 maxlength=255>";
- }
-
- # if breeding is empty
- } else {
- my ($x,$value);
- ($x,$value) = find_value($tag,$subfield,$record) if ($record ne -1);
- $value=char_decode($value) unless ($is_a_modif);
- if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
- $subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh, $authorised_values_sth);
- } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" size=47 maxlength=255 DISABLE READONLY> <a href=\"javascript:Dopop('../thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>";
- } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
- my $plugin="../value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
- require $plugin;
- my $extended_param = plugin_parameters($dbh,$record,$tagslib,$i,$tabloop);
- my ($function_name,$javascript) = plugin_javascript($dbh,$record,$tagslib,$i,$tabloop);
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" DISABLE READONLY size=47 maxlength=255 OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i)\"> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
- } else {
- $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" size=50 maxlength=255>";
- }
+ my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
+ from authorised_values
+ where category=? order by authorised_value");
+
+# loop through each tab 0 through 9
+ for (my $tabloop = 0; $tabloop <= 9; $tabloop++) {
+ my @loop_data = ();
+ foreach my $tag (sort(keys (%{$tagslib}))) {
+ my $previous_tag = '';
+ my $indicator;
+ # if MARC::Record is not empty => use it as master loop, then add missing subfields that should be in the tab.
+ # if MARC::Record is empty => use tab as master loop.
+ if ($record ne -1) {
+ my @fields = $record->field($tag);
+ foreach my $field (@fields) {
+ my @subfields_data;
+ if ($tag<10) {
+ my $value=$field->data();
+ my $subfield="@";
+ push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$record,$authorised_values_sth));
+ $i++;
+ } else {
+ my @subfields=$field->subfields();
+ foreach my $subfieldcount (0..$#subfields) {
+ my $subfield=$subfields[$subfieldcount][0];
+ my $value=$subfields[$subfieldcount][1];
+ next if subfield_is_koha_internal_p($subfield);
+ next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+ push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$record,$authorised_values_sth));
+ $i++;
+ }
+ }
+# now, loop again to add parameter subfield that are not in the MARC::Record
+ foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
+ next if subfield_is_koha_internal_p($subfield);
+ next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+ next if (defined($record->field($tag)->subfield($subfield)));
+ push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth));
+ $i++;
+ }
+ if ($#subfields_data >= 0) {
+ my %tag_data;
+ $tag_data{tag} = $tag;
+ $tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+ $tag_data{indicator} = $indicator;
+ $tag_data{subfield_loop} = \@subfields_data;
+ push (@loop_data, \%tag_data);
+ }
+ }
+ # if breeding is empty
+ } else {
+ my @subfields_data;
+ foreach my $subfield (sort(keys %{$tagslib->{$tag}})) {
+ next if subfield_is_koha_internal_p($subfield);
+ next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+ push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth));
+ $i++;
+ }
+ if ($#subfields_data >= 0) {
+ my %tag_data;
+ $tag_data{tag} = $tag;
+ $tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+ $tag_data{indicator} = $indicator;
+ $tag_data{subfield_loop} = \@subfields_data;
+ push (@loop_data, \%tag_data);
+ }
+ }
}
- push(@subfields_data, \%subfield_data);
- $i++;
- }
- if ($#subfields_data >= 0) {
- my %tag_data;
- $tag_data{tag} = $tag;
- $tag_data{tag_lib} = $tagslib->{$tag}->{lib};
- $tag_data{indicator} = $indicator;
- $tag_data{subfield_loop} = \@subfields_data;
- push (@loop_data, \%tag_data);
- }
+ $template->param($tabloop."XX" =>\@loop_data);
}
- $template->param($tabloop."XX" =>\@loop_data);
- }
}
}
}
-
my $input = new CGI;
my $error = $input->param('error');
my $oldbiblionumber=$input->param('oldbiblionumber'); # if bib exists, it's a modif, not a new biblio.
my $breedingid = $input->param('breedingid');
+my $z3950 = $input->param('z3950');
my $op = $input->param('op');
my $dbh = C4::Context->dbh;
my $bibid;
$tagslib = &MARCgettagslib($dbh,1);
my $record=-1;
+my $encoding="";
$record = MARCgetbiblio($dbh,$bibid) if ($bibid);
-#warn "1= ".$record->as_formatted;
-$record = MARCfindbreeding($dbh,$breedingid) if ($breedingid);
+($record,$encoding) = MARCfindbreeding($dbh,$breedingid) if ($breedingid);
+
$is_a_modif=0;
my ($oldbiblionumtagfield,$oldbiblionumtagsubfield);
my ($oldbiblioitemnumtagfield,$oldbiblioitemnumtagsubfield,$bibitem,$oldbiblioitemnumber);
print $input->redirect("additem.pl?bibid=$bibid");
exit;
#------------------------------------------------------------------------------------------------------------------------------
+} elsif ($op eq "addfield") {
+#------------------------------------------------------------------------------------------------------------------------------
+ my $addedfield = $input->param('addfield_field');
+ my @tags = $input->param('tag');
+ my @subfields = $input->param('subfield');
+ my @values = $input->param('field_value');
+ # build indicator hash.
+ my @ind_tag = $input->param('ind_tag');
+ my @indicator = $input->param('indicator');
+ splice(@tags,$addedfield,0,$tags[$addedfield]);
+ splice(@subfields,$addedfield,0,$subfields[$addedfield]);
+ splice(@values,$addedfield,0,$values[$addedfield]);
+ splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
+ my %indicators;
+ for (my $i=0;$i<=$#ind_tag;$i++) {
+ $indicators{$ind_tag[$i]} = $indicator[$i];
+ }
+# search the part of the array to duplicate.
+ my $start=0;
+ my $end=0;
+ my $started;
+ for (my $i=0;$i<=$#tags;$i++) {
+ $start=$i if ($start eq 0 && $tags[$i] == $addedfield);
+ $end=$i if ($start>0 && $tags[$i] eq $addedfield);
+ last if ($start>0 && $tags[$i] ne $addedfield);
+ }
+# add an empty line in all arrays. This forces a new field in MARC::Record.
+ splice(@tags,$end+1,0,'');
+ splice(@subfields,$end+1,0,'');
+ splice(@values,$end+1,0,'');
+ splice(@ind_tag,$end+1,0,'');
+ splice(@indicator,$end+1,0,'');
+# then duplicate the field.
+ splice(@tags,$end+2,0,@tags[$start..$end]);
+ splice(@subfields,$end+2,0,@subfields[$start..$end]);
+ splice(@values,$end+2,0,@values[$start..$end]);
+ splice(@ind_tag,$end+2,0,@ind_tag[$start..$end]);
+ splice(@indicator,$end+2,0,@indicator[$start..$end]);
+
+ my %indicators;
+ for (my $i=0;$i<=$#ind_tag;$i++) {
+ $indicators{$ind_tag[$i]} = $indicator[$i];
+ }
+ my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
+ build_tabs ($template, $record, $dbh,$encoding);
+ build_hidden_data;
+ $template->param(
+ oldbiblionumber => $oldbiblionumber,
+ bibid => $bibid,
+ oldbiblionumtagfield => $oldbiblionumtagfield,
+ oldbiblionumtagsubfield => $oldbiblionumtagsubfield,
+ oldbiblioitemnumtagfield => $oldbiblioitemnumtagfield,
+ oldbiblioitemnumtagsubfield => $oldbiblioitemnumtagsubfield,
+ oldbiblioitemnumber => $oldbiblioitemnumber );
+#------------------------------------------------------------------------------------------------------------------------------
} else {
#------------------------------------------------------------------------------------------------------------------------------
- build_tabs ($template, $record, $dbh);
+ build_tabs ($template, $record, $dbh,$encoding);
build_hidden_data;
$template->param(
oldbiblionumber => $oldbiblionumber,
projects / srvgit / blobdiff