[Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.14,1.115.2.15

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31192/C4

Modified Files:
      Tag: rel_2_2
        Biblio.pm 
Log Message:
* fixing a bug in subfield order when MARCgetbiblio
* getting rid with the limit "biblionumber & biblioitemnumber must be in the 
same tag". So, we can put biblionumber in 001 (field that has no subfields, so 
we can't put biblioitemnumber in this field), and use biblionumber as 
identifier in the MARC biblio too. Still to be deeply tested.
* adding some diacritic decoding (Ä, Ü...)


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.14
retrieving revision 1.115.2.15
diff -C2 -r1.115.2.14 -r1.115.2.15
*** Biblio.pm   27 Jun 2005 23:24:06 -0000      1.115.2.14
--- Biblio.pm   19 Jul 2005 15:25:40 -0000      1.115.2.15
***************
*** 485,489 ****
  "select 
bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink
                                 from marc_subfield_table
!                                where bibid=? order by 
tag,tagorder,subfieldcode
                         "
      );
--- 485,489 ----
  "select 
bibid,subfieldid,tag,tagorder,tag_indicator,subfieldcode,subfieldorder,subfieldvalue,valuebloblink
                                 from marc_subfield_table
!                                where bibid=? order by 
tag,tagorder,subfieldorder
                         "
      );
***************
*** 1124,1140 ****
      ( $tagfield, $subfield ) = 
MARCfind_marc_from_kohafield("",$kohatable.".".$kohafield,$frameworkcode);
      foreach my $field ( $record->field($tagfield) ) {
!         if ( $field->subfields ) {
!             my @subfields = $field->subfields();
!             foreach my $subfieldcount ( 0 .. $#subfields ) {
!                               if ($subfields[$subfieldcount][0] eq $subfield) 
{
!                                       if ( $result->{$kohafield} ) {
!                                               $result->{$kohafield} .= " | " 
. $subfields[$subfieldcount][1];
!                                       }
!                                       else {
!                                               $result->{$kohafield} = 
$subfields[$subfieldcount][1];
                                        }
                                }
                        }
!         }
      }
  #     warn "OneField for $kohatable.$kohafield and $frameworkcode=> 
$tagfield, $subfield";
--- 1124,1148 ----
      ( $tagfield, $subfield ) = 
MARCfind_marc_from_kohafield("",$kohatable.".".$kohafield,$frameworkcode);
      foreach my $field ( $record->field($tagfield) ) {
!               if ($field->tag()<10) {
!                       if ($result->{$kohafield}) {
!                               $result->{$kohafield} .= " | ".$field->data();
!                       } else {
!                               $result->{$kohafield} = $field->data();
!                       }
!               } else {
!                       if ( $field->subfields ) {
!                               my @subfields = $field->subfields();
!                               foreach my $subfieldcount ( 0 .. $#subfields ) {
!                                       if ($subfields[$subfieldcount][0] eq 
$subfield) {
!                                               if ( $result->{$kohafield} ) {
!                                                       $result->{$kohafield} 
.= " | " . $subfields[$subfieldcount][1];
!                                               }
!                                               else {
!                                                       $result->{$kohafield} = 
$subfields[$subfieldcount][1];
!                                               }
                                        }
                                }
                        }
!               }
      }
  #     warn "OneField for $kohatable.$kohafield and $frameworkcode=> 
$tagfield, $subfield";
***************
*** 1207,1211 ****
      my $olddata = MARCmarc2koha( $dbh, $record,$frameworkcode );
      $oldbibnum = OLDnewbiblio( $dbh, $olddata );
!     $olddata->{'biblionumber'} = $oldbibnum;
      $oldbibitemnum = OLDnewbiblioitem( $dbh, $olddata );
  
--- 1215,1219 ----
      my $olddata = MARCmarc2koha( $dbh, $record,$frameworkcode );
      $oldbibnum = OLDnewbiblio( $dbh, $olddata );
!       $olddata->{'biblionumber'} = $oldbibnum;
      $oldbibitemnum = OLDnewbiblioitem( $dbh, $olddata );
  
***************
*** 1257,1276 ****
      $sth->execute("biblioitems.biblioitemnumber");
      ( my $tagfield2, my $tagsubfield2 ) = $sth->fetchrow;
      if ( $tagfield1 != $tagfield2 ) {
!         warn
! "Error in NEWnewbiblio : biblio.biblionumber and biblioitems.biblioitemnumber 
MUST have the same field number";
!         print
! "Content-Type: text/html\n\nError in NEWnewbiblio : biblio.biblionumber and 
biblioitems.biblioitemnumber MUST have the same field number";
!         die;
!     }
!     my $newfield = MARC::Field->new(
!         $tagfield1, '', '', "$tagsubfield1" => $oldbibnum,
!         "$tagsubfield2" => $oldbibitemnum
!     );
! 
!     # drop old field and create new one...
!     my $old_field = $record->field($tagfield1);
!     $record->delete_field($old_field);
!     $record->add_fields($newfield);
      my $bibid = MARCaddbiblio( $dbh, $record, $oldbibnum, $frameworkcode );
      return ( $bibid, $oldbibnum, $oldbibitemnum );
--- 1265,1311 ----
      $sth->execute("biblioitems.biblioitemnumber");
      ( my $tagfield2, my $tagsubfield2 ) = $sth->fetchrow;
+       my $newfield;
+       # biblionumber & biblioitemnumber are in different fields
      if ( $tagfield1 != $tagfield2 ) {
!               # deal with biblionumber
!               if ($tagfield1<10) {
!                       $newfield = MARC::Field->new(
!                               $tagfield1, $oldbibnum,
!                       );
!               } else {
!                       $newfield = MARC::Field->new(
!                               $tagfield1, '', '', "$tagsubfield1" => 
$oldbibnum,
!                       );
!               }
!               # drop old field and create new one...
!               my $old_field = $record->field($tagfield1);
!               $record->delete_field($old_field);
!               $record->add_fields($newfield);
!               # deal with biblioitemnumber
!               if ($tagfield2<10) {
!                       $newfield = MARC::Field->new(
!                               $tagfield2, $oldbibitemnum,
!                       );
!               } else {
!                       $newfield = MARC::Field->new(
!                               $tagfield2, '', '', "$tagsubfield2" => 
$oldbibitemnum,
!                       );
!               }
!               # drop old field and create new one...
!               $old_field = $record->field($tagfield2);
!               $record->delete_field($old_field);
!               $record->add_fields($newfield);
!       # biblionumber & biblioitemnumber are in the same field (can't be <10 
as fields <10 have only 1 value)
!       } else {
!               my $newfield = MARC::Field->new(
!                       $tagfield1, '', '', "$tagsubfield1" => $oldbibnum,
!                       "$tagsubfield2" => $oldbibitemnum
!               );
!               # drop old field and create new one...
!               my $old_field = $record->field($tagfield1);
!               $record->delete_field($old_field);
!               $record->add_fields($newfield);
!       }
! #     warn "REC : ".$record->as_formatted;
      my $bibid = MARCaddbiblio( $dbh, $record, $oldbibnum, $frameworkcode );
      return ( $bibid, $oldbibnum, $oldbibitemnum );
***************
*** 2443,2450 ****
--- 2478,2490 ----
          s/\xc8\x45/Ë/gm;
          s/\xc8\x49/Ï/gm;
+         s/\xc8\x61/ä/gm;
          s/\xc8\x65/ë/gm;
          s/\xc8\x69/ï/gm;
+         s/\xc8\x6F/ö/gm;
+         s/\xc8\x75/ü/gm;
          s/\xc8\x76/ÿ/gm;
          s/\xc9\x41/Ä/gm;
+         s/\xc9\x45/Ë/gm;
+         s/\xc9\x49/Ï/gm;
          s/\xc9\x4f/Ö/gm;
          s/\xc9\x55/Ü/gm;
***************
*** 2682,2685 ****
--- 2722,2730 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.15  2005/07/19 15:25:40  tipaul
+ # * fixing a bug in subfield order when MARCgetbiblio
+ # * getting rid with the limit "biblionumber & biblioitemnumber must be in 
the same tag". So, we can put biblionumber in 001 (field that has no subfields, 
so we can't put biblioitemnumber in this field), and use biblionumber as 
identifier in the MARC biblio too. Still to be deeply tested.
+ # * adding some diacritic decoding (Ä, Ü...)
+ #
  # Revision 1.115.2.14  2005/06/27 23:24:06  hdl
  # Display dashed ISBN