Bug 10403: (follow-up) fix test to use vendor created earlier during test

[koha.git] / catalogue / ISBDdetail.pl

diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index c59945f..28b5c2d 100755 (executable)
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -67,7 +67,17 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-if($query->cookie("holdfor")){
+my $res = GetISBDView($biblionumber, "intranet");
+if ( not defined $res ) {
+       # biblionumber invalid -> report and exit
+       $template->param( unknownbiblionumber => 1,
+                               biblionumber => $biblionumber
+       );
+       output_html_with_http_headers $query, $cookie, $template->output;
+       exit;
+}
+
+if($query->cookie("holdfor")){ 
     my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
     $template->param(
         holdfor => $query->cookie("holdfor"),
@@ -77,10 +87,6 @@ if($query->cookie("holdfor")){
     );
 }
 
-# my @blocs = split /\@/,$ISBD;
-# my @fields = $record->fields();
-my $res = GetISBDView($biblionumber, "intranet");
-
 # count of item linked with biblio
 my $itemcount = GetItemsCount($biblionumber);
 $template->param( count => $itemcount);
@@ -94,14 +100,21 @@ if ($subscriptionsnumber) {
         subscriptiontitle   => $subscriptiontitle,
     );
 }
+my $record = GetMarcBiblio($biblionumber);
 
 $template->param (
     ISBD                => $res,
     biblionumber        => $biblionumber,
-       isbdview => 1,
-       z3950_search_params     => C4::Search::z3950_search_args(GetBiblioData($biblionumber)),
-       C4::Search::enabled_staff_search_views,
+    isbdview            => 1,
+    z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)),
+    ocoins => GetCOinSBiblio($record),
+    C4::Search::enabled_staff_search_views,
+    searchid            => $query->param('searchid'),
 );
 
+
+my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1);
+$template->param( holdcount => $holdcount, holds => $holds );
+
 output_html_with_http_headers $query, $cookie, $template->output;