[Koha-cvs] CVS: koha/C4 Catalogue.pm,1.13,1.14

[Alan Millar]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv1174/C4

Modified Files:
	Catalogue.pm 
Log Message:

Some cleanup, reformatting, fix some undeclared variables


Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Catalogue.pm	16 May 2002 23:08:05 -0000	1.13
--- Catalogue.pm	18 May 2002 07:01:27 -0000	1.14
***************
*** 65,76 ****
      my ($env, $biblio) = @_;
      my $dbh=&C4Connect;  
-     my $title=$biblio->{'title'};
-     my $subtitle=$biblio->{'subtitle'};
-     my $author=$biblio->{'author'};
-     my $unititle=$biblio->{'unititle'};
-     my $copyrightdate=$biblio->{'copyrightdate'};
-     my $serial=$biblio->{'serial'};
-     my $seriestitle=$biblio->{'seriestitle'};
-     my $notes=$biblio->{'notes'};
      my $subject=$biblio->{'subject'};
      my $additionalauthors=$biblio->{'additionalauthors'};
--- 65,68 ----
***************
*** 80,99 ****
  # biblionumber...
  
      my $sth=$dbh->prepare("select max(biblionumber) from biblio");
      $sth->execute;
      my ($biblionumber) = $sth->fetchrow;
      $biblionumber++;
!     $sth=$dbh->prepare("insert into biblio (biblionumber,title,author,unititle,copyrightdate,serial,seriestitle,notes) values (?, ?, ?, ?, ?, ?, ?, ?)");
!     $sth->execute($biblionumber, $title, $author, $unititle, $copyrightdate, $serial, $seriestitle, $notes);
!     $sth=$dbh->prepare("insert into bibliosubtitle (biblionumber,subtitle) values ($biblionumber,$q_subtitle)");
!     $sth->execute;
!     foreach (@$subject) {
! 	my $q_subject=$dbh->quote($_);
! 	my $sth=$dbh->prepare("insert into bibliosubject (biblionumber,subject) values ($biblionumber,$q_subject)");
! 	$sth->execute;
      }
!     foreach (@$additionalauthors) {
! 	my $sth=$dbh->prepare("insert into additionalauthors (biblionumber,author) values (?, ?)");
! 	$sth->execute($biblionumber, $additionalauthor);
      }
  }
--- 72,105 ----
  # biblionumber...
  
+     # Get next biblio number
      my $sth=$dbh->prepare("select max(biblionumber) from biblio");
      $sth->execute;
      my ($biblionumber) = $sth->fetchrow;
      $biblionumber++;
! 
!     $sth=$dbh->prepare("insert into biblio 
! 	(biblionumber,title,author,
! 	unititle,copyrightdate,
! 	serial,seriestitle,notes)
! 	 values (?, ?, ?, ?, ?, ?, ?, ?)");
!     $sth->execute($biblionumber, $biblio->{'title'}, $biblio->{'author'},
!         $biblio->{'unititle'}, $biblio->{'copyrightdate'}, 
!     	$biblio->{'serial'}, $biblio->{'seriestitle'}, $biblio->{'notes'} );
!     $sth=$dbh->prepare("insert into bibliosubtitle 
! 	(biblionumber,subtitle) 
! 	values (?,?)");
!     $sth->execute($biblionumber, $biblio->{'subtitle'} );
! 
!     my $sth=$dbh->prepare("insert into bibliosubject
! 	(biblionumber,subject)
!  	values (?,?) ");
!     foreach $_ (@$subject) {
! 	$sth->execute($biblionumber,$_);
      }
!     my $sth=$dbh->prepare("insert into additionalauthors 
! 	(biblionumber,author)
! 	 values (?, ?)");
!     foreach $_ (@$additionalauthors) {
! 	$sth->execute($biblionumber, $_ );
      }
  }
***************
*** 102,110 ****
  sub changeSubfield {
  # Subroutine changes a subfield value given a subfieldid.
!     my $subfieldid=shift;
!     my $subfieldvalue=shift;
      my $dbh=&c4connect;  
      my $sth=$dbh->prepare("update marc_$firstdigit\XX_subfield_table set subfieldvalue=? where subfieldid=?");
!     $sth->execute($subfieldvalue, $subfieldid;
      $dbh->disconnect;
      return($Subfield_ID, $Subfield_Key);
--- 108,119 ----
  sub changeSubfield {
  # Subroutine changes a subfield value given a subfieldid.
!     my ( $subfieldid, $subfieldvalue )=@_;
! 
!     my $firstdigit="?";
! 
      my $dbh=&c4connect;  
      my $sth=$dbh->prepare("update marc_$firstdigit\XX_subfield_table set subfieldvalue=? where subfieldid=?");
!     $sth->execute($subfieldvalue, $subfieldid);
! 
      $dbh->disconnect;
      return($Subfield_ID, $Subfield_Key);
***************
*** 119,122 ****
--- 128,133 ----
      my $subfieldvalue=shift;
      my $subfieldorder=shift;
+     my $firstdigit="?";
+ 
      my $dbh=&c4connect;  
      unless ($subfieldorder) {
***************
*** 146,149 ****
--- 157,161 ----
  
      my ($env, $biblio) = @_;
+     my $Record_ID;
      my $biblionumber=$biblio->{'biblionumber'};
      my $dbh=&C4Connect;