[Koha-cvs] CVS: koha/C4 SimpleMarc.pm,1.6,1.7

[Andrew Arensburger]

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

Modified Files:
        SimpleMarc.pm 
Log Message:
Deleted unused variables.
Removed trailing whitespace.


Index: SimpleMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SimpleMarc.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** SimpleMarc.pm       10 Oct 2002 04:44:28 -0000      1.6
--- SimpleMarc.pm       13 Oct 2002 08:30:38 -0000      1.7
***************
*** 1,8 ****
! #!/usr/bin/perl
  
  # $Id$
  
- package C4::SimpleMarc;
- 
  # Routines for handling import of MARC data into Koha db
  
--- 1,6 ----
! package C4::SimpleMarc;
  
  # $Id$
  
  # Routines for handling import of MARC data into Koha db
  
***************
*** 30,42 ****
  
  use strict;
- 
- # standard or CPAN modules used
  use DBI;
- 
- # Koha modules used
- 
  require Exporter;
! 
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
  
  # set the version for version checking
--- 28,34 ----
  
  use strict;
  use DBI;
  require Exporter;
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
  
  # set the version for version checking
***************
*** 63,76 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(
!       &extractmarcfields 
!       &parsemarcfileformat 
        &taglabel
        %tagtext
        %tagmap
  );
- %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
- 
- # your exported package globals go here,
- # as well as any optionally exported functions
  
  # FIXME - %tagtext and %tagmap are in both @EXPORT and @EXPORT_OK.
--- 55,64 ----
  @ISA = qw(Exporter);
  @EXPORT = qw(
!       &extractmarcfields
!       &parsemarcfileformat
        &taglabel
        %tagtext
        %tagmap
  );
  
  # FIXME - %tagtext and %tagmap are in both @EXPORT and @EXPORT_OK.
***************
*** 82,111 ****
  );
  
- # non-exported package globals go here
- use vars qw(@more $stuff);
- 
- # initalize package globals, first exported ones
- 
- my $Var1   = '';
- my %Hashit = ();
- 
- # then the others (which are still accessible as $Some::Module::stuff)
- my $stuff  = '';
- my @more   = ();
- 
- # all file-scoped lexicals must be created before
- # the functions below that use them.
- 
- # file-private lexicals go here
- my $priv_var    = '';
- my %secret_hash = ();
- 
- # here's a file-private function as a closure,
- # callable as &$priv_func;  it cannot be prototyped.
- my $priv_func = sub {
-   # stuff goes here.
-   };
-   
- # make all your functions, whether exported or not;
  #------------------------------------------------
  
--- 70,73 ----
***************
*** 247,251 ****
      )address@hidden;
  
!     # return 
      my $bib;          # pointer to hash of named output fields
                        # Example: $bib->{'author'} = "Twain, Mark";
--- 209,213 ----
      )address@hidden;
  
!     # return
      my $bib;          # pointer to hash of named output fields
                        # Example: $bib->{'author'} = "Twain, Mark";
***************
*** 255,259 ****
      my (
        $field,         # hash ref
!       $value, 
        $subfield,      # Marc subfield [a-z]
        $fieldname,     # name of field "author", "title", etc.
--- 217,221 ----
      my (
        $field,         # hash ref
!       $value,
        $subfield,      # Marc subfield [a-z]
        $fieldname,     # name of field "author", "title", etc.
***************
*** 261,268 ****
        $stripregex,    # reg exp pattern
      );
!     my ($lccn, $isbn, $issn,    
        $publicationyear, @subjects, $subject,
!       $controlnumber, 
!       $notes, $additionalauthors, $illustrator, $copyrightdate, 
        $s, $subdivision, $subjectsubfield,
      );
--- 223,230 ----
        $stripregex,    # reg exp pattern
      );
!     my ($lccn, $isbn, $issn,
        $publicationyear, @subjects, $subject,
!       $controlnumber,
!       $notes, $additionalauthors, $illustrator, $copyrightdate,
        $s, $subdivision, $subjectsubfield,
      );
***************
*** 344,348 ****
                if ($field->{'tag'} eq '700') {
                    my $name=$field->{'subfields'}->{'a'};
!                   if ( defined($field->{'subfields'}->{'e'}) 
                        and  $field->{'subfields'}->{'e'}=~/ill/) {
                        $illustrator=$name;
--- 306,310 ----
                if ($field->{'tag'} eq '700') {
                    my $name=$field->{'subfields'}->{'a'};
!                   if ( defined($field->{'subfields'}->{'e'})
                        and  $field->{'subfields'}->{'e'}=~/ill/) {
                        $illustrator=$name;
***************
*** 413,417 ****
                        # FIXME - "[^\d]" can be rewritten as "\D"
                        # FIXME - Does this include the check digit? If so,
!                       # it might be "X".                      
        };
  
--- 375,379 ----
                        # FIXME - "[^\d]" can be rewritten as "\D"
                        # FIXME - Does this include the check digit? If so,
!                       # it might be "X".
        };
  
***************
*** 605,608 ****
--- 567,574 ----
  #---------------------------------------------
  # $Log$
+ # Revision 1.7  2002/10/13 08:30:38  arensb
+ # Deleted unused variables.
+ # Removed trailing whitespace.
+ #
  # Revision 1.6  2002/10/10 04:44:28  arensb
  # Added whitespace to make the POD work.