[Koha-cvs] CVS: koha/C4 Biblio.pm,1.12,1.13

[Paul POULAIN]

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

Modified Files:
	Biblio.pm 
Log Message:
road to 1.3.1

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Biblio.pm	1 Oct 2002 11:48:51 -0000	1.12
--- Biblio.pm	2 Oct 2002 16:26:44 -0000	1.13
***************
*** 1,5 ****
! package C4::Biblio; 
  # $Id$
  # $Log$
  # Revision 1.12  2002/10/01 11:48:51  arensb
  # Added some FIXME comments, mostly marking duplicate functions.
--- 1,8 ----
! package C4::Biblio;
  # $Id$
  # $Log$
+ # Revision 1.13  2002/10/02 16:26:44  tipaul
+ # road to 1.3.1
+ #
  # Revision 1.12  2002/10/01 11:48:51  arensb
  # Added some FIXME comments, mostly marking duplicate functions.
***************
*** 127,130 ****
--- 130,136 ----
  	     &newcompletebiblioitem
  
+ 	     &MARCfind_oldbiblionumber_from_MARCbibid
+ 	     &MARCfind_MARCbibid_from_oldbiblionumber
+ 
  	     &ALLnewbiblio &ALLnewitem
  
***************
*** 138,180 ****
  	     &MARCaddword &MARCdelword
   );
! %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
  
  # your exported package globals go here,
  # as well as any optionally exported functions
  
! @EXPORT_OK   = qw($Var1 %Hashit);	# FIXME - These are never used
! 
! 
! # non-exported package globals go here
! use vars qw(@more $stuff);		# FIXME - These are never used
! 
! # initalize package globals, first exported ones
! 
! # FIXME - These are never used
! my $Var1   = '';
! my %Hashit = ();
! 
! 
! # then the others (which are still accessible as $Some::Module::stuff)
! # FIXME - These are never used
! my $stuff  = '';
! my @more   = ();
! 
! # all file-scoped lexicals must be created before
! # the functions below that use them.
! 
! # file-private lexicals go here
! # FIXME - These are never used
! my $priv_var    = '';
! my %secret_hash = ();
! 
! # here's a file-private function as a closure,
! # callable as &$priv_func;  it cannot be prototyped.
! # FIXME - This is never used
! my $priv_func = sub {
!   # stuff goes here.
!   };
!   
! # make all your functions, whether exported or not;
  
  #
--- 144,154 ----
  	     &MARCaddword &MARCdelword
   );
! 
! %EXPORT_TAGS = ( );
  
  # your exported package globals go here,
  # as well as any optionally exported functions
  
! @EXPORT_OK   = qw($Var1 %Hashit);
  
  #
***************
*** 184,188 ****
  #
  # all the following subs takes a MARC::Record as parameter and manage
! # the MARC-DB. They are called by the 1.0/1.2 xxx subs, and by the 
  # ALLxxx subs (xxx deals with old-DB parameters, the ALLxxx deals with MARC-DB parameter)
  
--- 158,162 ----
  #
  # all the following subs takes a MARC::Record as parameter and manage
! # the MARC-DB. They are called by the 1.0/1.2 xxx subs, and by the
  # ALLxxx subs (xxx deals with old-DB parameters, the ALLxxx deals with MARC-DB parameter)
  
***************
*** 263,267 ****
  
  Paul POULAIN paul.poulain at free.fr
! 
  =cut
  
--- 237,241 ----
  
  Paul POULAIN paul.poulain at free.fr
! /
  =cut
  
***************
*** 270,273 ****
--- 244,258 ----
      my $sth;
      if ($forlibrarian eq 1) {
+ 	$sth=$dbh->prepare("select tagfield,liblibrarian as lib from marc_tag_structure");
+     } else {
+ 	$sth=$dbh->prepare("select tagfield,libopac as lib from marc_tag_structure");
+     }
+     $sth->execute;
+     my ($lib,$tag,$res);
+     while ( ($tag,$lib) = $sth->fetchrow) {
+ 	$res->{$tag}->{lib}=$lib;
+     }
+ 
+     if ($forlibrarian eq 1) {
  	$sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian as lib from marc_subfield_structure");
      } else {
***************
*** 275,282 ****
      }
      $sth->execute;
!     my $lib;
!     my $tag;
      my $subfield;
-     my $res;
      while ( ($tag,$subfield,$lib) = $sth->fetchrow) {
  	$res->{$tag}->{$subfield}=$lib;
--- 260,265 ----
      }
      $sth->execute;
! 
      my $subfield;
      while ( ($tag,$subfield,$lib) = $sth->fetchrow) {
  	$res->{$tag}->{$subfield}=$lib;