From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 13 May 2009 16:31:42 +0000 (+0000)
Subject: backporting changeset 13151: Use the dedicated xul file for rendering MARC html inste... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fc14e87d6908a0e041111b80e4f5f5498e8be5dd;p=Evergreen.git

backporting changeset 13151: Use the dedicated xul file for rendering MARC html instead of data: url'ing it. Fixes the mangling of double-daggers in record merging and overlaying displays

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4_0@13153 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.js b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
index 146083df5e..c1f9caf226 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.js
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
@@ -685,8 +685,7 @@ cat.record_buckets.prototype = {
 								}
 								xml += '</tr><tr valign="top">';
 								for (var i = 0; i < record_ids.length; i++) {
-									html = obj.network.simple_request('MARC_HTML_RETRIEVE',[ record_ids[i] ]);
-									xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="data:text/html,' + window.escape(html) + '"/></td>';
+									xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
 								}
 								xml += '</tr></table></form>';
 								//obj.data.temp_merge_top = top_xml; obj.data.stash('temp_merge_top');
@@ -777,8 +776,7 @@ cat.record_buckets.prototype = {
 								}
 								xml += '</tr><tr valign="top">';
 								for (var i = 0; i < record_ids.length; i++) {
-									html = obj.network.simple_request('MARC_HTML_RETRIEVE',[ record_ids[i] ]);
-									xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="data:text/html,' + window.escape(html) + '"/></td>';
+									xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
 								}
 								xml += '</tr></table></form>';
 								//obj.data.temp_merge_top = top_xml; obj.data.stash('temp_merge_top');
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index 64bc65db16..39d7151ce9 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -689,8 +689,7 @@ cat.z3950.prototype = {
 		}
 		xml += '</tr><tr valign="top">';
 		for (var i = 0; i < record_ids.length; i++) {
-			html = obj.network.simple_request('MARC_HTML_RETRIEVE',[ record_ids[i] ]);
-			xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="data:text/html,' + window.escape(html) + '"/></td>';
+            xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
 		}
 		xml += '</tr></table></form>';
 		// data.temp_merge_top = top_xml; data.stash('temp_merge_top');