defaulting usernumber to '' (root login)

[koha-ffzg.git] / opac / opac-ISBDdetail.pl

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index de47723..580df9c 100755 (executable)
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -56,6 +56,7 @@ use C4::Search;
 use MARC::Record;
 use C4::Biblio;
 use C4::Acquisition;
+use C4::Bull; #uses getsubscriptionfrom biblionumber
 use HTML::Template;
 
 my $query=new CGI;
@@ -64,12 +65,28 @@ my $dbh=C4::Context->dbh;
 
 my $biblionumber=$query->param('bib');
 my $bibid = $query->param('bibid');
-$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
-$biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
-my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
+#$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
+#$biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
+#my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
+my $itemtype="";
 my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
 
-my $record =MARCgetbiblio($dbh,$bibid);
+my $record =get_record($biblionumber);
+
+#coping with subscriptions
+my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+my $dat = MARCmarc2koha($dbh,$record);
+my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+my @subs;
+foreach my $subscription (@subscriptions){
+       my %cell;
+       $cell{subscriptionid}= $subscription->{subscriptionid};
+       $cell{subscriptionnotes}= $subscription->{notes};
+       #get the three latest serials.
+       $cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+       push @subs, \%cell;
+}
+
 # open template
 my ($template, $loggedinuser, $cookie)
                = get_template_and_user({template_name => "opac-ISBDdetail.tmpl",
@@ -81,6 +98,8 @@ my ($template, $loggedinuser, $cookie)
 $template->param(LibraryName => C4::Context->preference("LibraryName"),
                                suggestion => C4::Context->preference("suggestion"),
                                virtualshelves => C4::Context->preference("virtualshelves"),
+                               subscriptions => \@subs,
+                               subscriptionsnumber => $subscriptionsnumber,
 );
 
 my $ISBD = C4::Context->preference('ISBD');
@@ -114,7 +133,7 @@ my $res;
                                                my $subfieldcode = $subf[$i][0];
                                                my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
                                                my $tagsubf = $tag.$subfieldcode;
-                                               $calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
+                                               $calculated =~ s/\{(.?.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
                                        }
                                        # field builded, store the result
                                        if ($calculated && !$hasputtextbefore) { # put textbefore if not done
@@ -148,7 +167,7 @@ sub get_authorised_value_desc ($$$$$) {
 
    #---- branch
     if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-       return getbranchname($value);
+       return getbranchdetail($value)->{branchname};
     }
 
    #---- itemtypes