[Koha-cvs] CVS: koha/C4 Biblio.pm,1.12.2.3,1.12.2.4

[Andrew Arensburger]

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

Modified Files:
      Tag: arensb-context
	Biblio.pm 
Log Message:
Merged in changes from main branch.


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -C2 -r1.12.2.3 -r1.12.2.4
*** Biblio.pm	5 Oct 2002 06:12:10 -0000	1.12.2.3
--- Biblio.pm	5 Oct 2002 07:09:31 -0000	1.12.2.4
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  # $Log$
+ # Revision 1.12.2.4  2002/10/05 07:09:31  arensb
+ # Merged in changes from main branch.
+ #
  # Revision 1.12.2.3  2002/10/05 06:12:10  arensb
  # Added a whole mess of FIXME comments.
***************
*** 138,141 ****
--- 141,147 ----
  	     &newcompletebiblioitem
  
+ 	     &MARCfind_oldbiblionumber_from_MARCbibid
+ 	     &MARCfind_MARCbibid_from_oldbiblionumber
+ 
  	     &ALLnewbiblio &ALLnewitem
  
***************
*** 149,153 ****
  	     &MARCaddword &MARCdelword
   );
! %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
  
  # your exported package globals go here,
--- 155,160 ----
  	     &MARCaddword &MARCdelword
   );
! 
! %EXPORT_TAGS = ( );
  
  # your exported package globals go here,
***************
*** 156,192 ****
  @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;
- 
  #
  #
--- 163,166 ----
***************
*** 195,199 ****
  #
  # 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)
  
--- 169,173 ----
  #
  # 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)
  
***************
*** 281,284 ****
--- 255,269 ----
      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 {
***************
*** 286,293 ****
      }
      $sth->execute;
!     my $lib;
!     my $tag;
      my $subfield;
-     my $res;
      while ( ($tag,$subfield,$lib) = $sth->fetchrow) {
  	$res->{$tag}->{$subfield}=$lib;
--- 271,276 ----
      }
      $sth->execute;
! 
      my $subfield;
      while ( ($tag,$subfield,$lib) = $sth->fetchrow) {
  	$res->{$tag}->{$subfield}=$lib;
***************
*** 832,842 ****
      my @words = split / /,$sentence;
  # build stopword list
!     my $sth2 =$dbh->prepare("select word from stopwords");
!     $sth2->execute;
!     my $stopwords;
!     my $stopword;
!     while(($stopword) = $sth2->fetchrow_array)  {
! 	$stopwords->{$stopword} = $stopword;
!     }
      my $sth=$dbh->prepare("insert into marc_word (bibid, tag, tagorder, subfieldid, subfieldorder, word, sndx_word)
  			values (?,?,?,?,?,?,soundex(?))");
--- 815,826 ----
      my @words = split / /,$sentence;
  # build stopword list
! #    my $sth2 =$dbh->prepare("select word from stopwords");
! #    $sth2->execute;
! #    my $stopwords;
! #    my $stopword;
! #    while(($stopword) = $sth2->fetchrow_array)  {
! #	$stopwords->{$stopword} = $stopword;
! #    }
!     my $stopwords= C4::Context->stopwords;
      my $sth=$dbh->prepare("insert into marc_word (bibid, tag, tagorder, subfieldid, subfieldorder, word, sndx_word)
  			values (?,?,?,?,?,?,soundex(?))");