From 76bd5e3d022402d92bd0d96a8bf423d58eb32a72 Mon Sep 17 00:00:00 2001
From: Ben Shum <bshum@biblio.org>
Date: Thu, 10 Apr 2014 23:36:37 -0400
Subject: [PATCH] LP#1304462: Stop using combined pubinfo for search results

Remove one of the two places we define the pubinfo variable in misc_util.tt2
and then change the way search results pull in publisher data.

Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/opac/parts/misc_util.tt2    | 3 ---
 Open-ILS/src/templates/opac/parts/result/table.tt2 | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index 9fc373efdf..6788c75ced 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -201,9 +201,6 @@
         END;
         args.pubdate = (args.pubdates.size) ? args.pubdates.0 : '';
 
-        # Full publisher info
-        args.pubinfo = "$args.pubplace $args.publisher $args.pubdate";
-
         # Get RDA Copyright Info.
         args.copyrights = [];
         FOR sub IN xml.findnodes('//*[@tag="264" and @ind2="4"]/*[@code="c"]');
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index cd7365d8d5..ba4f52ec4f 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -168,12 +168,12 @@ END;
                                                         [% IF CGI.param('detail_record_view') %]
                                                         <!-- These fields are visible when viewing the results page in 'detailed' mode -->
 
-                                                        [% IF attrs.pubinfo %]
+                                                        [% IF attrs.publisher %]
                                                             <tr name="results_pub_tr">
                                                                 <td valign="top">
                                                                     <strong>[% l('Publisher:') %]</strong>
                                                                 </td>
-                                                                <td>[% attrs.pubinfo | html %]
+                                                                <td>[% attrs.pubplace | html; %] [% attrs.publisher | html; %] [% attrs.pubdate | html; %]
 [%-
 FOR entry IN attrs.graphic_pubinfos;
     FOR alt IN entry.graphic;
-- 
2.43.2