[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.5,1.6 marcimport.pl,1.21,1.22
Paul POULAIN
tipaul at users.sourceforge.net
Tue Nov 12 16:58:46 CET 2002
Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv9086/acqui.simple
Modified Files:
addbiblio.pl marcimport.pl
Log Message:
road to 1.3.2 :
* many bugfixes
* adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance)
Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** addbiblio.pl 25 Oct 2002 10:55:47 -0000 1.5
--- addbiblio.pl 12 Nov 2002 15:58:43 -0000 1.6
***************
*** 36,49 ****
sub find_value {
! my ($tagfield,$subfield,$record) = @_;
my $result;
foreach my $field ($record->field($tagfield)) {
my @subfields = $field->subfields();
foreach my $subfield (@subfields) {
! if (@$subfield[0] eq $subfield) {
$result .= @$subfield[1];
}
}
}
}
--- 36,52 ----
sub find_value {
! my ($tagfield,$insubfield,$record) = @_;
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);
}
}
}
+ return($indicator,$result);
}
***************
*** 56,60 ****
my $record = MARC::File::USMARC::decode($marc);
if (ref($record) eq undef) {
! warn "not a MARC record !";
return -1;
} else {
--- 59,63 ----
my $record = MARC::File::USMARC::decode($marc);
if (ref($record) eq undef) {
! warn "not a MARC record : $marc";
return -1;
} else {
***************
*** 62,66 ****
}
}
- warn "not MARC";
return -1;
--- 65,68 ----
***************
*** 89,98 ****
#------------------------------------------------------------------------------------------------------------------------------
# rebuild
! my @tags = $input->param('tag[]');
! my @subfields = $input->param('subfield[]');
! my @values = $input->param('value[]');
! my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values);
# MARC::Record builded => now, record in DB
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$record);
# build item screen. There is no item for instance.
my @loop_data =();
--- 91,109 ----
#------------------------------------------------------------------------------------------------------------------------------
# rebuild
! 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');
! my %indicators;
! for (my $i=0;$i<=$#ind_tag;$i++) {
! $indicators{$ind_tag[$i]} = $indicator[$i];
! }
! my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
! # warn "record ".$record->as_formatted();
# MARC::Record builded => now, record in DB
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$record);
+ my $authorised_values_sth = $dbh->prepare("select authorised_value from authorised_values where category=?");
# build item screen. There is no item for instance.
my @loop_data =();
***************
*** 112,116 ****
$subfield_data{marc_mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
$subfield_data{marc_repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
! $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\">";
push(@loop_data, \%subfield_data);
}
--- 123,143 ----
$subfield_data{marc_mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
$subfield_data{marc_repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
! if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
! $authorised_values_sth->execute($tagslib->{$tag}->{$subfield}->{authorised_value});
! my @authorised_values;
! push @authorised_values, "" unless ($subfield_data{mandatory});
! while ((my $value) = $authorised_values_sth->fetchrow_array) {
! push @authorised_values, $value;
! }
! $subfield_data{marc_value}= CGI::scrolling_list(-name=>'field_value',
! -values=> \@authorised_values,
! -size=>1,
! -multiple=>0,
! );
! } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
! $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" DISABLE READONLY> <a href=\"javascript:Dopop('../thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>";
! } else {
! $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\">";
! }
push(@loop_data, \%subfield_data);
}
***************
*** 122,129 ****
} elsif ($op eq "additem") {
#------------------------------------------------------------------------------------------------------------------------------
! my @tags = $input->param('tag[]');
! my @subfields = $input->param('subfield[]');
! my @values = $input->param('value[]');
! my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewitem($dbh,$record,$bibid);
# now, build existiing item list
--- 149,165 ----
} elsif ($op eq "additem") {
#------------------------------------------------------------------------------------------------------------------------------
! my @tags = $input->param('tag');
! my @subfields = $input->param('subfield');
! my @values = $input->param('field_value');
! # my @ind_tag = $input->param('ind_tag');
! # my @indicator = $input->param('indicator');
! # my %indicators;
! # for (my $i=0;$i<=$#ind_tag;$i++) {
! # $indicators{$ind_tag[$i]} = $indicator[$i];
! # }
! my %indicators;
! $indicators{995}=' ';
! warn "REs : $tags[0] - $tags[1] - $subfields[0] - $subfields[1] - $values[0] - $values[1]";
! my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewitem($dbh,$record,$bibid);
# now, build existiing item list
***************
*** 204,210 ****
my $i=0;
my $authorised_values_sth = $dbh->prepare("select authorised_value from authorised_values where category=?");
! # loop through each tab 0 through 9
for (my $tabloop = 0; $tabloop<=9;$tabloop++) {
- # loop through each tag
# my @fields = $record->fields();
my @loop_data =();
--- 240,245 ----
my $i=0;
my $authorised_values_sth = $dbh->prepare("select authorised_value from authorised_values where category=?");
! # loop through each tab 0 through 9
for (my $tabloop = 0; $tabloop<=9;$tabloop++) {
# my @fields = $record->fields();
my @loop_data =();
***************
*** 212,218 ****
my $previous_tag = '';
my @subfields_data;
! # loop through each subfield
foreach my $subfield (keys %{$tagslib->{$tag}}) {
! next if ($subfield eq 'lib');
next if ($subfield eq 'tab');
next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
--- 247,254 ----
my $previous_tag = '';
my @subfields_data;
! my $indicator;
! # loop through each subfield
foreach my $subfield (keys %{$tagslib->{$tag}}) {
! next if ($subfield eq 'lib'); # skip lib and tabs, which are koha internal
next if ($subfield eq 'tab');
next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
***************
*** 223,228 ****
$subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
$subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
if ($record ne -1) {
! my $value = find_value($tag,$subfield,$record);
if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
$authorised_values_sth->execute($tagslib->{$tag}->{$subfield}->{authorised_value});
--- 259,266 ----
$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);
! $indicator = $x if $x;
if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
$authorised_values_sth->execute($tagslib->{$tag}->{$subfield}->{authorised_value});
***************
*** 238,244 ****
--- 276,287 ----
-multiple=>0,
);
+ } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" 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}) {
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" DISABLE READONLY> <a href=\"javascript:Dopop('../value_builder/$tagslib->{$tag}->{$subfield}->{value_builder}?index=$i',$i)\">...</a>";
} else {
$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\">";
}
+ # if breeding is empty
} else {
if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
***************
*** 254,257 ****
--- 297,304 ----
-multiple=>0,
);
+ } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" 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}) {
+ $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" DISABLE READONLY> <a href=\"javascript:Dopop('../value_builder/$tagslib->{$tag}->{$subfield}->{value_builder}?index=$i',$i)\">...</a>";
} else {
$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\">";
***************
*** 263,268 ****
if ($#subfields_data>=0) {
my %tag_data;
! $tag_data{tag}=$tag.' -'. $tagslib->{$tag}->{lib};
! $tag_data{subfield} = \@subfields_data;
push (@loop_data, \%tag_data);
}
--- 310,317 ----
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);
}
***************
*** 284,288 ****
$subfield_data{marc_mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
$subfield_data{marc_repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
! $subfield_data{marc_value}="<input type=\"hidden\" name=\"field_value\">";
push(@loop_data, \%subfield_data);
$i++
--- 333,337 ----
$subfield_data{marc_mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
$subfield_data{marc_repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
! $subfield_data{marc_value}="<input type=\"hidden\" name=\"field_value[]\">";
push(@loop_data, \%subfield_data);
$i++
Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** marcimport.pl 22 Oct 2002 15:50:23 -0000 1.21
--- marcimport.pl 12 Nov 2002 15:58:43 -0000 1.22
***************
*** 96,99 ****
--- 96,101 ----
# if isbn found and biblio does not exist, add it. If isbn found and biblio exists, overwrite or ignore depending on user choice
if ($oldbiblio->{isbn} || $oldbiblio->{issn}) {
+ # drop every "special" char : spaces, - ...
+ $oldbiblio->{isbn} =~ s/ |-|\.//g,
# search if biblio exists
my $biblioitemnumber;
***************
*** 118,125 ****
}
if (!$breedingresult || $overwrite_biblio) {
! if ($oldbiblio->{isbn} eq '0025003402') {
! warn "IMPORT => $marcarray[$i]\x1D')";
! }
! $insertsql ->execute($filename,$oldbiblio->{isbn}.$oldbiblio->{issn},$marcarray[$i]."\x1D')");
$imported++;
} else {
--- 120,128 ----
}
if (!$breedingresult || $overwrite_biblio) {
! my $recoded;
! warn "IMPORT => $marcarray[$i]\x1D')";
! $recoded = $marcrecord->as_usmarc(); #MARC::File::USMARC::encode($marcrecord);
! warn "RECODED : $recoded";
! $insertsql ->execute($filename,$oldbiblio->{isbn}.$oldbiblio->{issn},$recoded);
$imported++;
} else {
***************
*** 797,800 ****
--- 800,808 ----
# log cleared, as marcimport is (almost) rewritten from scratch.
# $Log$
+ # Revision 1.22 2002/11/12 15:58:43 tipaul
+ # road to 1.3.2 :
+ # * many bugfixes
+ # * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance)
+ #
# Revision 1.21 2002/10/22 15:50:23 tipaul
# road to 1.3.2 : adding a biblio in MARC format.
More information about the Koha-cvs
mailing list