X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=catalogue%2FlabeledMARCdetail.pl;h=86525162f465a877323f86ac6106d2114a0af923;hb=998289850f373a6b83d1ee4387161575fd6d3def;hp=a8f33a674f1e20d261c37899dd0410b053e7ba2c;hpb=9d6d641d1f8b77271800f43bc027b651f9aea52b;p=koha-ffzg.git

diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl
index a8f33a674f..86525162f4 100755
--- a/catalogue/labeledMARCdetail.pl
+++ b/catalogue/labeledMARCdetail.pl
@@ -26,7 +26,6 @@ use C4::Output qw( output_html_with_http_headers );
 use C4::Biblio qw(
     GetBiblioData
     GetFrameworkCode
-    GetMarcBiblio
     GetMarcStructure
 );
 use C4::Search qw( z3950_search_args enabled_staff_search_views );
@@ -56,7 +55,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $record = GetMarcBiblio({ biblionumber => $biblionumber });
+my $biblio_object = Koha::Biblios->find( $biblionumber ); # FIXME Should replace $biblio
+my $record = $biblio_object->metadata->record;
 if ( not defined $record ) {
     # biblionumber invalid -> report and exit
     $template->param( unknownbiblionumber => 1,
@@ -66,17 +66,14 @@ if ( not defined $record ) {
     exit;
 }
 
-my $biblio_object = Koha::Biblios->find( $biblionumber ); # FIXME Should replace $biblio
 my $tagslib = GetMarcStructure(1,$frameworkcode);
 my $biblio = GetBiblioData($biblionumber);
 
 if($query->cookie("holdfor")){ 
     my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
     $template->param(
-        holdfor => $query->cookie("holdfor"),
-        holdfor_surname => $holdfor_patron->surname,
-        holdfor_firstname => $holdfor_patron->firstname,
-        holdfor_cardnumber => $holdfor_patron->cardnumber,
+        holdfor        => $query->cookie("holdfor"),
+        holdfor_patron => $holdfor_patron,
     );
 }
 
@@ -138,14 +135,14 @@ my $some_private_shelves = Koha::Virtualshelves->get_some_shelves(
     {
         borrowernumber => $loggedinuser,
         add_allowed    => 1,
-        category       => 1,
+        public         => 0,
     }
 );
 my $some_public_shelves = Koha::Virtualshelves->get_some_shelves(
     {
         borrowernumber => $loggedinuser,
         add_allowed    => 1,
-        category       => 2,
+        public         => 1,
     }
 );