X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=catalogue%2FISBDdetail.pl;h=f094160ebb1374d46e86e4448346f807927386a8;hb=64dea6ca5ff10a23f611f9d74557d5cc505316c4;hp=8650df6492d3a77cdf47faf13e950d179a8f01ee;hpb=286930bdc772bf6993dc0db75be15fbadaa26c77;p=koha_fer

diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 8650df6492..f094160ebb 100755
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 NAME
 
@@ -23,6 +23,7 @@ ISBDdetail.pl : script to show a biblio in ISBD format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -30,65 +31,30 @@ This script needs a biblionumber as parameter
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
+
 use C4::Auth;
 use C4::Context;
 use C4::Output;
 use CGI;
 use C4::Koha;
 use C4::Biblio;
+use C4::Items;
+use C4::Members; # to use GetMember
 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( 1, $itemtype );
-
-my $record = GetMarcBiblio($biblionumber);
 
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -96,81 +62,34 @@ 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;
-    }
+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;
 }
-$res .= $blocres;
-
-# }
-$res =~ s/\{(.*?)\}//g;
-$res =~ s/\\n/\n/g;
-$res =~ s/\n/<br\/>/g;
 
-# remove empty ()
-$res =~ s/\(\)//g;
+if($query->cookie("holdfor")){ 
+    my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
+    $template->param(
+        holdfor => $query->cookie("holdfor"),
+        holdfor_surname => $holdfor_patron->{'surname'},
+        holdfor_firstname => $holdfor_patron->{'firstname'},
+        holdfor_cardnumber => $holdfor_patron->{'cardnumber'},
+    );
+}
 
+# count of item linked with biblio
+my $itemcount = GetItemsCount($biblionumber);
+$template->param( count => $itemcount);
 my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
  
 if ($subscriptionsnumber) {
@@ -181,11 +100,20 @@ 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)),
+    ocoins => GetCOinSBiblio($record),
+    C4::Search::enabled_staff_search_views,
 );
 
+
+my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1);
+$template->param( holdcount => $holdcount, holds => $holds );
+
 output_html_with_http_headers $query, $cookie, $template->output;