X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=js%2Fpz2.js;h=5870bae0ede4679dfc871455714919f71c79af12;hb=c1efbafeaf2f2ef315270976ba3d60e8ac7fd12a;hp=ff5ca24238850405097ed91c5ee3dcfda6b38ab2;hpb=514963d836ba78fb09d1c574cf2ea479433e668a;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index ff5ca24..5870bae 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,5 @@
 /*
-** $Id: pz2.js,v 1.5 2007-04-03 14:27:21 jakub Exp $
+** $Id: pz2.js,v 1.7 2007-04-15 03:24:18 quinn Exp $
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -256,11 +256,23 @@ pz2.prototype = {
                     var hit = new Array();
                     for (i = 0; i < hits.length; i++) {
                         show.hits[i] = new Array();
+			show.hits[i]['location'] = new Array();
                         for ( j = 0; j < hits[i].childNodes.length; j++) {
+			    var locCount = 0;
                             if ( hits[i].childNodes[j].nodeType == Node.ELEMENT_NODE ) {
-                                var nodeName = hits[i].childNodes[j].nodeName;
-                                var nodeText = hits[i].childNodes[j].firstChild.nodeValue;
-                                show.hits[i][nodeName] = nodeText;
+				if (hits[i].childNodes[j].nodeName == 'location') {
+				    var locNode = hits[i].childNodes[j];
+				    var id = locNode.getAttribute('id');
+				    show.hits[i]['location'][id] = {
+					"id": locNode.getAttribute("id"),
+					"name": locNode.getAttribute("name")
+				    };
+				}
+				else {
+				    var nodeName = hits[i].childNodes[j].nodeName;
+				    var nodeText = hits[i].childNodes[j].firstChild.nodeValue;
+				    show.hits[i][nodeName] = nodeText;
+				}
                             }
                         }
                     }
@@ -308,7 +320,11 @@ pz2.prototype = {
                         for ( j = 0; j < locationNodes[i].childNodes.length; j++) {
                             if ( locationNodes[i].childNodes[j].nodeType == Node.ELEMENT_NODE ) {
                                 var nodeName = locationNodes[i].childNodes[j].nodeName;
-                                var nodeText = locationNodes[i].childNodes[j].firstChild.nodeValue;
+                                var nodeText;
+				if (locationNodes[i].childNodes[j].firstChild)
+					nodeText = locationNodes[i].childNodes[j].firstChild.nodeValue;
+				else
+					nodeText = '';
                                 record["location"][i][nodeName] = nodeText;                            
                             }
                         }