[Koha-cvs] CVS: koha/acqui.simple bulkmarcimport.pl,1.3.2.1,1.3.2.2

[Steve Tonnesen]

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv17652/acqui.simple

Modified Files:
      Tag: rel-1-2
        bulkmarcimport.pl 
Log Message:
Branch Merges.


Index: bulkmarcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/bulkmarcimport.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** bulkmarcimport.pl   14 Jun 2002 21:20:27 -0000      1.3.2.1
--- bulkmarcimport.pl   20 Jun 2002 17:45:56 -0000      1.3.2.2
***************
*** 14,17 ****
--- 14,19 ----
  $file=$ARGV[0];
  
+ $branchname='MAIN';
+ 
  unless ($file) {
      print "USAGE: ./bulkmarcimport.pl filename\n";
***************
*** 473,477 ****
        }
        my $q_barcode=$dbh->quote($barcode);
!       my $q_homebranch="'MAIN'";
        my $q_notes="''";
        #my $replacementprice=0;
--- 475,479 ----
        }
        my $q_barcode=$dbh->quote($barcode);
!       my $q_homebranch="'$branchname'";
        my $q_notes="''";
        #my $replacementprice=0;
***************
*** 494,498 ****
            ($replacementprice) || ($replacementprice=0);
            $replacementprice=~s/\$//;
!           $task="insert into items (itemnumber, biblionumber, 
biblioitemnumber, barcode, itemnotes, homebranch, holdingbranch, 
dateaccessioned, replacementprice) values ($itemnumber, $biblionumber, 
$biblioitemnumber, $q_barcode, $q_notes, $q_homebranch, 'MAIN', '$date', 
$replacementprice)";
            $sth=$dbh->prepare($task);
            print "$task\n";
--- 496,500 ----
            ($replacementprice) || ($replacementprice=0);
            $replacementprice=~s/\$//;
!           $task="insert into items (itemnumber, biblionumber, 
biblioitemnumber, barcode, itemnotes, homebranch, holdingbranch, 
dateaccessioned, replacementprice) values ($itemnumber, $biblionumber, 
$biblioitemnumber, $q_barcode, $q_notes, $q_homebranch, '$branchname', '$date', 
$replacementprice)";
            $sth=$dbh->prepare($task);
            print "$task\n";