backporting changeset 13151: Use the dedicated xul file for rendering MARC html inste...

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 146083d..c1f9caf 100644 (file)
--- 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 64bc65d..39d7151 100644 (file)
--- 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');