[Koha-devel] CVS: koha/acqui addorder.pl,1.3,1.4 finishreceive.pl,1.2,1.3

[Gynn Lomax]

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv16527/acqui

Modified Files:
	addorder.pl finishreceive.pl 
Log Message:
Update to catalogue to allow change of biblio abstracts.
Related modifications to acqui system to match changes in Acquisition.pm
detail.pm changed to show abstract - still working on how to show url's


Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addorder.pl	15 Apr 2002 05:33:33 -0000	1.3
--- addorder.pl	9 May 2002 03:01:40 -0000	1.4
***************
*** 8,18 ****
  use C4::Output;
  use C4::Acquisitions;
- #use Date::Manip;
  
  my $input = new CGI;
- #print $input->header;
- #print startpage();
- #print startmenu('acquisitions');
- #print $input->dump;
  my $existing=$input->param('existing');
  my $title=$input->param('title');
--- 8,13 ----
***************
*** 40,44 ****
  my $ecost=$input->param('ecost');
  my $gst=$input->param('GST');
- #check to see if orderexists
  my $orderexists=$input->param('orderexists');
  
--- 35,38 ----
***************
*** 48,59 ****
    if ($existing eq 'no'){
      #if it doesnt create it
!     $bibnum = &newbiblio({ title     => $title,
! 	                   author    =>$author,
! 	                   copyright => $copyright });
      $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
!  	                           itemtype     => $itemtype,
! 	                           isben        => $isbn });
      newsubtitle($bibnum);
!     modbiblio($bibnum,$title,$author,$copyright,$series);
    } else {
      $bibnum=$input->param('biblio');
--- 42,57 ----
    if ($existing eq 'no'){
      #if it doesnt create it
!     $bibnum = &newbiblio({ title     => $title?$title:"",
! 	                   author    => $author?$author:"",
! 	                   copyright => $copyright?$copyright:"" });
      $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
!  	                           itemtype     => $itemtype?$itemtype:"",
! 	                           isben        => $isbn?$isbn:"" });
      newsubtitle($bibnum);
!     modbiblio({ biblionumber  => $bibnum,
! 	        title         => $title?$title:"",
! 	        author        => $author?$author:"",
! 	        copyrightdate => $copyright?$copyright:"",
! 	        series        => $series?$series:"" });
    } else {
      $bibnum=$input->param('biblio');
***************
*** 63,69 ****
        $bibitemnum=newbiblioitem($bibnum,$itemtype,$isbn);
      }
!     modbiblio($bibnum,$title,$author,$copyright,$series);
    }
!   if ($orderexists ne ''){
      modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
    }else {
--- 61,71 ----
        $bibitemnum=newbiblioitem($bibnum,$itemtype,$isbn);
      }
!     modbiblio({ biblionumber  => $bibnum,
! 	        title         => $title?$title:"",
! 	        author        => $author?$author:"",
! 	        copyrightdate => $copyright?$copyright:"",
! 	        series        => $series?$series:"" });
    }
!   if ($orderexists ne '') {
      modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
    }else {
***************
*** 71,76 ****
    }
  } else {
-   #print $input->header;
-   #print "del";
    $bibnum=$input->param('biblio');
    delorder($bibnum,$ordnum);
--- 73,76 ----
***************
*** 78,82 ****
  
  print $input->redirect("newbasket.pl?id=$supplier&basket=$basketno");
- #print $input->dump;
- #print endmenu('acquisitions');
- #print endpage();
--- 78,79 ----

Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** finishreceive.pl	29 Apr 2002 05:25:41 -0000	1.2
--- finishreceive.pl	9 May 2002 03:01:40 -0000	1.3
***************
*** 14,18 ****
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblio=$input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
--- 14,18 ----
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblionumber = $input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
***************
*** 21,25 ****
  my $cost=$input->param('cost');
  my $invoiceno=$input->param('invoice');
- my $id=$input->param('id');
  my $bibitemno=$input->param('biblioitemnum');
  my $data=bibitemdata($bibitemno);
--- 21,24 ----
***************
*** 38,47 ****
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $series=$input->param('Series');
! my $bookseller=$input->param('bookseller');
! $id=$bookseller;
! my $title=$input->param('title');
! my $author=$input->param('author');
! my $copyright=$input->param('copyright');
  
  if ($quantrec != 0){
--- 37,49 ----
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $bookseller = $input->param('bookseller');
! my $id         = $bookseller;
! my $biblio = {
!     biblionumber  => $biblionumber,
!     title         => $input->param('title')?$input->param('title'):"",
!     author        => $input->param('author')?$input->param('author'):"",
!     copyrightdate => $input->param('copyright')?$input->param('copyright'):"",
!     series        => $input->param('Series')?$input->param('Series'):""
! }; # my $biblio
  
  if ($quantrec != 0){
***************
*** 60,69 ****
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno=newbiblioitem($biblio,$itemtype,$isbn,$volinf,$class);
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio,$title,$author,$copyright,$series);
    modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size);
    #print $notes;
--- 62,71 ----
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno=newbiblioitem($biblionumber,$itemtype,$isbn,$volinf,$class);
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio);
    modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size);
    #print $notes;
***************
*** 81,85 ****
    }
    my ($error) = newitems({ biblioitemnumber => $bibitemno,
! 	                   biblionumber     => $biblio,
  	                   replacementprice => $replacement,
  	                   price            => $cost,
--- 83,87 ----
    }
    my ($error) = newitems({ biblioitemnumber => $bibitemno,
! 	                   biblionumber     => $biblionumber,
  	                   replacementprice => $replacement,
  	                   price            => $cost,
***************
*** 100,104 ****
  } else {
    print $input->header;
!   delorder($biblio,$ordnum);
         print $input->redirect("/acquisitions/");
  }
--- 102,106 ----
  } else {
    print $input->header;
!   delorder($biblionumber,$ordnum);
         print $input->redirect("/acquisitions/");
  }