Update of /cvsroot/koha/koha/acqui.simple In directory usw-pr-cvs1:/tmp/cvs-serv25277/acqui.simple Modified Files: addbiblioitem.pl additem.pl savebiblio.pl savebiblioitem.pl saveitem.pl Log Message: Bug fixes to get the new acqui.simple system working. Index: addbiblioitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblioitem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** addbiblioitem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- addbiblioitem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 17,27 **** ($count, @results) = &getbiblio($biblionumber); ! $title = @results[0]->{'title'}; ! print $input->header; ! print startpage(); ! print startmenu('acquisitions'); ! print << "EOF"; <font size="6"><em>Adding New Group Information - $title</em></font> <table bgcolor="#ffcc00" width="80%" cellpadding="5"> --- 17,31 ---- ($count, @results) = &getbiblio($biblionumber); ! ! if (! $count) { ! print $input->redirect('addbooks.pl'); ! } else { ! $title = @results[0]->{'title'}; ! print $input->header; ! print startpage(); ! print startmenu('acquisitions'); ! print << "EOF"; <font size="6"><em>Adding New Group Information - $title</em></font> <table bgcolor="#ffcc00" width="80%" cellpadding="5"> *************** *** 64,75 **** EOF ! ($count, @results) = &getitemtypes; ! for (my $i = 0; $i < $count; $i++) { ! print << "EOF"; <option value="$results[$i]->{'itemtype'}">$results[$i]->{'itemtype'} - $results[$i]->{'description'} EOF ! } # for ! print << "EOF"; </select></td> </tr> --- 68,79 ---- EOF ! ($count, @results) = &getitemtypes; ! for (my $i = 0; $i < $count; $i++) { ! print << "EOF"; <option value="$results[$i]->{'itemtype'}">$results[$i]->{'itemtype'} - $results[$i]->{'description'} EOF ! } # for ! print << "EOF"; </select></td> </tr> *************** *** 117,121 **** EOF ! print endmenu(); ! print endpage(); } # else --- 121,126 ---- EOF ! print endmenu(); ! print endpage(); ! } # else } # else Index: additem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** additem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- additem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 16,20 **** print $input->redirect('addbooks.pl'); } else { ! ($count, @results) = &getbiblioitem($biblioitemnum); --- 16,20 ---- print $input->redirect('addbooks.pl'); } else { ! ($count, @results) = &getbiblioitem($biblioitemnum); *************** *** 63,67 **** <center> <h2>Section Three: Specific Item Information</h2> ! <form action="saveitems" method="post"> <input type="hidden" name="biblioitemnum" value="$biblioitemnum"> <table> --- 63,67 ---- <center> <h2>Section Three: Specific Item Information</h2> ! <form action="saveitem.pl" method="post"> <input type="hidden" name="biblioitemnum" value="$biblioitemnum"> <table> Index: savebiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** savebiblio.pl 29 Apr 2002 05:29:02 -0000 1.1 --- savebiblio.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 6,16 **** my $input = new CGI; ! my $biblio->{'title'} = $input->param('title'); ! my $biblio->{'subtitle'} = $input->param('subtitle'); ! my $biblio->{'author'} = $input->param('author'); ! my $biblio->{'seriestitle'} = $input->param('seriestitle'); ! my $biblio->{'copyright'} = $input->param('copyrightdate'); ! my $biblio->{'abstract'} = $input->param('abstract'); ! my $biblio->{'notes'} = $input->param('notes'); my $biblionumber; --- 6,17 ---- 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 $biblionumber; *************** *** 20,25 **** $biblionumber = &newbiblio($biblio); ! &newsubtitle($biblionumber, $subtitle); ! print $input->redirect('addbiblioitem.pl?biblionumber=$biblionumber'); } # else --- 21,26 ---- $biblionumber = &newbiblio($biblio); ! &newsubtitle($biblionumber, $biblio->{'subtitle'}); ! print $input->redirect("addbiblioitem.pl?biblionumber=$biblionumber"); } # else Index: savebiblioitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/savebiblioitem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** savebiblioitem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- savebiblioitem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 37,40 **** $biblioitemnum = &newbiblioitem($biblioitem); ! print $input->redirect('additem.pl?biblioitemnum=$biblioitemnum'); } # else --- 37,40 ---- $biblioitemnum = &newbiblioitem($biblioitem); ! print $input->redirect("additem.pl?biblioitemnum=$biblioitemnum"); } # else Index: saveitem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** saveitem.pl 29 Apr 2002 05:29:02 -0000 1.1 --- saveitem.pl 3 May 2002 02:47:33 -0000 1.2 *************** *** 9,13 **** my $biblioitemnum = $input->param('biblioitemnum'); my $item = { ! biblioitemnum => $biblioitemnum, homebranch => $input->param('homebranch'), replacementprice => $input->param('replacementprice'), --- 9,13 ---- my $biblioitemnum = $input->param('biblioitemnum'); my $item = { ! biblioitemnumber => $biblioitemnum, homebranch => $input->param('homebranch'), replacementprice => $input->param('replacementprice'), *************** *** 31,35 **** &newitems($item, ($barcode)); ! print $input->redirect('additem.pl?biblioitemnum=$biblioitemnum'); } # else } # else --- 31,35 ---- &newitems($item, ($barcode)); ! print $input->redirect("additem.pl?biblioitemnum=$biblioitemnum"); } # else } # else