From b6f149a7a418b50fc7e38ee441d2d839c8acc77f Mon Sep 17 00:00:00 2001
From: tonnesen <tonnesen>
Date: Thu, 20 Jun 2002 17:45:55 +0000
Subject: [PATCH] Branch Merges.

---
 acqui.simple/bulkmarcimport.pl | 6 ++++--
 acqui/receive.pl               | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/acqui.simple/bulkmarcimport.pl b/acqui.simple/bulkmarcimport.pl
index d5de6d0b49..e54d224f17 100755
--- a/acqui.simple/bulkmarcimport.pl
+++ b/acqui.simple/bulkmarcimport.pl
@@ -13,6 +13,8 @@
 
 $file=$ARGV[0];
 
+$branchname='MAIN';
+
 unless ($file) {
     print "USAGE: ./bulkmarcimport.pl filename\n";
     exit;
@@ -472,7 +474,7 @@ RECORD:
 	    }
 	}
 	my $q_barcode=$dbh->quote($barcode);
-	my $q_homebranch="'MAIN'";
+	my $q_homebranch="'$branchname'";
 	my $q_notes="''";
 	#my $replacementprice=0;
 	my $sth=$dbh->prepare("select max(itemnumber) from items");
@@ -493,7 +495,7 @@ BARCODE:
 	    $replacementprice=~s/^p//;
 	    ($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)";
+	    $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";
 	    $sth->execute;
diff --git a/acqui/receive.pl b/acqui/receive.pl
index 63631426fd..bf276abcd3 100755
--- a/acqui/receive.pl
+++ b/acqui/receive.pl
@@ -12,7 +12,7 @@ use strict;
 my $input=new CGI;
 print $input->header();
 my $id=$input->param('id');
-my ($count,@booksellers)=bookseller($id); 
+my ($count,@booksellers)=bookseller($id);
 my $invoice=$input->param('invoice');
 my $freight=$input->param('freight');
 my $gst=$input->param('gst');
-- 
2.39.5