[open-ils-commits] r13152 - branches/rel_1_4/Open-ILS/xul/staff_client/server/cat (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-05-13 12:30:31 -0400 (Wed, 13 May 2009)
New Revision: 13152

Modified:
   branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/record_buckets.js
   branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/z3950.js
Log:
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



Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/record_buckets.js
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/record_buckets.js	2009-05-13 16:22:00 UTC (rev 13151)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/record_buckets.js	2009-05-13 16:30:31 UTC (rev 13152)
@@ -685,8 +685,7 @@
 								}
 								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 @@
 								}
 								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');

Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/z3950.js
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/z3950.js	2009-05-13 16:22:00 UTC (rev 13151)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/z3950.js	2009-05-13 16:30:31 UTC (rev 13152)
@@ -689,8 +689,7 @@
 		}
 		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');