From 95345c2f219d78289eaae48c7d9f5c6fc4b66fe8 Mon Sep 17 00:00:00 2001
From: Dan Scott <dan@coffeecode.net>
Date: Sun, 1 May 2011 22:06:50 -0400
Subject: [PATCH] Pull call number from XML holdings, not MARC record

KCLS uses call numbers in the MARC record, but most other sites
use the call numbers from asset.call_number. For now, just display
the first returned call number; eventually the display will probably
need to be adjusted to handle call number / shelving location / library
/ status like the current AjaxPAC does.

Also note that ##URI## call numbers should be filtered out but are
not yet.

Signed-off-by: Dan Scott <dan@coffeecode.net>
---
 Open-ILS/web/templates/default/opac/parts/misc_util.tt2    | 8 ++++----
 Open-ILS/web/templates/default/opac/parts/result/table.tt2 | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2 b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
index 3e6b175f1d..0e7cd2c492 100644
--- a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
@@ -26,11 +26,11 @@
         # clean up the ISBN
         args.isbn_clean = args.isbn.replace('\ .*', '');
 
-        args.holdsing = [];
+        args.holdings = [];
         FOR holding IN xml.findnodes('//*[local-name()="volumes"]/*[local-name()="volume"]');
-            args.holdings.push({
-                # TODO
-            });
+            args.holdings.push(
+                holding.getAttribute('label')
+            );
         END;
 
         # Extract the copy count summary
diff --git a/Open-ILS/web/templates/default/opac/parts/result/table.tt2 b/Open-ILS/web/templates/default/opac/parts/result/table.tt2
index 5445489d26..3fd549732e 100644
--- a/Open-ILS/web/templates/default/opac/parts/result/table.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/result/table.tt2
@@ -107,6 +107,7 @@
                                                             <td colspan='2'>
                                                                 <strong>[% l('Call number:') %]</strong>[% args.marc_cn %][%# XXX KCLS %]
                                                             </td>
+                                                            <td>[% args.holdings.0 %]</td>
                                                         </tr>
                                                         <tr name="results_pub_tr" class="[% attrs.publisher ? '' : 'hide_me' %]">
                                                             <td valign="top">
@@ -161,8 +162,14 @@
                                                 <img title="[% attrs.format_label %]" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />
                                                 [% END %]
 
+<<<<<<< HEAD
                                                 <!-- unAPI link -->
                                                 <abbr class="unapi-id" title='tag:[% ctx.hostname %],[% date.format(date.now, '%Y') %]:biblio-record_entry/[% rec.id %]'></abbr>
+=======
+                                                <span class="hide_me">
+                                                    <abbr class="unapi-id">&nbsp;</abbr>
+                                                </span>
+>>>>>>> 1184851... Pull call number from XML holdings, not MARC record
 
                                                 <!-- Empty span used for creating Google Book Search-->
                                                 <span name="googleBooksLink" class="hide_me">
-- 
2.11.0