Bug 3360: Fix for unclosed <ol> element in export.tmpl

[koha.git] / catalogue / ISBDdetail.pl

diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 8993aa4..b2dea40 100755 (executable)
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -35,60 +35,25 @@ This script needs a biblionumber as parameter
 =cut
 
 use strict;
-require Exporter;
+
 use C4::Auth;
 use C4::Context;
 use C4::Output;
 use CGI;
 use C4::Koha;
 use C4::Biblio;
+use C4::Items;
 use C4::Branch;     # GetBranchDetail
 use C4::Serials;    # CountSubscriptionFromBiblionumber
-
+use C4::Search;                # enabled_staff_search_views
 
 #---- Internal function
 
-sub get_authorised_value_desc ($$$$$$$) {
-    my ( $itemtype, $tagslib, $tag, $subfield, $value, $framework, $dbh ) = @_;
-
-    #---- branch
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-        return GetBranchDetail($value)->{branchname};
-    }
-
-    #---- itemtypes
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-        my $itemtypedef = getitemtypeinfo($itemtype);
-        return $itemtypedef->{description};
-    }
-
-    #---- "true" authorized value
-    my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
-
-    if ( $category ne "" ) {
-        my $sth =
-          $dbh->prepare(
-"select lib from authorised_values where category = ? and authorised_value = ?"
-          );
-        $sth->execute( $category, $value );
-        my $data = $sth->fetchrow_hashref;
-        return $data->{'lib'};
-    }
-    else {
-        return $value;    # if nothing is found return the original value
-    }
-}
-# ------
-
 
 my $query = new CGI;
 my $dbh = C4::Context->dbh;
 
 my $biblionumber = $query->param('biblionumber');
-my $itemtype     = &GetFrameworkCode($biblionumber);
-my $tagslib      = &GetMarcStructure( $dbh, 1, $itemtype );
-
-my $record = GetMarcBiblio($biblionumber);
 
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -96,81 +61,18 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name => "catalogue/ISBDdetail.tmpl",
         query         => $query,
         type          => "intranet",
-        debug         => 1,
+       authnotrequired => 0,
+       flagsrequired   => { catalogue => 1 },
     }
 );
 
-my $ISBD = C4::Context->preference('ISBD');
-
 # my @blocs = split /\@/,$ISBD;
 # my @fields = $record->fields();
-my $res;
-
-# foreach my $bloc (@blocs) {
-#     $bloc =~ s/\n//g;
-my $bloc = $ISBD;
-my $blocres;
-foreach my $isbdfield ( split /#/, $bloc ) {
-
-    #         $isbdfield= /(.?.?.?)/;
-    $isbdfield =~ /(\d\d\d)\|(.*)\|(.*)\|(.*)/;
-    my $fieldvalue    = $1;
-    my $textbefore    = $2;
-    my $analysestring = $3;
-    my $textafter     = $4;
-
-    #         warn "==> $1 / $2 / $3 / $4";
-    #         my $fieldvalue=substr($isbdfield,0,3);
-    if ( $fieldvalue > 0 ) {
-
-   #         warn "ERROR IN ISBD DEFINITION at : $isbdfield" unless $fieldvalue;
-   #             warn "FV : $fieldvalue";
-        my $hasputtextbefore = 0;
-        foreach my $field ( $record->field($fieldvalue) ) {
-            my $calculated = $analysestring;
-            my $tag        = $field->tag();
-            if ( $tag < 10 ) {
-            }
-            else {
-                my @subf = $field->subfields;
-                for my $i ( 0 .. $#subf ) {
-                    my $subfieldcode  = $subf[$i][0];
-                    my $subfieldvalue =
-                      get_authorised_value_desc( $itemtype,$tagslib, $tag, $subf[$i][0],
-                        $subf[$i][1], '', $dbh );
-                    my $tagsubf = $tag . $subfieldcode;
-                    $calculated =~
-s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
-                }
-
-                # field builded, store the result
-                if ( $calculated && !$hasputtextbefore )
-                {    # put textbefore if not done
-                    $blocres .= $textbefore;
-                    $hasputtextbefore = 1;
-                }
-
-                # remove punctuation at start
-                $calculated =~ s/^( |;|:|\.|-)*//g;
-                $blocres .= $calculated;
-            }
-        }
-        $blocres .= $textafter if $hasputtextbefore;
-    }
-    else {
-        $blocres .= $isbdfield;
-    }
-}
-$res .= $blocres;
-
-# }
-$res =~ s/\{(.*?)\}//g;
-$res =~ s/\\n/\n/g;
-$res =~ s/\n/<br\/>/g;
-
-# remove empty ()
-$res =~ s/\(\)//g;
+my $res = GetISBDView($biblionumber);
 
+# count of item linked with biblio
+my $itemcount = GetItemsCount($biblionumber);
+$template->param( count => $itemcount);
 my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
  
 if ($subscriptionsnumber) {
@@ -185,6 +87,9 @@ if ($subscriptionsnumber) {
 $template->param (
     ISBD                => $res,
     biblionumber        => $biblionumber,
+       isbdview => 1,
+       z3950_search_params     => C4::Search::z3950_search_args(GetBiblioData($biblionumber)),
+       C4::Search::enabled_staff_search_views,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;