[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.35,1.36
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/C4 Biblio.pm,1.35,1.36 |
|
Date: |
Wed, 12 Feb 2003 03:01:10 -0800 |
Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv28776/C4
Modified Files:
Biblio.pm
Log Message:
Support for 000 -> 010 fields.
Those fields doesn't have subfields.
In koha, we will use a specific "trick" : fields <10 will have a "virtual"
subfield : "@".
Note it's only virtual : when rebuilding the MARC::Record, the koha API handle
correctly "@" subfields => the resulting MARC record has a 00x field without
subfield.
Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** Biblio.pm 3 Feb 2003 18:46:00 -0000 1.35
--- Biblio.pm 12 Feb 2003 11:01:01 -0000 1.36
***************
*** 2,5 ****
--- 2,11 ----
# $Id$
# $Log$
+ # Revision 1.36 2003/02/12 11:01:01 tipaul
+ # Support for 000 -> 010 fields.
+ # Those fields doesn't have subfields.
+ # In koha, we will use a specific "trick" : fields <10 will have a "virtual"
subfield : "@".
+ # Note it's only virtual : when rebuilding the MARC::Record, the koha API
handle correctly "@" subfields => the resulting MARC record has a 00x field
without subfield.
+ #
# Revision 1.35 2003/02/03 18:46:00 acli
# Minor factoring in C4/Biblio.pm, plus change to export the per-tag
***************
*** 446,478 ****
sub MARCaddbiblio {
# pass the MARC::Record to this function, and it will create the records in
the marc tables
! my ($dbh,$record,$biblionumber) = @_;
! my @fields=$record->fields();
! my $bibid;
! # adding main table, and retrieving bibid
! $dbh->do("lock tables marc_biblio WRITE,marc_subfield_table WRITE,
marc_word WRITE, marc_blob_subfield WRITE, stopwords READ");
! my $sth=$dbh->prepare("insert into marc_biblio (datecreated,biblionumber)
values (now(),?)");
! $sth->execute($biblionumber);
! $sth=$dbh->prepare("select max(bibid) from marc_biblio");
! $sth->execute;
! ($bibid)=$sth->fetchrow;
! $sth->finish;
! my $fieldcount=0;
! # now, add subfields...
! foreach my $field (@fields) {
! my @subfields=$field->subfields();
! $fieldcount++;
! foreach my $subfieldcount (0..$#subfields) {
! &MARCaddsubfield($dbh,$bibid,
! $field->tag(),
! $field->indicator(1).$field->indicator(2),
! $fieldcount,
! $subfields[$subfieldcount][0],
! $subfieldcount+1,
! $subfields[$subfieldcount][1]
! );
}
! }
! $dbh->do("unlock tables");
! return $bibid;
}
--- 452,495 ----
sub MARCaddbiblio {
# pass the MARC::Record to this function, and it will create the records in
the marc tables
! my ($dbh,$record,$biblionumber) = @_;
! my @fields=$record->fields();
! my $bibid;
! # adding main table, and retrieving bibid
! $dbh->do("lock tables marc_biblio WRITE,marc_subfield_table WRITE,
marc_word WRITE, marc_blob_subfield WRITE, stopwords READ");
! my $sth=$dbh->prepare("insert into marc_biblio
(datecreated,biblionumber) values (now(),?)");
! $sth->execute($biblionumber);
! $sth=$dbh->prepare("select max(bibid) from marc_biblio");
! $sth->execute;
! ($bibid)=$sth->fetchrow;
! $sth->finish;
! my $fieldcount=0;
! # now, add subfields...
! foreach my $field (@fields) {
! $fieldcount++;
! if ($field->tag() <10) {
! &MARCaddsubfield($dbh,$bibid,
! $field->tag(),
! '',
! $fieldcount,
! '',
! 1,
! $field->data()
! );
! } else {
! my @subfields=$field->subfields();
! foreach my $subfieldcount (0..$#subfields) {
! &MARCaddsubfield($dbh,$bibid,
! $field->tag(),
!
$field->indicator(1).$field->indicator(2),
! $fieldcount,
! $subfields[$subfieldcount][0],
! $subfieldcount+1,
! $subfields[$subfieldcount][1]
! );
! }
! }
}
! $dbh->do("unlock tables");
! return $bibid;
}
***************
*** 502,511 ****
);
# warn "ADDING :$bibid,".
! $field->tag().
! $field->indicator(1).$field->indicator(2).",
! $fieldcount,
! $subfields[$subfieldcount][0],
! $subfieldcount+1,
! $subfields[$subfieldcount][1]";
}
}
--- 519,528 ----
);
# warn "ADDING :$bibid,".
! # $field->tag().
! # $field->indicator(1).$field->indicator(2).",
! # $fieldcount,
! # $subfields[$subfieldcount][0],
! # $subfieldcount+1,
! # $subfields[$subfieldcount][1]";
}
}
***************
*** 532,540 ****
my ($res)=$sth->fetchrow;
$sth=$dbh->prepare("insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,valuebloblink)
values (?,?,?,?,?,?,?)");
! if ($tagid<100) {
!
$sth->execute($bibid,'0'.$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$res);
! } else {
!
$sth->execute($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$res);
! }
if ($sth->errstr) {
print STDERR "ERROR ==> insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue)
values
($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n";
--- 549,553 ----
my ($res)=$sth->fetchrow;
$sth=$dbh->prepare("insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,valuebloblink)
values (?,?,?,?,?,?,?)");
! $sth->execute($bibid,(sprintf
"%03s",$tagid),$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$res);
if ($sth->errstr) {
print STDERR "ERROR ==> insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue)
values
($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n";
***************
*** 543,547 ****
} else {
my $sth=$dbh->prepare("insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue)
values (?,?,?,?,?,?,?)");
!
$sth->execute($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue);
if ($sth->errstr) {
print STDERR "ERROR ==> insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue)
values
($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n";
--- 556,560 ----
} else {
my $sth=$dbh->prepare("insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue)
values (?,?,?,?,?,?,?)");
! $sth->execute($bibid,(sprintf
"%03s",$tagid),$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue);
if ($sth->errstr) {
print STDERR "ERROR ==> insert into marc_subfield_table
(bibid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue)
values
($bibid,$tagid,$tagorder,$tag_indicator,$subfieldcode,$subfieldorder,$subfieldvalue)\n";
***************
*** 574,585 ****
$row->{'subfieldvalue'}=$row2->{'subfieldvalue'};
}
if ($row->{tagorder} ne $prevtagorder || $row->{tag} ne
$prevtag) {
- if (length($prevtag) <3) {
- $prevtag = "0".$prevtag;
- }
$previndicator.=" ";
! my $field = MARC::Field->new( $prevtag,
substr($previndicator,0,1), substr($previndicator,1,1), %subfieldlist);
undef %subfieldlist;
- $record->add_fields($field);
$prevtagorder=$row->{tagorder};
$prevtag = $row->{tag};
--- 587,602 ----
$row->{'subfieldvalue'}=$row2->{'subfieldvalue'};
}
+ # warn "prev : $prevtag . ".$row->{tag}." =>
".$row->{subfieldvalue};
if ($row->{tagorder} ne $prevtagorder || $row->{tag} ne
$prevtag) {
$previndicator.=" ";
! my $field;
! if ($prevtag <10) {
! warn "add < $prevtag";
! $record->add_fields((sprintf
"%03s",$prevtag),%subfieldlist->{'@'});
! } else {
! $field = MARC::Field->new( (sprintf
"%03s",$prevtag), substr($previndicator,0,1), substr($previndicator,1,1),
%subfieldlist);
! $record->add_fields($field);
! }
undef %subfieldlist;
$prevtagorder=$row->{tagorder};
$prevtag = $row->{tag};
***************
*** 594,599 ****
}
# the last has not been included inside the loop... do it now !
! my $field = MARC::Field->new( $prevtag, "", "", %subfieldlist);
! $record->add_fields($field);
return $record;
}
--- 611,620 ----
}
# the last has not been included inside the loop... do it now !
! if ($prevtag <10) {
! $record->add_fields($prevtag,%subfieldlist->{'@'});
! } else {
! my $field = MARC::Field->new( $prevtag, "", "", %subfieldlist);
! $record->add_fields($field);
! }
return $record;
}
***************
*** 646,685 ****
sub MARCmodbiblio {
! my ($dbh,$bibid,$record,$delete)address@hidden;
! # my ($dbh,$record,$bibid,$itemnumber,$delete)address@hidden;
! my $oldrecord=&MARCgetbiblio($dbh,$bibid);
! # warn "OLD : ".$oldrecord->as_formatted();
! # warn "----------------------------------\nNEW :
".$record->as_formatted();
! # warn "\n";
! # if nothing to change, don't waste time...
! if ($oldrecord eq $record) {
! # warn "NOTHING TO CHANGE";
! return;
! }
! # otherwise, skip through each subfield...
! my @fields = $record->fields();
! my $tagorder=0;
! foreach my $field (@fields) {
! my $oldfield = $oldrecord->field($field->tag());
! my @subfields=$field->subfields();
! my $subfieldorder=0;
! $tagorder++;
! foreach my $subfield (@subfields) {
! $subfieldorder++;
! if ($oldfield eq 0 or (! $oldfield->subfield(@$subfield[0])) ) {
! # just adding datas...
!
&MARCaddsubfield($dbh,$bibid,$field->tag(),$field->indicator(1).$field->indicator(2),
! 1,@$subfield[0],$subfieldorder,@$subfield[1]);
! } else {
! # modify the subfield if it's a different string
! if ($oldfield->subfield(@$subfield[0]) ne @$subfield[1] ) {
! my
$subfieldid=&MARCfindsubfieldid($dbh,$bibid,$field->tag(),$tagorder,@$subfield[0],$subfieldorder);
! &MARCmodsubfield($dbh,$subfieldid,@$subfield[1]);
} else {
! # FIXME ???
}
- }
}
- }
}
sub MARCmoditem {
--- 667,708 ----
sub MARCmodbiblio {
! my ($dbh,$bibid,$record,$delete)address@hidden;
! my $oldrecord=&MARCgetbiblio($dbh,$bibid);
! if ($oldrecord eq $record) {
! return;
! }
! # otherwise, skip through each subfield...
! my @fields = $record->fields();
! my $tagorder=0;
! foreach my $field (@fields) {
! my $oldfield = $oldrecord->field($field->tag());
! my @subfields=$field->subfields();
! my $subfieldorder=0;
! $tagorder++;
! if ($field->tag() <10) {
! if ($oldfield eq 0 or (! $oldfield->data()) ) {
!
&MARCaddsubfield($dbh,$bibid,$field->tag(),'',
! 1,'@',1,$field->data());
! } else {
! my
$subfieldid=&MARCfindsubfieldid($dbh,$bibid,$field->tag(),$tagorder,'@',$subfieldorder);
!
&MARCmodsubfield($dbh,$subfieldid,$field->data());
! }
} else {
! foreach my $subfield (@subfields) {
! $subfieldorder++;
! if ($oldfield eq 0 or (!
$oldfield->subfield(@$subfield[0])) ) {
! # just adding datas...
!
&MARCaddsubfield($dbh,$bibid,$field->tag(),$field->indicator(1).$field->indicator(2),
!
1,@$subfield[0],$subfieldorder,@$subfield[1]);
! } else {
! # modify the subfield if it's a different string
! if ($oldfield->subfield(@$subfield[0])
ne @$subfield[1] ) {
! my
$subfieldid=&MARCfindsubfieldid($dbh,$bibid,$field->tag(),$tagorder,@$subfield[0],$subfieldorder);
!
&MARCmodsubfield($dbh,$subfieldid,@$subfield[1]);
! }
! }
! }
}
}
}
sub MARCmoditem {
***************
*** 931,934 ****
--- 954,958 ----
my ($dbh,$rtags,$rsubfields,$rvalues,%indicators) = @_;
my $prevtag = @$rtags[0];
+ warn "prev : $prevtag";
my $record = MARC::Record->new();
my %subfieldlist={};
***************
*** 936,952 ****
# rebuild MARC::Record
if (@$rtags[$i] ne $prevtag) {
! if ($prevtag<10) {
! $prevtag='0'.10;
! }
$indicators{$prevtag}.=' ';
! my $field = MARC::Field->new( $prevtag,
substr($indicators{$prevtag},0,1),substr($indicators{$prevtag},1,1),
%subfieldlist);
! $record->add_fields($field);
$prevtag = @$rtags[$i];
%subfieldlist={};
%subfieldlist->address@hidden = @$rvalues[$i];
} else {
! # if (%subfieldlist->address@hidden) {
! # %subfieldlist->address@hidden .= '|';
! # }
%subfieldlist->address@hidden address@hidden;
$prevtag= @$rtags[$i];
--- 960,980 ----
# rebuild MARC::Record
if (@$rtags[$i] ne $prevtag) {
! # if ($prevtag<10) {
! # $prevtag='0'.10;
! # }
$indicators{$prevtag}.=' ';
! if ($prevtag < 10) {
! $record->add_fields((sprintf
"%03s",$prevtag),%subfieldlist->{'@'});
! } else {
! my $field = MARC::Field->new( (sprintf
"%03s",$prevtag),
substr($indicators{$prevtag},0,1),substr($indicators{$prevtag},1,1),
%subfieldlist);
! $record->add_fields($field);
! }
$prevtag = @$rtags[$i];
%subfieldlist={};
%subfieldlist->address@hidden = @$rvalues[$i];
} else {
! if (%subfieldlist->address@hidden) {
! %subfieldlist->address@hidden .= '|';
! }
%subfieldlist->address@hidden address@hidden;
$prevtag= @$rtags[$i];
***************
*** 1216,1240 ****
my $series = 0;
- $biblio->{'title'} = $dbh->quote($biblio->{'title'});
- $biblio->{'author'} = $dbh->quote($biblio->{'author'});
- $biblio->{'copyright'} = $dbh->quote($biblio->{'copyright'});
- $biblio->{'seriestitle'} = $dbh->quote($biblio->{'seriestitle'});
- $biblio->{'notes'} = $dbh->quote($biblio->{'notes'});
- $biblio->{'abstract'} = $dbh->quote($biblio->{'abstract'});
if ($biblio->{'seriestitle'}) { $series = 1 };
-
$sth->finish;
! $query = "insert into biblio set
! biblionumber = $bibnum,
! title = $biblio->{'title'},
! author = $biblio->{'author'},
! copyrightdate = $biblio->{'copyright'},
! serial = $series,
! seriestitle = $biblio->{'seriestitle'},
! notes = $biblio->{'notes'},
! abstract = $biblio->{'abstract'}";
!
$sth = $dbh->prepare($query);
! $sth->execute;
$sth->finish;
--- 1244,1253 ----
my $series = 0;
if ($biblio->{'seriestitle'}) { $series = 1 };
$sth->finish;
! $query = "insert into biblio set biblionumber = ?, title = ?,
author = ?, copyrightdate = ?,
! serial
= ?, seriestitle = ?, notes = ?, abstract = ?";
$sth = $dbh->prepare($query);
!
$sth->execute($bibnum,$biblio->{'title'},$biblio->{'author'},$biblio->{'copyright'},$series,$biblio->{'seriestitle'},$biblio->{'notes'},$biblio->{'abstract'});
$sth->finish;
***************
*** 1249,1261 ****
my $sth;
- $biblio->{'title'} = $dbh->quote($biblio->{'title'});
- $biblio->{'author'} = $dbh->quote($biblio->{'author'});
- $biblio->{'abstract'} = $dbh->quote($biblio->{'abstract'});
- $biblio->{'copyrightdate'} = $dbh->quote($biblio->{'copyrightdate'});
- $biblio->{'seriestitle'} = $dbh->quote($biblio->{'serirestitle'});
- $biblio->{'serial'} = $dbh->quote($biblio->{'serial'});
- $biblio->{'unititle'} = $dbh->quote($biblio->{'unititle'});
- $biblio->{'notes'} = $dbh->quote($biblio->{'notes'});
-
$query = "Update biblio set title = ?, author = ?,
abstract = ?, copyrightdate = ?,
seriestitle = ?, serial = ?,
unititle = ?, notes = ? where biblionumber = ?";
--- 1262,1265 ----
***************
*** 1476,1486 ****
my ($dbh,$bibnum, $subtitle) = @_;
# my $dbh = C4Connect;
- $subtitle = $dbh->quote($subtitle);
my $query = "insert into bibliosubtitle set
! biblionumber = $bibnum,
! subtitle = $subtitle";
my $sth = $dbh->prepare($query);
! $sth->execute;
$sth->finish;
--- 1480,1489 ----
my ($dbh,$bibnum, $subtitle) = @_;
# my $dbh = C4Connect;
my $query = "insert into bibliosubtitle set
! biblionumber = ?,
! subtitle = ?";
my $sth = $dbh->prepare($query);
! $sth->execute($bibnum,$subtitle);
$sth->finish;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/C4 Biblio.pm,1.35,1.36,
Paul POULAIN <=