broken xulG/cgi conversion. CGI .keys scared me away from xul_param earlier

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

diff --git a/Open-ILS/xul/staff_client/server/patron/search_form.js b/Open-ILS/xul/staff_client/server/patron/search_form.js
index edb3724..a6c1c49 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/search_form.js
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.js
@@ -212,18 +212,13 @@ patron.search_form.prototype = {
        'submit' : function() {
                window.xulG.clear_left_deck();
                var obj = this;
-               var query = '';
+               var query = {};
                for (var i = 0; i < obj.controller.render_list.length; i++) {
                var id = obj.controller.render_list[i][0];
                var node = document.getElementById(id);
                        if (node && node.value != '') {
-                               if (query == '') {
-                                       // Responsible for own ? or &
-                               } else {
-                                       query += '&';
-                               }
                                if (id == 'inactive') {
-                                       query += id + '=' + window.escape(node.getAttribute('value'));
+                                       query[id] = node.getAttribute('value');
                                        obj.error.sdump('D_DEBUG','id = ' + id + '  value = ' + node.getAttribute('value') + '\n');
                                } else {
                                        var value = node.value.replace(/^\s+/,'').replace(/[\\\s]+$/,'');
@@ -236,7 +231,7 @@ patron.search_form.prototype = {
                                                break;
                                        }
                                        if (value != '') {
-                                               query += id + '=' + window.escape(value);
+                                               query[id] = value;
                                                obj.error.sdump('D_DEBUG','id = ' + id + '  value = ' + value + '\n');
                                        }
                                }

diff --git a/Open-ILS/xul/staff_client/server/patron/search_form.xul b/Open-ILS/xul/staff_client/server/patron/search_form.xul
index 1f315c3..49ea8d9 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/search_form.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.xul
@@ -56,7 +56,7 @@
                                JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
                                g.search_form.init( { 'query' : query } );
 
-                               if (g.cgi.param('doit')) {
+                               if (g.cgi.param('doit')||xulG.doit) {
                                        g.search_form.submit();
                                }
        
@@ -65,6 +65,7 @@
                                        "system administrator or software developer the following:\n" 
                                        'patron/search_form.xul\n' + E + '\n';
                                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                               alert(E);
                                alert(err_msg);
                        }
                }