[Koha-cvs] CVS: koha/opac opac-detail.pl,1.14,1.14.2.1 opac-serial-issues.pl,1.1,1.1.2.1

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
        opac-detail.pl opac-serial-issues.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter 
subscription detail in subscription notes (like "for branch XX" or "for 2nd 
floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in 
"waiting" state)



Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-detail.pl      18 Aug 2004 16:44:37 -0000      1.14
--- opac-detail.pl      11 Jan 2005 15:24:14 -0000      1.14.2.1
***************
*** 30,34 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'address@hidden;
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'address@hidden;
***************
*** 71,75 ****
                                WEB_RESULTS => $webarray,
                                SITE_RESULTS => $sitearray,
!                               subscriptionid => $subscriptionid,
  );
  
--- 71,75 ----
                                WEB_RESULTS => $webarray,
                                SITE_RESULTS => $sitearray,
!                               subscriptionsnumber => $subscriptionsnumber,
  );
  

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-serial-issues.pl       12 Aug 2004 14:50:29 -0000      1.1
--- opac-serial-issues.pl       11 Jan 2005 15:24:14 -0000      1.1.2.1
***************
*** 18,25 ****
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my ($subscriptionid);
! 
! $subscriptionid = $query->param('subscriptionid');
! my $subscription = &getsubscription($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 18,23 ----
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
  
  ($template, $loggedinuser, $cookie)
***************
*** 32,57 ****
  
  # replace CR by <br> in librarian note
! $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
!       startdate => format_date($subscription->{startdate}),
!       periodicity => $subscription->{periodicity},
!       dow => $subscription->{dow},
!       numberlength => $subscription->{numberlength},
!       weeklength => $subscription->{weeklength},
!       monthlength => $subscription->{monthlength},
!       opacnote => $subscription->{opacnote},
!       numberingmethod => $subscription->{numberingmethod},
!       arrivalplanified => $subscription->{arrivalplanified},
!       status => $subscription->{status},
!       biblionumber => $subscription->{biblionumber},
!       bibliotitle => $subscription->{bibliotitle},
!       notes => $subscription->{notes},
!       subscriptionid => $subscription->{subscriptionid}
        );
! $template->param(
!                       "periodicity$subscription->{periodicity}" => 1,
!                       "arrival$subscription->{dow}" => 1,
!                       );
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 30,56 ----
  
  # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
!       subscription_LOOP => $subscriptions
! #     startdate => format_date($subscription->{startdate}),
! #     periodicity => $subscription->{periodicity},
! #     dow => $subscription->{dow},
! #     numberlength => $subscription->{numberlength},
! #     weeklength => $subscription->{weeklength},
! #     monthlength => $subscription->{monthlength},
! #     opacnote => $subscription->{opacnote},
! #     numberingmethod => $subscription->{numberingmethod},
! #     arrivalplanified => $subscription->{arrivalplanified},
! #     status => $subscription->{status},
! #     biblionumber => $subscription->{biblionumber},
! #     bibliotitle => $subscription->{bibliotitle},
! #     notes => $subscription->{notes},
! #     subscriptionid => $subscription->{subscriptionid}
        );
! # $template->param(
! #                     "periodicity$subscription->{periodicity}" => 1,
! #                     "arrival$subscription->{dow}" => 1,
! #                     );
  
  output_html_with_http_headers $query, $cookie, $template->output;