From 0b52637ff65526f03dc25f9319e23005112db533 Mon Sep 17 00:00:00 2001
From: truth_nz <truth_nz>
Date: Mon, 6 May 2002 02:47:49 +0000
Subject: [PATCH] Fixed bug due to way hashes take values. Was stopping items
 being saved to database. Added code to pick up branch list from database.

---
 acqui.simple/addbiblioitem.pl  |  2 +-
 acqui.simple/additem.pl        | 15 +++++++++++++-
 acqui.simple/savebiblio.pl     | 17 ++++++++-------
 acqui.simple/savebiblioitem.pl | 38 +++++++++++++++++-----------------
 acqui.simple/saveitem.pl       |  6 +++---
 5 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/acqui.simple/addbiblioitem.pl b/acqui.simple/addbiblioitem.pl
index 001cfcae3d..fc019dba39 100755
--- a/acqui.simple/addbiblioitem.pl
+++ b/acqui.simple/addbiblioitem.pl
@@ -114,7 +114,7 @@ EOF
 <td colspan="3"><textarea name="notes" cols="30" rows="6"></textarea></td>
 </tr>
 <tr valign="top">
-<td colspan="4" align="center"><input type="submit" value="Add New Item"></td>
+<td colspan="4" align="center"><input type="submit" value="Add New Group"></td>
 </tr>
     
   </table></FORM>
diff --git a/acqui.simple/additem.pl b/acqui.simple/additem.pl
index a209ca6fc5..b91c516955 100755
--- a/acqui.simple/additem.pl
+++ b/acqui.simple/additem.pl
@@ -11,6 +11,8 @@ my $maxbarcode;
 my $isbn;
 my $count;
 my @results;
+my $branchcount;
+my @branches;
 
 if (! $biblioitemnum) {
     print $input->redirect('addbooks.pl');
@@ -29,6 +31,7 @@ if (! $biblioitemnum) {
 	print startmenu('acquisitions');
     
 	($count, @results) = &getitemsbybiblioitem($biblioitemnum);
+	($branchcount, @branches) = &branches;
 
 	if ($count) {
 	    print << "EOF";
@@ -69,7 +72,17 @@ EOF
 <td align="right">BARCODE:</td>
 <td><input name="barcode" size="10" value="$maxbarcode" /></td>
 <td align="right">Home Branch:</td>
-<td><select name="homebranch"><option value="STWE">Stewart Elementary<option value="MEZ">Meziadin Elementary</select></td>
+<td><select name="homebranch">
+EOF
+
+	for (my $i = 0; $i < $branchcount; $i ++) {
+	    print << "EOF";
+<option value="$branches[$i]->{'branchcode'}">$branches[$i]->{'branchname'}
+EOF
+	} # for
+
+	print << "EOF";
+</select></td>
 </tr>
 <tr>
 <td align="right">Replacement Price:</td>
diff --git a/acqui.simple/savebiblio.pl b/acqui.simple/savebiblio.pl
index 9e24146279..97a4b17d5c 100755
--- a/acqui.simple/savebiblio.pl
+++ b/acqui.simple/savebiblio.pl
@@ -5,14 +5,15 @@ use strict;
 use C4::Acquisitions;
 
 my $input = new CGI;
-my $biblio = { title       => $input->param('title'),
-               subtitle    => $input->param('subtitle'),
-               author      => $input->param('author'),
-               seriestitle => $input->param('seriestitle'),
-               copyright   => $input->param('copyrightdate'),
-               abstract    => $input->param('abstract'),
-               notes       => $input->param('notes')
-             }; # my $biblio
+my $biblio = {
+    title       => $input->param('title'),
+    subtitle    => $input->param('subtitle')?$input->param('subtitle'):"",
+    author      => $input->param('author')?$input->param('author'):"",
+    seriestitle => $input->param('seriestitle')?$input->param('seriestitle'):"",
+    copyright   => $input->param('copyrightdate')?$input->param('copyrightdate'):"",
+    abstract    => $input->param('abstract')?$input->param('abstract'):"",
+    notes       => $input->param('notes')?$input->param('notes'):""
+}; # my $biblio
 my $biblionumber;
 
 if (! $biblio->{'title'}) {
diff --git a/acqui.simple/savebiblioitem.pl b/acqui.simple/savebiblioitem.pl
index e333751cd4..2e3d06e4e8 100755
--- a/acqui.simple/savebiblioitem.pl
+++ b/acqui.simple/savebiblioitem.pl
@@ -8,25 +8,25 @@ my $input = new CGI;
 my $biblionumber = $input->param('biblionumber');
 my $biblioitem = {
     biblionumber      => $biblionumber,
-    publishercode     => $input->param('publishercode'),
-    publicationyear   => $input->param('publicationyear'),
-    place             => $input->param('year'),
-    illus             => $input->param('illus'),
-    isbn              => $input->param('isbn'),
-    additionalauthors => $input->param('additionalauthors'),
-    subjectheadings   => $input->param('subjectheadings'),
-    itemtype          => $input->param('itemtype'),
-    url               => $input->param('url'),
-    dewey             => $input->param('dewey'),
-    subclass          => $input->param('subclass'),
-    issn              => $input->param('issn'),
-    lccn              => $input->param('lccn'),
-    volume            => $input->param('volume'),
-    number            => $input->param('number'),
-    volumeddesc       => $input->param('volumeddesc'),
-    pages             => $input->param('pages'),
-    size              => $input->param('size'),
-    notes             => $input->param('notes')
+    publishercode     => $input->param('publishercode')?$input->param('publishercode'):"",
+    publicationyear   => $input->param('publicationyear')?$input->param('publicationyear'):"",
+    place             => $input->param('year')?$input->param('year'):"",
+    illus             => $input->param('illus')?$input->param('illus'):"",
+    isbn              => $input->param('isbn')?$input->param('isbn'):"",
+    additionalauthors => $input->param('additionalauthors')?$input->param('additionalauthors'):"",
+    subjectheadings   => $input->param('subjectheadings')?$input->param('subjectheadings'):"",
+    itemtype          => $input->param('itemtype')?$input->param('itemtype'):"",
+    url               => $input->param('url')?$input->param('url'):"",
+    dewey             => $input->param('dewey')?$input->param('dewey'):"",
+    subclass          => $input->param('subclass')?$input->param('subclass'):"",
+    issn              => $input->param('issn')?$input->param('issn'):"",
+    lccn              => $input->param('lccn')?$input->param('lccn'):"",
+    volume            => $input->param('volume')?$input->param('volume'):"",
+    number            => $input->param('number')?$input->param('number'):"",
+    volumeddesc       => $input->param('volumeddesc')?$input->param('volumeddesc'):"",
+    pages             => $input->param('pages')?$input->param('pages'):"",
+    size              => $input->param('size')?$input->param('size'):"",
+    notes             => $input->param('notes')?$input->param('notes'):""
 };
 my $biblioitemnum;
 
diff --git a/acqui.simple/saveitem.pl b/acqui.simple/saveitem.pl
index ffb23a1cd2..6ed496fc3b 100755
--- a/acqui.simple/saveitem.pl
+++ b/acqui.simple/saveitem.pl
@@ -10,9 +10,9 @@ my $biblioitemnum = $input->param('biblioitemnum');
 my $item          = {
     biblioitemnumber => $biblioitemnum,
     homebranch       => $input->param('homebranch'),
-    replacementprice => $input->param('replacementprice'),
-    itemnotes        => $input->param('notes')
-};
+    replacementprice => $input->param('replacementprice')?$input->param('replacementprice'):"",
+    itemnotes        => $input->param('notes')?$input->param('notes'):""
+}; # my $item
 my $count;
 my @results;
 
-- 
2.39.5