From 2b5699f89b2b4d87be9bed29ea49efa2ef87a004 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 28 Jan 2003 15:02:39 +0000
Subject: [PATCH] reordering code

---
 acqui/addorder.pl | 89 ++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 52 deletions(-)

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 55d709ea22..a2f7dabd35 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -29,10 +29,6 @@ use C4::Biblio;
 #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');
 $title=~ s/\'/\\\'/g;
@@ -60,57 +56,46 @@ my $ecost=$input->param('ecost');
 my $gst=$input->param('GST');
 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);
+	#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);
 	}
-#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);
+	$bibnum=$input->param('biblio');
+	delorder($bibnum,$ordnum);
 }
 
 print $input->redirect("newbasket.pl?id=$supplier&basket=$basketno");
-- 
2.39.5