[Koha-cvs] CVS: koha/acqui.simple addbooks.pl,1.8,1.9 additem.pl,1.3,1.4 isbnsearch.pl,1.1,1.2 keywordsearch.pl,1.2,1.3 savebiblio.pl,1.3,1.4 saveitem.pl,1.3,1.4 websitesearch.pl,1.1,1.2 addbiblioitem.pl,1.3,NONE savebiblioitem.pl,1.4,NONE

Gynn Lomax truth_nz at users.sourceforge.net
Wed May 22 20:35:28 CEST 2002


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

Modified Files:
	addbooks.pl additem.pl isbnsearch.pl keywordsearch.pl 
	savebiblio.pl saveitem.pl websitesearch.pl 
Removed Files:
	addbiblioitem.pl savebiblioitem.pl 
Log Message:
Update to acqui.simple system. Hopefully this is a lot more user friendly.
Probably a few bug fixes to come still.


Index: addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbooks.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** addbooks.pl	15 May 2002 04:08:38 -0000	1.8
--- addbooks.pl	22 May 2002 18:35:25 -0000	1.9
***************
*** 51,64 ****
  <table>
  <tr>
! <form action="isbnsearch.pl">
! <td>ISBN:</td>
! <td><input type="text" name="isbn" /></td>
  <td><input type="submit" value="Go" /></td>
  </form>
  </tr>
  <tr>
! <form action="keywordsearch.pl">
! <td>Keyword:</td>
! <td><input type="text" name="keyword" /></td>
  <td><input type="submit" value="Go" /></td>
  </form>
--- 51,64 ----
  <table>
  <tr>
! <form action="keywordsearch.pl">
! <td>Keyword:</td>
! <td><input type="text" name="keyword" /></td>
  <td><input type="submit" value="Go" /></td>
  </form>
  </tr>
  <tr>
! <form action="isbnsearch.pl">
! <td>ISBN:</td>
! <td><input type="text" name="isbn" /></td>
  <td><input type="submit" value="Go" /></td>
  </form>

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** additem.pl	6 May 2002 02:47:49 -0000	1.3
--- additem.pl	22 May 2002 18:35:25 -0000	1.4
***************
*** 7,82 ****
  
  my $input = new CGI;
! my $biblioitemnum = $input->param('biblioitemnum');
  my $maxbarcode;
  my $isbn;
! my $count;
! my @results;
  my $branchcount;
  my @branches;
  
! if (! $biblioitemnum) {
      print $input->redirect('addbooks.pl');
  } else {
  
!     ($count, @results) = &getbiblioitem($biblioitemnum);
!     
!     if (! $count) {
  	print $input->redirect('addbooks.pl');
      } else {
! 	$isbn       = $results[0]->{'isbn'};
! 	$maxbarcode = $results[0]->{'biblionumber'};
!   
  	print $input->header;
  	print startpage();
  	print startmenu('acquisitions');
-     
- 	($count, @results) = &getitemsbybiblioitem($biblioitemnum);
- 	($branchcount, @branches) = &branches;
  
! 	if ($count) {
  	    print << "EOF";
! <center>
  <p>
! <table border=1 bgcolor=#dddddd>
! <tr>
! <th colspan=4>Existing Items with ISBN $isbn</th>
  </tr>
- <tr>
- <th>Barcode</th><th>Title</th><th>Author</th><th>Notes</th></tr>
  EOF
  
! 	    for (my $i = 0; $i < $count; $i++) {
  		print << "EOF";
! <tr>
! <td align=center>$results[$i]->{'barcode'}</td>
! <td><u>$results[$i]->{'title'}</u></td>
! <td>$results[$i]->{'author'}</td>
! <td>$results[$i]->{'itemnotes'}</td>
  </tr>
  EOF
-         } # for
  
! 	    print << "EOF";
! </table>
! </center>
  EOF
! 	} # if
  
  	print << "EOF";
  <center>
! <h2>Section Three: Specific Item Information</h2>
  <form action="saveitem.pl" method="post">
! <input type="hidden" name="biblioitemnum" value="$biblioitemnum">
! <table>
! <tr>
! <td align="right">BARCODE:</td>
! <td><input name="barcode" size="10" value="$maxbarcode" /></td>
! <td align="right">Home Branch:</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
--- 7,157 ----
  
  my $input = new CGI;
! my $biblionumber = $input->param('biblionumber');
! my $error        = $input->param('error');
  my $maxbarcode;
  my $isbn;
! my $bibliocount;
! my @biblios;
! my $biblioitemcount;
! my @biblioitems;
  my $branchcount;
  my @branches;
+ my %branchnames;
+ my $itemcount;
+ my @items;
+ my $itemtypecount;
+ my @itemtypes;
+ my %itemtypedescriptions;
  
! if (! $biblionumber) {
      print $input->redirect('addbooks.pl');
  } else {
  
!     ($bibliocount, @biblios)  = &getbiblio($biblionumber);
! 
!     if (! $bibliocount) {
  	print $input->redirect('addbooks.pl');
      } else {
! 
! 	($biblioitemcount, @biblioitems) = &getbiblioitembybiblionumber($biblionumber);
!         ($branchcount, @branches)        = &branches;
! 	($itemtypecount, @itemtypes)     = &getitemtypes;
! 	
! 	for (my $i = 0; $i < $itemtypecount; $i++) {
! 	    $itemtypedescriptions{$itemtypes[$i]->{'itemtype'}} = $itemtypes[$i]->{'description'};
! 	} # for
! 	
! 	for (my $i = 0; $i < $branchcount; $i++) {
! 	    $branchnames{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
! 	} # for
! 
  	print $input->header;
  	print startpage();
  	print startmenu('acquisitions');
  
! 	print << "EOF";
! <font size="6"><em>$biblios[0]->{'title'}</em></font>
! <p>
! EOF
! 
! 	if ($error eq "nobarcode") {
  	    print << "EOF";
! <font size="5" color="red">You must give the item a barcode</font>
  <p>
! EOF
! 	} elsif ($error eq "nobiblioitem") {
! 	    print << "EOF";
! <font size="5" color="red">You must create a new group for your item to be added to</font>
! <p>
! EOF
! 	} elsif ($error eq "barcodeinuse") {
! 	    print << "EOF";
! <font size="5" color="red">Sorry, that barcode is already in use</font>
! <p>
! EOF
! 	} # elsif
! 	print << "EOF";
! <table align="left" cellpadding="5" cellspacing="0" border="1" width="220">
! <tr valign="top" bgcolor="#CCCC99">
! <td background="/images/background-mem.gif"><b>BIBLIO RECORD $biblionumber</b></td>
! </tr>
! <tr valign="top">
! <td><b>Author:</b> $biblios[0]->{'author'}<br>
! <b>Copyright:</b> $biblios[0]->{'copyrightdate'}<br>
! <b>Series Title:</b> $biblios[0]->{'seriestitle'}<br>
! <b>Notes:</b> $biblios[0]->{'notes'}</td>
  </tr>
  EOF
  
! 	for (my $i = 0; $i < $biblioitemcount; $i++) {
! 	    if ($biblioitems[$i]->{'itemtype'} eq "WEB") {
! 		
  		print << "EOF";
! <tr valign="top" bgcolor="#CCCC99">
! <td background="/images/background-mem.gif"><b>$biblioitems[$i]->{'biblioitemnumber'} GROUP - $itemtypedescriptions{$biblioitems[$i]->{'itemtype'}}</b></td>
! </tr>
! <tr valign="top">
! <td><b>URL:</b> $biblioitems[$i]->{'url'}<br>
! <b>Date:</b> $biblioitems[$i]->{'publicationyear'}<br>
! <b>Notes:</b> $biblioitems[$i]->{'notes'}</td>
  </tr>
  EOF
  
! 	    } else {
! 		$biblioitems[$i]->{'dewey'} =~ /(\d*\.\d\d)/;
! 		$biblioitems[$i]->{'dewey'} = $1;
! 
! 		print << "EOF";
! <tr valign="top" bgcolor="#CCCC99">
! <td background="/images/background-mem.gif"><b>$biblioitems[$i]->{'biblioitemnumber'} GROUP - $itemtypedescriptions{$biblioitems[$i]->{'itemtype'}}</b></td>
! </tr>
! <tr valign="top">
! <td><b>ISBN:</b> $biblioitems[$i]->{'isbn'}<br>
! <b>Dewey:</b> $biblioitems[$i]->{'dewey'}<br>
! <b>Publisher:</b> $biblioitems[$i]->{'publishercode'}<br>
! <b>Place:</b> $biblioitems[$i]->{'place'}<br>
! <b>Date:</b> $biblioitems[$i]->{'publicationyear'}</td>
! </tr>
! EOF
! 
! 		($itemcount, @items) = &getitemsbybiblioitem($biblioitems[$i]->{'biblioitemnumber'});
! 
! 		for (my $j = 0; $j < $itemcount; $j++) {
! 		    print << "EOF";
! <tr valign="top" bgcolor="#FFFFCC">
! <td><b>Item:</b> $items[$j]->{'barcode'}<br>
! <b>Home Branch:</b> $branchnames{$items[$j]->{'homebranch'}}<br>
! <b>Notes:</b> $items[$j]->{'itemnotes'}</td>
! </tr>
  EOF
! 		} # for
! 	    } # else
! 	} # for
  
  	print << "EOF";
+ </table>
+ <img src="/images/holder.gif" width="16" height="650" align="left">
+ 
  <center>
! 
  <form action="saveitem.pl" method="post">
! <input type="hidden" name="biblionumber" value="$biblionumber">
! <table border="1" cellspacing="0" cellpadding="5">
! <tr valign="top" bgcolor="#CCCC99">
! <td background="/images/background-mem.gif" colspan="2"><b>ADD NEW ITEM:</b><br>
! <small><i>For a website add the group only</i></small></td>
! </tr>
! <tr valign="top">
! <td>Item Barcode:</td>
! <td><input type="text" name="barcode" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Branch:</td>
  <td><select name="homebranch">
  EOF
  
! 	for (my $i = 0; $i < $branchcount; $i++) {
  	    print << "EOF";
! <option value="$branches[$i]->{'branchcode'}">$branches[$i]->{'branchname'}</option>
  EOF
  	} # for
***************
*** 85,103 ****
  </select></td>
  </tr>
! <tr>
! <td align="right">Replacement Price:</td>
! <td colspan="3"><input name="replacementprice" size="10"></td>
  </tr>
  <tr valign="top">
! <td align="right">Notes:</td>
! <td colspan="3"><textarea name="notes" rows="4" cols="40" wrap="physical"></textarea></td>
  </tr>
  </table>
! <input type="submit" value="Add Item" />
  </form>
  </center>
  EOF
!     
! 	print endmenu();
  	print endpage();
      } # if
--- 160,292 ----
  </select></td>
  </tr>
! <tr valign="top">
! <td>Replacement Price:</td>
! <td><input type="text" name="replacementprice" size="40"></td>
  </tr>
  <tr valign="top">
! <td>Notes:</td>
! <td><textarea name="itemnotes" cols="30" rows="6"></textarea></td>
! </tr>
! <tr valign="top" bgcolor="#CCCC99">
! <td colspan="2" background="/images/background-mem.gif"><b>Add to existing group:</b></td>
! </tr>
! <tr valign="top">
! <td>Group:</td>
! <td><select name="biblioitemnumber">
! EOF
! 
! 	for (my $i = 0; $i < $biblioitemcount; $i++) {
! 	    if ($biblioitems[$i]->{'itemtype'} ne "WEB") {
! 		print << "EOF";
! <option value="$biblioitems[$i]->{'biblioitemnumber'}">$itemtypedescriptions{$biblioitems[$i]->{'itemtype'}}</option>
! EOF
! 	    } # if
! 	} # for
! 
! 	print << "EOF";
! </select></td>
! </tr>
! <tr valign="top">
! <td colspan="2" align="center"><input type="submit" name="existinggroup" value="Add New Item to Existing Group"></td>
! </tr>
! <tr valign="top" bgcolor="#CCCC99">
! <td colspan="2" background="/images/background-mem.gif"><b>OR Add to a new Group:</b></td>
! </tr>
! <tr valign="top">
! <td>Format:</td>
! <td><select name="itemtype">
! EOF
! 
! 	for (my $i = 0; $i < $itemtypecount; $i++) {
! 	    print << "EOF";
! <option value="$itemtypes[$i]->{'itemtype'}">$itemtypes[$i]->{'description'}</option>
! EOF
! 	} # for
! 
! 	print << "EOF";
! </select></td>
! </tr>
! <tr valign="top">
! <td>ISBN:</td>
! <td><input name="isbn" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Publisher:</td>
! <td><input name="publishercode" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Publication Year:</td>
! <td><input name="publicationyear" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Place of Publication:</td>
! <td><input name="place" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Illustrator:</td>
! <td><INPUT name="illus" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Additional Authors:<br><i>One Author per line</i></td>
! <td><textarea name="additionalauthors" cols="30" rows="6"></textarea></td>
! </tr>
! <tr valign="top">
! <td>Subject Headings:<br><i>One Subject per line</i></td>
! <td><textarea name="subjectheadings" cols="30" rows="6"></textarea></td>
! </tr>
! <tr valign="top">
! <td>Website URL:</td>
! <td><INPUT name="url" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Dewey:</td>
! <td><INPUT name="dewey" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Dewey Subclass:</td>
! <td><input name="subclass" size="40"></td>
! </tr>
! <tr valign="top">
! <td>ISSN:</td>
! <td><input name="issn" size="40"></td>
! </tr>
! <tr valign="top">
! <td>LCCN:</td>
! <td><input name="lccn" size="40"</td>
! </tr>
! <tr valign="top">
! <td>Volume:</td>
! <td><input name="volume" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Number:</td>
! <td><input name="number" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Volume Description:</td>
! <td><input name="volumeddesc" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Pages:</td>
! <td><input name="pages" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Size:</td>
! <td><input name="size" size="40"></td>
! </tr>
! <tr valign="top">
! <td>Notes:</td>
! <td><textarea name="notes" cols="30" rows="6"></textarea></td>
! </tr>
! <tr valign="top">
! <td colspan="2" align="center"><input type="submit" name="newgroup" value="Add New Item to New Group"></td>
  </tr>
  </table>
! 
  </form>
  </center>
  EOF
! 
! 	print endmenu('acquisitions');
  	print endpage();
      } # if

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** isbnsearch.pl	29 Apr 2002 05:29:02 -0000	1.1
--- isbnsearch.pl	22 May 2002 18:35:25 -0000	1.2
***************
*** 4,11 ****
  use strict;
  use C4::Acquisitions;
  
! my $input = new CGI;
! my $isbn  = $input->param('isbn');
! my $biblioitemnum;
  my $count;
  my @results;
--- 4,16 ----
  use strict;
  use C4::Acquisitions;
+ use C4::Search;
+ use C4::Output;
  
! my $input      = new CGI;
! my $isbn       = $input->param('isbn');
! my $offset     = $input->param('offset');
! my $num        = $input->param('num');
! my $showoffset = $offset + 1;
! my $total;
  my $count;
  my @results;
***************
*** 14,26 ****
      print $input->redirect('addbooks.pl');
  } else {
  
!     ($count, @results) = &isbnsearch($isbn);
!     if (! $count) {
! 	print $input->redirect("addbooks.pl?error=notfound");
      } else {
  
! 	$biblioitemnum = $results[0]->{'biblioitemnumber'};
! 	print $input->redirect("additem.pl?biblioitemnum=$biblioitemnum");
  
!     } # else
  } # else
--- 19,106 ----
      print $input->redirect('addbooks.pl');
  } else {
+     if (! $offset) {
+ 	$offset     = 0;
+ 	$showoffset = 1;
+     };
+     if (! $num) { $num = 10 };
+     ($count, @results) = isbnsearch($isbn);
  
!     if ($count < ($offset + $num)) {
!         $total = $count;
      } else {
+ 	$total = $offset + $num;
+     } # else
  
!     print $input->header;
!     print startpage();
!     print startmenu('acquisitions');
  
!     print << "EOF";
! <font size="6"><em>Biblio Search Results</em></font><br />
! <CENTER>
! You searched on <b>ISBN $isbn,</b> $count results found <br />
! Results $showoffset to $total displayed
! <div align="right">
! <h2><a href="addbiblio.pl">Add New Biblio</a></h2>
! </div>
! <p />
! <table border="0" cellspacing="0" cellpadding="5">
! <tr valign=top bgcolor=#cccc99>
! <td background="/images/background-mem.gif"><b>TITLE</b></td>
! <td background="/images/background-mem.gif"><b>AUTHOR</b></td>
! <td background="/images/background-mem.gif"><b>&copy;</b></td>
! </tr>
! EOF
! 
!     for (my $i = $offset; $i < $total; $i++) {
! 	if ($i % 2) {
! 	    print << "EOF";
! <tr valign="top" bgcolor="#ffffcc">
! EOF
! 	} else {
! 	    print << "EOF";
! <tr valign="top" bgcolor="#ffffff">
! EOF
! 	} # else
! 
! 	print << "EOF";
! <td><a href="additem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'title'}</a></td>
! <td><a href="additem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'author'}</a></td>
! <td>$results[$i]->{'copyrightdate'}</td>
! </tr>
! EOF
!     } # for
! 
!     print << "EOF";
! <tr valign=top bgcolor=#cccc99>
! <td background="/images/background-mem.gif">&nbsp;</td>
! <td background="/images/background-mem.gif">&nbsp;</td>
! <td background="/images/background-mem.gif">&nbsp;</td>
! </tr>
! </table>
! <br />
! EOF
! 
!     for (my $i = 0; ($i * $num) < $count; $i++) {
! 	my $newoffset = $i * $num;
! 	my $shownumber = $i + 1;
! 	print << "EOF";
! <a href="isbnsearch.pl?isbn=$isbn&offset=$newoffset&num=$num">$shownumber</a>
! EOF
!     } # for
! 
!     print << "EOF";
! <p />
! Results per page:
! <a href="isbnsearch.pl?isbn=$isbn&offset=$offset&num=5">5</a>
! <a href="isbnsearch.pl?isbn=$isbn&offset=$offset&num=10">10</a>
! <a href="isbnsearch.pl?isbn=$isbn&offset=$offset&num=20">20</a>
! <a href="isbnsearch.pl?isbn=$isbn&offset=$offset&num=50">50</a>
! </CENTER>
! <br clear="all" />
! <p>&nbsp;</p>
! EOF
! 
!     print endmenu();
!     print endpage();
  } # else

Index: keywordsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/keywordsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** keywordsearch.pl	15 May 2002 06:11:21 -0000	1.2
--- keywordsearch.pl	22 May 2002 18:35:25 -0000	1.3
***************
*** 51,55 ****
  EOF
  
!     for (my $i = $offset; $i < $total; $i++) {
  	if ($i % 2) {
  	    print << "EOF";
--- 51,55 ----
  EOF
  
!     for (my $i = 0; $i < ($total - $offset); $i++) {
  	if ($i % 2) {
  	    print << "EOF";
***************
*** 63,72 ****
  
  	print << "EOF";
! <td><a href="addbiblioitem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'title'}</a></td>
! <td><a href="addbiblioitem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'author'}</a></td>
  <td>$results[$i]->{'copyrightdate'}</td>
  </tr>
  EOF
      } # for
      print << "EOF";
  <tr valign=top bgcolor=#cccc99>
--- 63,73 ----
  
  	print << "EOF";
! <td><a href="additem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'title'}</a></td>
! <td><a href="additem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'author'}</a></td>
  <td>$results[$i]->{'copyrightdate'}</td>
  </tr>
  EOF
      } # for
+ 
      print << "EOF";
  <tr valign=top bgcolor=#cccc99>
***************
*** 81,86 ****
      for (my $i = 0; ($i * $num) < $count; $i++) {
  	my $newoffset = $i * $num;
  	print << "EOF";
! <a href="keywordsearch.pl?keyword=$keywords&offset=$newoffset&num=$num">$i</a>
  EOF
      } # for
--- 82,88 ----
      for (my $i = 0; ($i * $num) < $count; $i++) {
  	my $newoffset = $i * $num;
+ 	my $shownumber = $i + 1;
  	print << "EOF";
! <a href="keywordsearch.pl?keyword=$keywords&offset=$newoffset&num=$num">$shownumber</a>
  EOF
      } # for

Index: savebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** savebiblio.pl	6 May 2002 02:47:49 -0000	1.3
--- savebiblio.pl	22 May 2002 18:35:25 -0000	1.4
***************
*** 24,27 ****
      &newsubtitle($biblionumber, $biblio->{'subtitle'});
  
!     print $input->redirect("addbiblioitem.pl?biblionumber=$biblionumber");
  } # else
--- 24,27 ----
      &newsubtitle($biblionumber, $biblio->{'subtitle'});
  
!     print $input->redirect("additem.pl?biblionumber=$biblionumber");
  } # else

Index: saveitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** saveitem.pl	6 May 2002 02:47:49 -0000	1.3
--- saveitem.pl	22 May 2002 18:35:25 -0000	1.4
***************
*** 5,35 ****
  use C4::Acquisitions;
  
! my $input         = new CGI;
! my $barcode       = $input->param('barcode');
! my $biblioitemnum = $input->param('biblioitemnum');
! my $item          = {
!     biblioitemnumber => $biblioitemnum,
      homebranch       => $input->param('homebranch'),
      replacementprice => $input->param('replacementprice')?$input->param('replacementprice'):"",
      itemnotes        => $input->param('notes')?$input->param('notes'):""
  }; # my $item
  my $count;
  my @results;
  
! if (! $barcode) {
!     print $input->redirect('additem.pl?error=nobarcode');
! } elsif (! $biblioitemnum) {
      print $input->redirect('addbooks.pl');
  } else {
! 
!     ($count, @results) = &getbiblioitem($biblioitemnum);
!     if (! $count) {
! 	print->redirect('addbooks.pl');
      } else {
  
! 	$item->{'biblionumber'} = $results[0]->{'biblionumber'};
  	&newitems($item, ($barcode));
  
! 	print $input->redirect("additem.pl?biblioitemnum=$biblioitemnum");
      } # else
  } # else
--- 5,75 ----
  use C4::Acquisitions;
  
! my $input            = new CGI;
! my $barcode          = $input->param('barcode');
! my $biblionumber     = $input->param('biblionumber');
! my $biblioitemnumber = $input->param('biblioitemnumber');
! my $item             = {
!     biblionumber     => $biblionumber,
!     biblioitemnumber => $biblioitemnumber?$biblioitemnumber:"",
      homebranch       => $input->param('homebranch'),
      replacementprice => $input->param('replacementprice')?$input->param('replacementprice'):"",
      itemnotes        => $input->param('notes')?$input->param('notes'):""
  }; # my $item
+ my $biblioitem       = {
+     biblionumber      => $biblionumber,
+     itemtype          => $input->param('itemtype'),
+     isbn              => $input->param('isbn')?$input->param('isbn'):"",
+     publishercode     => $input->param('publishercode')?$input->param('publishercode'):"",
+     publicationyear   => $input->param('publicationyear')?$input->param('publicationyear'):"",
+     place             => $input->param('place')?$input->param('place'):"",
+     illus             => $input->param('illus')?$input->param('illus'):"",
+     additionalauthors => $input->param('additionalauthors')?$input->param('additionalauthors'):"",
+     subjectheadings   => $input->param('subjectheadings')?$input->param('subjectheadings'):"",
+     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 biblioitem
+ my $newgroup = 0;
+ my $website  = 0;
  my $count;
  my @results;
  
! if ($input->param('newgroup')) {
!     $newgroup = 1;
!     if ($biblioitem->{'itemtype'} eq "WEB") {
! 	$website = 1;
!     } # if
! } # if
! 
! if (! $biblionumber) {
      print $input->redirect('addbooks.pl');
+ } elsif ((! $barcode) && (! $website)) {
+     print $input->redirect("additem.pl?biblionumber=$biblionumber&error=nobarcode");
+ } elsif ((! $newgroup) && (! $biblioitemnumber)) {
+     print $input->redirect("additem.pl?biblionumber=$biblionumber&error=nobiblioitem");
  } else {
!     
!     if ($website) {
! 	&newbiblioitem($biblioitem);
!     } elsif (&checkitems(1,$barcode)) {
! 	print $input->redirect("additem.pl?biblionumber=$biblionumber&error=barcodeinuse");
      } else {
  
! 	if ($newgroup) {
! 	    $biblioitemnumber = &newbiblioitem($biblioitem);
! 	    $item->{'biblioitemnumber'} = $biblioitemnumber;
! 	} # if
! 
  	&newitems($item, ($barcode));
  
! 	print $input->redirect("additem.pl?biblionumber=$biblionumber");
      } # else
  } # else

Index: websitesearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/websitesearch.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** websitesearch.pl	29 Apr 2002 05:29:02 -0000	1.1
--- websitesearch.pl	22 May 2002 18:35:25 -0000	1.2
***************
*** 61,66 ****
  
  	print << "EOF";
! <td><a href="addbiblioitem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'title'}</a></td>
! <td><a href="addbiblioitem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'author'}</a></td>
  <td>$results[$i]->{'copyrightdate'}</td>
  </tr>
--- 61,66 ----
  
  	print << "EOF";
! <td><a href="additem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'title'}</a></td>
! <td><a href="additem.pl?biblionumber=$results[$i]->{'biblionumber'}">$results[$i]->{'author'}</a></td>
  <td>$results[$i]->{'copyrightdate'}</td>
  </tr>

--- addbiblioitem.pl DELETED ---

--- savebiblioitem.pl DELETED ---





More information about the Koha-cvs mailing list