Changeset 33322 for main/trunk

Timestamp:

2019-07-11T17:23:18+12:00 (5 years ago)

Author:

ak19

Message:

Getting faceted searching working with the map shapes.

Location:

main/trunk/greenstone3/web/interfaces/default/js

Files:

• facet-scripts.js (modified) (2 diffs)
• map-scripts.js (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/js/facet-scripts.js

@@ -50 +50 @@
     
     countsString += "&";
-    console.log("STRING IS " + countsString);
+    //console.log("STRING IS " + countsString);
     
     $.ajax(gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/search/" + gs.cgiParams.s + "?" + searchString + countsString + "excerptid=resultsArea")
         .done(function(response)
-        {
+            {
             $("#resultsArea").html("");
             $("#resultsArea").html(response.substring(response.indexOf(">") + 1, response.lastIndexOf("<")));
@@ -63 +63 @@
                     favouritesCheckout(); // called to add back in favourites icons (if favouritebasket active)
             }
+              if(typeof mapEnabled !== 'undefined') {                 
+                  
+                  facetedMapSearch(gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/search/" + gs.cgiParams.s + "?" + searchString + countsString);
+                  
+              }
         });
 }

main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js

@@ -21 +21 @@
 var _searchRunning = false;
 var _nearbyDocsByDistance = [];
-var _scrollThroughDefault = true;
+var _scrollThroughDefault = true; // TODO: default is true
 
 var LOW_OPACITY = 0.1; // make surrounding docs' opacity 10%
@@ -128 +128 @@
 function performProximitySearch()
 {
+    //console.log("@@@@ skipping proximity search for now");
+    //return;
+    
     _gsDebug("*** START OF performProximitySearch()");
     
@@ -355 +358 @@
 }
 
+function facetedMapSearch(facet_request_url) {
+    // ask for just the jsonNodes
+    facet_request_url += "excerptid=jsonNodes";
+    
+    $.ajax(facet_request_url).done(function(responseText) {
+    var doc;
+    var nodeID;
+    
+    console.log("Sent off facetedMapSearch request to " + facet_request_url +  ", got response: ");
+    console.log(responseText);
+
+    if(responseText.search("id=\"jsonNodes") != -1) {
+        var startIndex = responseText.indexOf(">");
+        var endIndex = responseText.indexOf("</");
+        var jsonNodes = eval(responseText.substring(startIndex+1, endIndex));
+        console.log(jsonNodes);
+    
+        
+        if(jsonNodes && jsonNodes.length > 0) {
+            console.log("Got some nodes. Removing all markers first...");
+
+        
+        mapEnabled = true;
+        showMap("initializeMapScripts");
+
+        // Remove all the markers/shapes from map
+        // and empty _docList.ids and the _docList of items
+        for(var j = 0; j < _docList.ids.length; j++) {
+            nodeID = _docList.ids[j]; 
+            doc = _docList.getDocByIndex(j);
+            removeMarkersFromMap(doc);
+            delete _docList[nodeID];
+        }
+        _docList.ids = [];
+
+        // repopulate _docList and _docList.ids and plot on map
+        for(var i = 0; i < jsonNodes.length; i++)
+        {
+            _docList[jsonNodes[i].nodeID] = jsonNodes[i];
+            _docList.ids.push(jsonNodes[i].nodeID);
+            var options = {
+            "mainDoc": true
+            };
+            console.log("#### " + jsonNodes[i].nodeID + " is a main doc: ");
+            console.log(jsonNodes[i]);
+            createOverlayItems(jsonNodes[i], options);
+        }
+
+        // redo map bounds, which will also performProximitySearch
+        updateMap();
+        }
+        else
+        {
+        //hiding the map
+        mapEnabled = false;
+        hideMap("initializeMapScripts");        
+        }
+    }   
+    _docList.loopIndex = 0;
+    
+    });
+    
+}
+
+
 function toggleMapSection(options)
 {