[Koha-cvs] koha/C4 Bull.pm [rel_2_2]

[Ryan Higgins]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Ryan Higgins <rych>	07/04/26 00:16:42

Modified files:
	C4             : Bull.pm 

Log message:
	alter old_serialchangestatus to take pub date, and remove code that rewrites serialseq in old_modsubscription

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bull.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.43&r2=1.6.2.44

Patches:
Index: Bull.pm
===================================================================
RCS file: /sources/koha/koha/C4/Attic/Bull.pm,v
retrieving revision 1.6.2.43
retrieving revision 1.6.2.44
diff -u -b -r1.6.2.43 -r1.6.2.44
--- Bull.pm	23 Apr 2007 01:50:07 -0000	1.6.2.43
+++ Bull.pm	26 Apr 2007 00:16:41 -0000	1.6.2.44
@@ -1293,16 +1293,18 @@
 	    );
     $sth->finish;
 
-    $sth =
-        $dbh->prepare("select * from subscription where subscriptionid = ? ");
-    $sth->execute($subscriptionid);
-    my $val = $sth->fetchrow_hashref;
+  #  $sth =
+  #      $dbh->prepare("select * from subscription where subscriptionid = ? ");
+  #  $sth->execute($subscriptionid);
+  #  my $val = $sth->fetchrow_hashref;
+	
+	# Not sure what the idea is here - but probably don't want to do this... (rewrite all the serialseq's for this subscr.)
 
     # calculate issue number
-    my $serialseq = Get_Seq($val);
-    $sth =
-        $dbh->prepare("UPDATE serial SET serialseq = ? WHERE subscriptionid = ?");
-    $sth->execute( $serialseq, $subscriptionid );
+    #my $serialseq = Get_Seq($val);
+    #$sth =
+    #    $dbh->prepare("UPDATE serial SET serialseq = ? WHERE subscriptionid = ?");
+    #$sth->execute( $serialseq, $subscriptionid );
 
     my $enddate = subscriptionexpirationdate($subscriptionid);
     $sth = $dbh->prepare("update subscriptionhistory set enddate=?");
@@ -1506,7 +1508,7 @@
     }
 
 sub old_serialchangestatus {
-            my ($serialid,$serialseq,$planneddate,$status,$notes)=@_;
+            my ($serialid,$serialseq,$publisheddate,$planneddate,$status,$notes)=@_;
     #       warn "($serialid,$serialseq,$planneddate,$status)";
             # 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
             my $dbh = C4::Context->dbh;
@@ -1517,8 +1519,8 @@
             if ($status eq 6){
 		                delissue($serialseq, $subscriptionid)
 		          }else{
-			                      $sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=?,notes=? where serialid = ?");
-			                      $sth->execute($serialseq,$planneddate,$status,$notes,$serialid);
+			                      $sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,publisheddate=?,status=?,notes=? where serialid = ?");
+			                      $sth->execute($serialseq,$planneddate,$publisheddate,$status,$notes,$serialid);
 			                      $sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
 			                      $sth->execute($subscriptionid);
 			                      my ($missinglist,$recievedlist) = $sth->fetchrow;