Update of /cvsroot/koha/koha/acqui In directory usw-pr-cvs1:/tmp/cvs-serv14249/acqui Modified Files: acquire.pl newbiblio.pl Log Message: Glens updates to automatically increment barcode, and to remove hardcoded itemtypes in scripts Index: acquire.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** acquire.pl 2000/12/19 23:45:56 1.1.1.1 --- acquire.pl 2001/03/12 23:32:47 1.2 *************** *** 6,10 **** use C4::Acquisitions; use C4::Output; ! use CGI; use strict; --- 6,11 ---- use C4::Acquisitions; use C4::Output; ! use C4::Database; ! use C4::Search; use CGI; use strict; *************** *** 60,64 **** print "<input type=image name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right>"; } else { ! print "<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=$results[0]->{'ordernumber'}&id=$results[0]->{'booksellerid'}><image src=/images/modify-mem.gif align=right border=0></a>"; } print <<EOP --- 61,65 ---- print "<input type=image name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right>"; } else { ! print "<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=$results[0]->{'ordernumber'}&id=$results[0]->{'booksellerid'}><img src=/images/modify-mem.gif align=right border=0></a>"; } print <<EOP *************** *** 88,93 **** <TR VALIGN=TOP> ! <TD><A HREF="popbox.html" onclick="messenger(600,300,'ITEMTYPES<BR>ART = Art Print<BR>BCD = CD-ROM from book<BR>CAS = Cassette<BR>CD = Compact disc (WN)<BR>F = Free Fiction<BR>FVID = Free video<BR>FYA = Young Adult Fiction<BR>GWB = Get Well Bag<BR>HCVF = Horowhenua Collection Vertical File<BR>IL = Interloan<BR>JCF = Junior Castle Fiction<BR>JCNF = Junior Castle Non-fiction<BR>JF = Junior Fiction<BR>JHC = Junior Horowhenua Collection VF<BR>JIG = Jigsaw puzzle<BR>JK = Junior Kermit<BR>JNF = Junior Non-Fiction<BR>JPB = Junior Paperbacks<BR>JPC = Junior Picture Book<BR>JPER = Junior Periodical<BR>JREF = Junior Reference<BR>JVF = Junior Vertical File<BR>LP = Large Print<BR>MAP = Map<BR>NF = Adult NonFiction<BR>NFLP = NonFiction LargePrint<BR>NGA = Nga Pukapuka<BR>PAY = Pay Collection<BR>PB = Pamphlet Box<BR>PER = Periodical<BR>PHOT = Photograph<BR>POS = Junior Poster<BR>REF = Adult Reference<BR>ROM = CD-Rom<BR>STF = Stack Fiction<BR>STJ = Stack Junior<BR>STLP = Stack Large Print<BR>STNF = Stack Non-fiction<BR>TB = Talking Book<BR>TREF = Taonga<BR>VF = Vertical File<BR>VID = Video'); return false"><B>Format *</B></A></td> ! <td><input type=text size=20 name=format value="$results[0]->{'itemtype'}"> </td> --- 89,114 ---- <TR VALIGN=TOP> ! <TD>Format</td> ! <td> ! <select name=format size=1> ! EOP ! ; ! ! my $dbh=C4Connect; ! my $query="Select itemtype,description from itemtypes order by description"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! while (my $data=$sth->fetchrow_hashref){ ! if ($data->{'itemtype'} eq $results[0]->{'itemtype'}) { ! print "<option SELECTED value=\"" . $data->{'itemtype'} . "\">" . $data->{'description'} . "\n"; ! } else { ! print "<option value=\"" . $data->{'itemtype'} . "\">" . $data->{'description'} . "\n"; ! } ! } ! $sth->finish; ! $dbh->disconnect; ! ! print <<EOP ! </select> </td> *************** *** 129,133 **** <TD><B>Item Barcode *</B></td> ! <td><input type=text size=20 name=barcode> </td> </tr> --- 150,171 ---- <TD><B>Item Barcode *</B></td> ! <td><input type=text size=20 name=barcode value= ! EOP ! ; ! ! my %systemprefs=systemprefs(); ! if ($systemprefs{'autoBarcode'} eq '1') { ! my $dbh=C4Connect; ! my $query="Select barcode from items order by barcode desc"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my $data=$sth->fetchrow_hashref; ! print $data->{'barcode'}+1; ! $sth->finish; ! $dbh->disconnect; ! } ! ! print <<EOP ! > </td> </tr> *************** *** 201,205 **** <TD>Invoice Number</td> <td>$invoice ! <input type=hidden name=invoice value=$invoice> <TR VALIGN=TOP> <TD>Notes</td> --- 239,245 ---- <TD>Invoice Number</td> <td>$invoice ! <input type=hidden name=invoice value="$invoice"> ! </td> ! </tr> <TR VALIGN=TOP> <TD>Notes</td> Index: newbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** newbiblio.pl 2000/12/19 23:45:57 1.1.1.1 --- newbiblio.pl 2001/03/12 23:32:47 1.2 *************** *** 7,10 **** --- 7,11 ---- use C4::Output; use C4::Search; + use C4::Database; use CGI; use strict; *************** *** 149,154 **** </tr> <TR VALIGN=TOP> ! <TD><A HREF="popbox.html" onclick="messenger(600,300,'ITEMTYPES<BR>ART = Art Print<BR>BCD = CD-ROM from book<BR>CAS = Cassette<BR>CD = Compact disc (WN)<BR>F = Free Fiction<BR>FVID = Free video<BR>FYA = Young Adult Fiction<BR>GWB = Get Well Bag<BR>HCVF = Horowhenua Collection Vertical File<BR>IL = Interloan<BR>JCF = Junior Castle Fiction<BR>JCNF = Junior Castle Non-fiction<BR>JF = Junior Fiction<BR>JHC = Junior Horowhenua Collection VF<BR>JIG = Jigsaw puzzle<BR>JK = Junior Kermit<BR>JNF = Junior Non-Fiction<BR>JPB = Junior Paperbacks<BR>JPC = Junior Picture Book<BR>JPER = Junior Periodical<BR>JREF = Junior Reference<BR>JVF = Junior Vertical File<BR>LP = Large Print<BR>MAP = Map<BR>NF = Adult NonFiction<BR>NFLP = NonFiction LargePrint<BR>NGA = Nga Pukapuka<BR>PAY = Pay Collection<BR>PB = Pamphlet Box<BR>PER = Periodical<BR>PHOT = Photograph<BR>POS = Junior Poster<BR>REF = Adult Reference<BR>ROM = CD-Rom<BR>STF = Stack Fiction<BR>STJ = Stack Junior<BR>STLP = Stack Large Print<BR>STNF = Stack Non-fiction<BR>TB = Talking Book<BR>TREF = Taonga<BR>VF = Vertical File<BR>VID = Video'); return false"><b>Format *</b></A></td> ! <td><input type=text size=20 name=format value=$data->{'itemtype'}> </td> </tr> --- 150,174 ---- </tr> <TR VALIGN=TOP> ! <TD>Format</td> ! <td> ! <select name=format size=1> ! printend ! ; ! ! my $dbh=C4Connect; ! my $query="Select itemtype,description from itemtypes order by description"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! print "<option value=\"\">Please choose:\n"; ! while (my $data=$sth->fetchrow_hashref){ ! print "<option value=\"" . $data->{'itemtype'} . "\">" . $data->{'description'} . "\n"; ! } ! $sth->finish; ! $dbh->disconnect; ! ! print <<printend ! </select> ! ! </td> </tr> *************** *** 183,187 **** <TR VALIGN=TOP bgcolor=#ffffcc> <TD >Item Barcode</td> ! <td><input type=text size=20 name=barcode> </td> </tr> --- 203,224 ---- <TR VALIGN=TOP bgcolor=#ffffcc> <TD >Item Barcode</td> ! <td><input type=text size=20 name=barcode value= ! printend ! ; ! ! my %systemprefs=systemprefs(); ! if ($systemprefs{'autoBarcode'} eq '1') { ! my $dbh=C4Connect; ! my $query="Select barcode from items order by barcode desc"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my $data=$sth->fetchrow_hashref; ! print $data->{'barcode'}+1; ! $sth->finish; ! $dbh->disconnect; ! } ! ! print <<printend ! > </td> </tr>