(bug #1578) Add the (quasi)full COinS(Zotero) support

[koha_fer] / opac / opac-detail.pl

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index f98f30e..b7818aa 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -63,8 +63,8 @@ my $record       = GetMarcBiblio($biblionumber);
 $template->param( biblionumber => $biblionumber );
 # XSLT processing of some stuff
 if (C4::Context->preference("XSLTDetailsDisplay") ) {
-    my $newxmlrecord = XSLTParse4Display($biblionumber, $record, C4::Context->config('opachtdocs')."/prog/en/xslt/MARC21slim2OPACDetail.xsl");
-    $template->param('XSLTBloc' => $newxmlrecord);
+    $template->param(
+        'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail') );
 }
 
 $template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") ); 
@@ -224,13 +224,8 @@ $template->param(
 );
 
 # COinS format FIXME: for books Only
-my $coins_format;
-my $fmt = substr $record->leader(), 6,2;
-my $fmts;
-$fmts->{'am'} = 'book';
-$coins_format = $fmts->{$fmt};
 $template->param(
-       ocoins_format => $coins_format,
+    ocoins => GetCOinSBiblio($biblionumber),
 );
 
 my $reviews = getreviews( $biblionumber, 1 );
@@ -333,9 +328,10 @@ if ( C4::Context->preference("SyndeticsEnabled") ) {
 
 if ( C4::Context->preference("SyndeticsEnabled")
         && C4::Context->preference("SyndeticsSummary")
-        && $syndetics_elements->{'SUMMARY'} =~ /SUMMARY/) {
+        && (    $syndetics_elements->{'SUMMARY'}   =~ /SUMMARY/
+             || $syndetics_elements->{'AVSUMMARY'} =~ /AVSUMMARY/ ) ) {
        eval {
-       my $syndetics_summary = &get_syndetics_summary($isbn,$upc,$oclc);
+       my $syndetics_summary = &get_syndetics_summary($isbn,$upc,$oclc, $syndetics_elements);
        $template->param( SYNDETICS_SUMMARY => $syndetics_summary );
        };
        warn $@ if $@;
@@ -419,7 +415,9 @@ if (C4::Context->preference("OPACShelfBrowser")) {
     ## List of Previous Items
     # order by cn_sort, which should include everything we need for ordering purposes (though not
     # for limits, those need to be handled separately
-    my $sth_shelfbrowse_previous = $dbh->prepare("
+    my $sth_shelfbrowse_previous;
+    if (defined $starting_location->{code}) {
+      $sth_shelfbrowse_previous = $dbh->prepare("
         SELECT *
         FROM items
         WHERE
@@ -427,7 +425,18 @@ if (C4::Context->preference("OPACShelfBrowser")) {
             homebranch = ? AND location = ?
         ORDER BY cn_sort DESC, itemnumber LIMIT 3
         ");
-    $sth_shelfbrowse_previous->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code});
+      $sth_shelfbrowse_previous->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code});
+    } else {
+      $sth_shelfbrowse_previous = $dbh->prepare("
+        SELECT *
+        FROM items
+        WHERE
+            ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?) AND
+            homebranch = ?
+        ORDER BY cn_sort DESC, itemnumber LIMIT 3
+        ");
+      $sth_shelfbrowse_previous->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code});
+    }
     my @previous_items;
     while (my $this_item = $sth_shelfbrowse_previous->fetchrow_hashref()) {
         my $sth_get_biblio = $dbh->prepare("SELECT biblio.*,biblioitems.isbn AS isbn FROM biblio LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber WHERE biblio.biblionumber=?");
@@ -443,7 +452,9 @@ if (C4::Context->preference("OPACShelfBrowser")) {
     }
     
     ## List of Next Items; this also intentionally catches the current item
-    my $sth_shelfbrowse_next = $dbh->prepare("
+    my $sth_shelfbrowse_next;
+    if (defined $starting_location->{code}) {
+      $sth_shelfbrowse_next = $dbh->prepare("
         SELECT *
         FROM items
         WHERE
@@ -451,7 +462,18 @@ if (C4::Context->preference("OPACShelfBrowser")) {
             homebranch = ? AND location = ?
         ORDER BY cn_sort, itemnumber LIMIT 3
         ");
-    $sth_shelfbrowse_next->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code});
+      $sth_shelfbrowse_next->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code});
+    } else {
+      $sth_shelfbrowse_next = $dbh->prepare("
+        SELECT *
+        FROM items
+        WHERE
+            ((cn_sort = ? AND itemnumber >= ?) OR cn_sort > ?) AND
+            homebranch = ?
+        ORDER BY cn_sort, itemnumber LIMIT 3
+        ");
+      $sth_shelfbrowse_next->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code});
+    }
     my @next_items;
     while (my $this_item = $sth_shelfbrowse_next->fetchrow_hashref()) {
         my $sth_get_biblio = $dbh->prepare("SELECT biblio.*,biblioitems.isbn AS isbn FROM biblio LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber WHERE biblio.biblionumber=?");