X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=catalogue%2Fdetail.pl;h=3c95ba2739367f96a35531af36d11d5660869c0e;hb=7650a34754d5265a749c070228ad04b397d3cf3a;hp=3d42326fc3ad17de88fff6f7997395692c537dae;hpb=251e2c4d748db6808a1e47ba986e374b14f29918;p=koha.git

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 3d42326fc3..3c95ba2739 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -41,9 +41,12 @@ use C4::XSLT;
 # use Smart::Comments;
 
 my $query = CGI->new();
+
+my $analyze = $query->param('analyze');
+
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "catalogue/detail.tmpl",
+    template_name   =>  'catalogue/detail.tmpl',
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -51,6 +54,17 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
+my $biblionumber = $query->param('biblionumber');
+my $record       = GetMarcBiblio($biblionumber);
+
+if ( not defined $record ) {
+    # 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(
@@ -61,12 +75,9 @@ if($query->cookie("holdfor")){
     );
 }
 
-my $biblionumber = $query->param('biblionumber');
-my $fw = GetFrameworkCode($biblionumber);
-
-## get notes and subjects from MARC record
-my $marcflavour      = C4::Context->preference("marcflavour");
-my $record           = GetMarcBiblio($biblionumber);
+my $fw           = GetFrameworkCode($biblionumber);
+my $showallitems = $query->param('showallitems');
+my $marcflavour  = C4::Context->preference("marcflavour");
 
 # XSLT processing of some stuff
 if (C4::Context->preference("XSLTDetailsDisplay") ) {
@@ -75,6 +86,7 @@ if (C4::Context->preference("XSLTDetailsDisplay") ) {
 }
 
 $template->param( 'SpineLabelShowPrintOnBibDetails' => C4::Context->preference("SpineLabelShowPrintOnBibDetails") );
+$template->param( ocoins => GetCOinSBiblio($record) );
 
 # some useful variables for enhanced content;
 # in each case, we're grabbing the first value we find in
@@ -91,17 +103,13 @@ $template->param(
     normalized_isbn => $isbn,
 );
 
-unless (defined($record)) {
-    print $query->redirect("/cgi-bin/koha/errors/404.pl");
-	exit;
-}
-
 my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
 my $marcisbnsarray   = GetMarcISBN( $record, $marcflavour );
 my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
 my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
 my $marcseriesarray  = GetMarcSeries($record,$marcflavour);
 my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
+my $marchostsarray  = GetMarcHosts($record,$marcflavour);
 my $subtitle         = GetRecordValue('subtitle', $record, $fw);
 
 # Get Branches, Itemtypes and Locations
@@ -109,8 +117,21 @@ my $branches = GetBranches();
 my $itemtypes = GetItemTypes();
 my $dbh = C4::Context->dbh;
 
-# change back when ive fixed request.pl
-my @items = &GetItemsInfo( $biblionumber, 'intra' );
+my @all_items = GetItemsInfo( $biblionumber );
+my @items;
+for my $itm (@all_items) {
+    push @items, $itm unless ( $itm->{itemlost} && GetHideLostItemsPreference($borrowernumber) && !$showallitems);
+}
+
+# flag indicating existence of at least one item linked via a host record
+my $hostrecords;
+# adding items linked via host biblios
+my @hostitems = GetHostItemsInfo($record);
+if (@hostitems){
+	$hostrecords =1;
+	push (@items,@hostitems);
+}
+
 my $dat = &GetBiblioData($biblionumber);
 
 # get count of holds
@@ -141,13 +162,20 @@ foreach my $subscription (@subscriptions) {
 if ( defined $dat->{'itemtype'} ) {
     $dat->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $dat->{itemtype} }{imageurl} );
 }
-$dat->{'count'} = scalar @items;
+
+$dat->{'count'} = scalar @all_items + @hostitems;
+$dat->{'showncount'} = scalar @items + @hostitems;
+$dat->{'hiddencount'} = scalar @all_items + @hostitems - scalar @items;
+
 my $shelflocations = GetKohaAuthorisedValues('items.location', $fw);
 my $collections    = GetKohaAuthorisedValues('items.ccode'   , $fw);
 my (@itemloop, %itemfields);
 my $norequests = 1;
 my $authvalcode_items_itemlost = GetAuthValCode('items.itemlost',$fw);
 my $authvalcode_items_damaged  = GetAuthValCode('items.damaged', $fw);
+
+my $analytics_flag;
+my $materials_flag; # set this if the items have anything in the materials field
 foreach my $item (@items) {
 
     $item->{homebranch}        = GetBranchName($item->{homebranch});
@@ -213,6 +241,21 @@ foreach my $item (@items) {
         $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
     }
 
+    # item has a host number if its biblio number does not match the current bib
+    if ($item->{biblionumber} ne $biblionumber){
+        $item->{hostbiblionumber} = $item->{biblionumber};
+	$item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title};
+    }
+	
+	#count if item is used in analytical bibliorecords
+	my $countanalytics= GetAnalyticsCount($item->{itemnumber});
+	if ($countanalytics > 0){
+		$analytics_flag=1;
+		$item->{countanalytics} = $countanalytics;
+	}
+    if ($item->{'materials'} ne ''){
+	$materials_flag = 1;
+    }
     push @itemloop, $item;
 }
 
@@ -224,6 +267,7 @@ $template->param(
 	MARCSERIES  => $marcseriesarray,
 	MARCURLS => $marcurlsarray,
     MARCISBNS => $marcisbnsarray,
+	MARCHOSTS => $marchostsarray,
 	subtitle    => $subtitle,
 	itemdata_ccode      => $itemfields{ccode},
 	itemdata_enumchron  => $itemfields{enumchron},
@@ -233,9 +277,39 @@ $template->param(
     itemdata_itemnotes  => $itemfields{itemnotes},
 	z3950_search_params	=> C4::Search::z3950_search_args($dat),
     holdcount           => $holdcount,
+        hostrecords         => $hostrecords,
+	analytics_flag	=> $analytics_flag,
 	C4::Search::enabled_staff_search_views,
+        materials       => $materials_flag,
 );
 
+if (C4::Context->preference("AlternateHoldingsField") && scalar @items == 0) {
+    my $fieldspec = C4::Context->preference("AlternateHoldingsField");
+    my $subfields = substr $fieldspec, 3;
+    my $holdingsep = C4::Context->preference("AlternateHoldingsSeparator") || ' ';
+    my @alternateholdingsinfo = ();
+    my @holdingsfields = $record->field(substr $fieldspec, 0, 3);
+
+    for my $field (@holdingsfields) {
+        my %holding = ( holding => '' );
+        my $havesubfield = 0;
+        for my $subfield ($field->subfields()) {
+            if ((index $subfields, $$subfield[0]) >= 0) {
+                $holding{'holding'} .= $holdingsep if (length $holding{'holding'} > 0);
+                $holding{'holding'} .= $$subfield[1];
+                $havesubfield++;
+            }
+        }
+        if ($havesubfield) {
+            push(@alternateholdingsinfo, \%holding);
+        }
+    }
+
+    $template->param(
+        ALTERNATEHOLDINGS   => \@alternateholdingsinfo,
+        );
+}
+
 my @results = ( $dat, );
 foreach ( keys %{$dat} ) {
     $template->param( "$_" => defined $dat->{$_} ? $dat->{$_} : '' );
@@ -247,7 +321,7 @@ foreach ( keys %{$dat} ) {
 $template->param(
     itemloop        => \@itemloop,
     biblionumber        => $biblionumber,
-    detailview => 1,
+    ($analyze? 'analyze':'detailview') =>1,
     subscriptions       => \@subs,
     subscriptionsnumber => $subscriptionsnumber,
     subscriptiontitle   => $dat->{title},