[Koha-cvs] CVS: koha/acqui addorder.pl,1.11,1.12

[Paul POULAIN]

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1:/tmp/cvs-serv9219/acqui

Modified Files:
	addorder.pl 
Log Message:
reordering code

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** addorder.pl	20 Sep 2002 13:05:36 -0000	1.11
--- addorder.pl	28 Jan 2003 15:02:39 -0000	1.12
***************
*** 30,37 ****
  
  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');
--- 30,33 ----
***************
*** 61,115 ****
  my $orderexists=$input->param('orderexists');
  
- print STDERR "quantity = $quantity // existing = $existing\n";
- #check to see if biblio exists
  if ($quantity ne '0'){
!   if ($existing eq 'no'){
!     #if it doesnt create it
!     $bibnum = &newbiblio({ title     => $title?$title:"",
! 	                   author    => $author?$author:"",
! 	                   copyright => $copyright?$copyright:"",
! 				    series => $series?$series:"",
! 				     });
!     $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
!  	                           itemtype     => $itemtype?$itemtype:"",
! 	                           isbn        => $isbn?$isbn:""
! 						   });
! 	if ($title) {
!     		newsubtitle($bibnum,$title);
  	}
- #unuseful (already added 4 line before
- #     modbiblio({ biblionumber  => $bibnum,
- #	        title         => $title?$title:"",
- #	        author        => $author?$author:"",
- #	        copyrightdate => $copyright?$copyright:"",
- #	        series        => $series?$series:"" });
-   } else {
- print STDERR "inside loop\n";
-     $bibnum=$input->param('biblio');
-     $bibitemnum=$input->param('bibitemnum');
-     my $oldtype=$input->param('oldtype');
- print STDERR  "bibitemnum : $bibitemnum itemtype:$itemtype oldtype:$oldtype\n";
-     if ($bibitemnum eq '' || $itemtype ne $oldtype){
-       $bibitemnum= &newbiblioitem({ biblionumber => $bibnum,
- 	 						 itemtype => $itemtype?$itemtype:"",
- 							 isbn => $isbn?$isbn:"" });
-       print STDERR "newbiblioitem\n";
-     }
- print STDERR "modbiblio\n";
-     &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 {
-     neworder($bibnum,$title,$ordnum,$basketno,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
-   }
  } else {
!   $bibnum=$input->param('biblio');
!   delorder($bibnum,$ordnum);
  }
  
--- 57,100 ----
  my $orderexists=$input->param('orderexists');
  
  if ($quantity ne '0'){
! 	#check to see if biblio exists
! 	if ($existing eq 'no'){
! 		#if it doesnt create it
! 		$bibnum = &newbiblio({ title     => $title?$title:"",
! 						author    => $author?$author:"",
! 						copyright => $copyright?$copyright:"",
! 						series => $series?$series:"",
! 							});
! 		$bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
! 								itemtype     => $itemtype?$itemtype:"",
! 								isbn        => $isbn?$isbn:""
! 								});
! 			if ($title) {
! 				newsubtitle($bibnum,$title);
! 			}
! 	} else {
! 		$bibnum=$input->param('biblio');
! 		$bibitemnum=$input->param('bibitemnum');
! 		my $oldtype=$input->param('oldtype');
! 		if ($bibitemnum eq '' || $itemtype ne $oldtype){
! 			$bibitemnum= &newbiblioitem({ biblionumber => $bibnum,
! 									itemtype => $itemtype?$itemtype:"",
! 									isbn => $isbn?$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 {
! 		neworder($bibnum,$title,$ordnum,$basketno,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
  	}
  } else {
! 	$bibnum=$input->param('biblio');
! 	delorder($bibnum,$ordnum);
  }