[Koha-cvs] CVS: koha/bull statecollection.pl,1.4,1.5

[Paul POULAIN]

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8739/bull

Modified Files:
	statecollection.pl 
Log Message:
synch'ing 2.2 and head

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** statecollection.pl	1 Mar 2005 13:40:50 -0000	1.4
--- statecollection.pl	20 Jun 2005 13:18:45 -0000	1.5
***************
*** 32,40 ****
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($x,$oldstatus) = $sth->fetchrow;
! 		serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
  	}
  }
--- 32,48 ----
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($oldstatus) = $sth->fetchrow;
! 		if ($serialids[$i]) {
! 			serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
! 		} else {
! 			# add a special issue
! 			if ($serialseqs[$i]) {
! 				my $subscription=getsubscription($subscriptionid);
! 				newissue($serialseqs[$i],$subscriptionid,$subscription->{biblionumber},$status[$i], format_date_in_iso($planneddates[$i]));
! 			}
! 		}
  	}
  }