[Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.11,1.6.2.12

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
* changing order on detailled subscription history : ordering by subscriptionid before date (to see all issues for a given subscription at once)
* when building lists, don't put title twice on multiple subscriptions to a title (replace it by "")

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.11
retrieving revision 1.6.2.12
diff -C2 -r1.6.2.11 -r1.6.2.12
*** Bull.pm	28 Jun 2005 07:35:49 -0000	1.6.2.11
--- Bull.pm	2 Aug 2005 15:03:33 -0000	1.6.2.12
***************
*** 204,208 ****
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by year,serial.planneddate');
  	$sth->execute($biblionumber);
  	my @res;
--- 204,208 ----
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by year,serial.subscriptionid,serial.planneddate');
  	$sth->execute($biblionumber);
  	my @res;
***************
*** 213,216 ****
--- 213,217 ----
  	my @loopissues;
  	my $first;
+ 	my $previousnote="";
  	while (my $subs = $sth->fetchrow_hashref) {
  # 		my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
***************
*** 230,233 ****
--- 231,235 ----
  				'status3' => $subs->{'status'}==3,
  				'status4' => $subs->{'status'}==4,
+ 				'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
  				};
  		}else {
***************
*** 245,248 ****
--- 247,251 ----
  				'status3' => $subs->{'status'}==3,
  				'status4' => $subs->{'status'}==4,
+ 				'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
  				};
  			
***************
*** 256,259 ****
--- 259,263 ----
  			};
  		}
+ 		$previousnote=$subs->{notes};
  	}
  	return \@res;
***************
*** 302,311 ****
  	my $sth;
  	if ($biblionumber) {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
  		$sth->execute($biblionumber);
  	} else {
  		if ($ISSN and $title)
  		{
! 			$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
  			$sth->execute("%$title%",$ISSN);
  		}
--- 306,315 ----
  	my $sth;
  	if ($biblionumber) {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
  		$sth->execute($biblionumber);
  	} else {
  		if ($ISSN and $title)
  		{
! 			$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
  			$sth->execute("%$title%",$ISSN);
  		}
***************
*** 314,323 ****
  			if ($ISSN)
  			{
! 				$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ?");
  				$sth->execute($ISSN);
  			}
  			else
  			{
! 				$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and
   biblio.biblionumber=subscription.biblionumber and biblio.title like ? ");
  				$sth->execute("%$title%");
--- 318,327 ----
  			if ($ISSN)
  			{
! 				$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ?");
  				$sth->execute($ISSN);
  			}
  			else
  			{
! 				$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and
   biblio.biblionumber=subscription.biblionumber and biblio.title like ? ");
  				$sth->execute("%$title%");
***************
*** 325,330 ****
  		}
  	}
! 		my @results;
  	while (my $line = $sth->fetchrow_hashref) {
  		push @results, $line;
  	}
--- 329,341 ----
  		}
  	}
! 	my @results;
! 	my $previoustitle="";
  	while (my $line = $sth->fetchrow_hashref) {
+ 		if ($previoustitle eq $line->{title}) {
+ 			$line->{title}="";
+ 			$line->{issn}="";
+ 		} else {
+ 			$previoustitle=$line->{title};
+ 		}
  		push @results, $line;
  	}