From c50ee4c032c2c921a272531cb1a9e4ca9ecdcd08 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 30 Dec 2015 13:36:21 -0500
Subject: [PATCH] JBAS-952 Added content by record ID

Use the new (2.7) style added content by record ID lookup.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 KCLS/openils/var/templates_kcls/opac/parts/record/cnbrowse.tt2 | 7 ++-----
 KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2  | 6 ++----
 KCLS/openils/var/templates_kcls/opac/parts/result/table.tt2    | 6 +++---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/record/cnbrowse.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/record/cnbrowse.tt2
index 1b8364213d..80eade5467 100644
--- a/KCLS/openils/var/templates_kcls/opac/parts/record/cnbrowse.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/record/cnbrowse.tt2
@@ -30,13 +30,10 @@
                 [% END -%]
                     <td class='cn_browse_item' width='25%' valign='top'>
                         [%  rec_attrs = {marc_xml => cn.record.marc};
-                            PROCESS get_marc_attrs args=rec_attrs;
-                            ident = rec_attrs.isbn_clean || rec_attrs.upc;
-                            IF ident %]
+                            PROCESS get_marc_attrs args=rec_attrs; %]
                         <a href="[% mkurl(ctx.opac_root _ '/record/' _ cn.record.id, {}, 1) %]"><img height='60' width='50' 
                             class='cn_browse_info' name='cn_browse_pic' border='0'
-                            src="[% ctx.media_prefix %]/opac/extras/ac/jacket/small/[% ident | uri %]" /></a>
-                        [% END %]
+                            src="[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% cn.record.id | uri %]" /></a>
                         <div class='cn_browse_info bold' name='cn_browse_cn'>[% cn.label | html %]</div>
                         <div class='cn_browse_info'>
                             <a name='cn_browse_title' class='classic_link' 
diff --git a/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2
index 33d76ed211..ad76cd3649 100644
--- a/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2
@@ -7,11 +7,9 @@
     <tbody id="rdetail_details_tbody">
         <tr>
             <td width="90" valign="top" id="rdetail_image_cell">
-                [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
-                <a id='rdetail_img_link' href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/[% ident | uri %]'><img
+                <a id='rdetail_img_link' href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/r/[% ctx.bre_id | uri %]'><img
                     alt="[% l('Image of item') %]" id='rdetail_image'
-                    src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/[% ident | uri %]' /></a>
-                [% END %]
+                    src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% ctx.bre_id | uri %]' /></a>
                 <br />
             </td>
     
diff --git a/KCLS/openils/var/templates_kcls/opac/parts/result/table.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/result/table.tt2
index 09e1c12cef..b66553125b 100644
--- a/KCLS/openils/var/templates_kcls/opac/parts/result/table.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/result/table.tt2
@@ -70,11 +70,9 @@
                                                 %].</td>
                                             <td class='result_table_pic_header' align='center'
                                                 width="78" nowrap="nowrap" valign="top">
-                                                [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
                                                 <a href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"><img alt="[% l('Image of item') %]"
                                                         name='item_jacket' class='result_table_pic' width="55"
-                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/[% ident | uri %]' /></a><br />
-                                                [% END %]
+                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% rec.id | uri %]' /></a><br />
                                             </td>
                                             <td class='result_table_title_cell' name='result_table_title_cell' valign="top">
                                                 <div class="bold">
@@ -241,6 +239,7 @@
                                                             </form>
                                                         </div>
                                                         [% IF ENV.OILS_CONTENT_CAFE_USER %]
+                                                            [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
                                                         <div class="results_aux_utils opac-auto-011">
                                                             <a title="[% l('Reviews and More') %]" target='_blank' 
                                                                 href="[% ctx.proto %]://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=[%- 
@@ -250,6 +249,7 @@
                                                                 <span style='position:relative;top:-5px;'>[% l('Reviews &amp; More') %]</span>
                                                             </a>
                                                         </div>
+                                                            [% END %]
                                                         [% END %]
                                                     </div>
                                                 </div>
-- 
2.11.0