From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 21 Dec 2007 06:47:03 +0000 (+0000)
Subject: hardcode native evergreen catalog as a virtual z-source, and show 0 records found... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=81ad1a37d72fd9322571a9bdb580a62bba0585f9;p=Evergreen.git

hardcode native evergreen catalog as a virtual z-source, and show 0 records found if no .count field

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

diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index a76f1816d1..edaaa4188a 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -199,7 +199,7 @@ cat.z3950.prototype = {
                                                 for (var i = 0; i < nl.length; i++) { nl[i].disabled = true; }
                                                 var attrs = {};
                                                 for (var j = 0; j < obj.active_services.length; j++) {
-                                                    for (var i in obj.services[obj.active_services[j]].attrs) {
+                                                    if (obj.services[obj.active_services[j]]) for (var i in obj.services[obj.active_services[j]].attrs) {
                                                         var attr = obj.services[obj.active_services[j]].attrs[i];
                                                         if (! attrs[i]) {
                                                             attrs[i] = { 'labels' : {} };
@@ -264,6 +264,8 @@ cat.z3950.prototype = {
                                             }
 										}
 
+                                        document.getElementById('native-evergreen-catalog_service').addEventListener('command',handle_switch,false);
+
 										var robj = obj.network.simple_request(
 											'RETRIEVE_Z3950_SERVICES',
 											[ ses() ]
@@ -294,6 +296,7 @@ cat.z3950.prototype = {
                                             password.setAttribute('type','password'); r.appendChild(password);
                                             if (typeof robj[i].auth != 'undefined') password.hidden = ! get_bool( robj[i].auth );
                                         }
+                                        obj.services[ 'native-evergreen-catalog' ] = { 'attrs' : { 'author' : {}, 'title' : {} } };
                                         setTimeout(
 											function() { 
                                                 if (obj.creds.hosts[ obj.data.server_unadorned ]) {
@@ -335,7 +338,7 @@ cat.z3950.prototype = {
 		        var x = obj.creds.hosts[ obj.data.server_unadorned ].services[ obj.active_services[i] ].default_attr;
                 if (x) { focus_me = x; break; }
             }
-			for (var i in obj.services[ obj.active_services[i] ].attr) { or_focus_me = i; }
+            if (ob.services[ obj.active_services[i] ]) for (var i in obj.services[ obj.active_services[i] ].attr) { or_focus_me = i; }
         }
         if (! focus_me) focus_me = or_focus_me;
 		var xx = document.getElementById(focus_me+'_input'); if (xx) xx.focus();
@@ -466,7 +469,7 @@ cat.z3950.prototype = {
                 } else {
                         x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
                         x.appendChild(
-                            document.createTextNode( results[i].count + ' records found')
+                            document.createTextNode( (results[i].count ? results[i].count : 0) + ' records found')
                         );
                 }
                 if (results[i].records) {
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.xul b/Open-ILS/xul/staff_client/server/cat/z3950.xul
index 0dfff60385..be3810ea3b 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.xul
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.xul
@@ -100,6 +100,11 @@
                                 <label value="Username"/>
                                 <label value="Password"/>
                             </row>
+                            <row>
+                                <checkbox id="native-evergreen-catalog_service" mytype="service_class" service="native-evergreen-catalog" label="Local Catalog" tooltiptext="Evergreen Native Catalog" /> 
+                                <textbox id="native-evergreen-catalog_username" hidden="true"/>
+                                <textbox id="native-evergreen-catalog_password" type="password" hidden="true"/>
+                            </row>
                         </rows>
                     </grid>
                 </groupbox>