From f208ebe39c5105dea621faf6b9b7c8fba87ac25e Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 21 Feb 2013 10:30:46 -0500 Subject: [PATCH] Z39 Batch : xul open queue Signed-off-by: Bill Erickson --- .../staff_client/server/cat/bucketz39_dialog.js | 35 ++++++++++++++++++++-- .../server/cat/bucketz39_dialog_overlay.xul | 8 +++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog.js b/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog.js index 66e98d6039..5e6d2f086d 100644 --- a/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog.js +++ b/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog.js @@ -137,9 +137,10 @@ function Bucketz39Dialog() { function(cbox) { return cbox.checked }).map( function(cbox) { return cbox.getAttribute('value') })); - // queue name / match set params.push({ + // queue name (editable menulist) queue_name : dojo.byId('queue_selector').parentNode.value, + // match set ID match_set : dojo.byId('match_set_selector').parentNode.value }); @@ -173,9 +174,7 @@ function Bucketz39Dialog() { onresponse : function(r) { var resp = r.recv(); if (!resp) return; - var stat = resp.content(); - dump('Z39 Batch Response: ' + js2JSON(stat) + '\n'); dojo.attr(self.search_bib_count, 'value', ''+stat.bre_count); dojo.attr(self.search_queue_count, 'value', ''+stat.queue_count); @@ -186,11 +185,41 @@ function Bucketz39Dialog() { (Number(stat.search_complete) / scount) * 100 )); } + + // queue object is returned in the final response + self.queue = stat.queue; }, oncomplete : function() { + dojo.removeClass(dojo.byId('final-actions-row'), 'hideme'); } }).send(); } + + // Open a new XUL tab focused on the Vandelay queue containing the results. + this.open_queue = function() { + /* + labelKey = labelKey || 'menu.cmd_open_conify.tab'; + var label = offlineStrings.getString(labelKey); + */ + var label = 'MARC Import/Export'; // TODO + + // URL + var urls = xulG.urls || window.urls; + var url_prefix = xulG.url_prefix || window.url_prefix; + var loc = urls.XUL_BROWSER + '?url=' + + window.escape( + url_prefix('EG_WEB_BASE/') + + 'vandelay/vandelay?qtype=bib&qid=' + this.queue.id() + ); + + var content_params = { + 'no_xulG': false, + 'show_print_button': true, + 'show_nav_buttons': true + }; + + xulG.new_tab(loc, {tab_name: label}, content_params); + } } function my_init() { diff --git a/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog_overlay.xul b/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog_overlay.xul index aa16378515..c0cd224974 100644 --- a/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog_overlay.xul +++ b/Open-ILS/xul/staff_client/server/cat/bucketz39_dialog_overlay.xul @@ -78,6 +78,14 @@ + +