From 8910de2d3f5a888a7e2a5438f509df5d2c1aeed8 Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Sun, 6 Apr 2014 22:43:08 -0400
Subject: [PATCH] LP#1303544 Trim junk from the ISBN in record summary

When asserting that we are publishing an ISBN, move the "(pbk.)"
and similar such matter outside of the schema.org <span property="isbn">
element.

See "The walking dead" in the sample dataset for an example.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/opac/parts/misc_util.tt2      |  6 +++---
 Open-ILS/src/templates/opac/parts/record/summary.tt2 | 11 +++++++++--
 2 files changed, 12 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 41ac634edc..875e139b6b 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -119,18 +119,18 @@
 
         args.isbns = [];
         FOR isbn IN xml.findnodes('//*[@tag="020"]/*[@code="a"]');
-            args.isbns.push(isbn.textContent);
+            args.isbns.push(isbn.textContent.trim);
         END;
 
         args.upcs = [];
         FOR upc IN xml.findnodes('//*[@tag="024"]/*[@code="a"]');
-            args.upcs.push(upc.textContent);
+            args.upcs.push(upc.textContent.trim);
         END;
         args.upc = args.upcs.0; # use first UPC as the default
 
         args.issns = [];
         FOR sub IN xml.findnodes('//*[@tag="022"]/*[@code="a"]');
-            args.issns.push(sub.textContent);
+            args.issns.push(sub.textContent.trim);
         END;
         args.issn = (args.issns.size) ? args.issn.0 : '';
 
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index c6e3b7c3ae..313f3e5c67 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -150,10 +150,17 @@ IF num_uris > 0;
 
 <h2 id='rdetail_record_details'>[% l("Record details") %]</h2>
 <ul>
-    [%- IF attrs.isbns.0; FOR isbn IN attrs.isbns %]
+    [%- IF attrs.isbns.0;
+          FOR isbn IN attrs.isbns;
+            isbn_extra = '';
+            IF (matches = isbn.match('^(.+?)(\s.+)$'));
+              isbn = matches.0;
+              isbn_extra = matches.1;
+            END;
+    %]
     <li class='rdetail_isbns'>
         <strong class='rdetail_label'>[% l('ISBN:'); %]</strong>
-        <span class='rdetail_value' property='isbn'>[% isbn | html  %]</span>
+        <span class='rdetail_value' property='isbn'>[% isbn | html  %]</span>[% isbn_extra | html %]
     </li>
         [%- END %]
     [%- END %]
-- 
2.11.0