merge conflicts fixed

saileshpatnala · Jun 6, 2018 · d222a94 · d222a94
1 parent 6d9d60e
commit d222a94
Show file tree

Hide file tree

Showing 3 changed files with 677 additions and 21 deletions.
diff --git a/TripleDataProcessor/src/main/webapp/js/graph.js b/TripleDataProcessor/src/main/webapp/js/graph.js
@@ -77,13  77,21 @@ var simulation = d3.forceSimulation()
 /* NOTE:
     - Query for first set of triples in library for the search term
 */
-d3.json("http://localhost:8080/TripleDataProcessor/webapi/myresource", function (error, json) {
 d3.json("http://localhost:8080/TripleDataProcessor/webapi/myresource", function(error, json) {
     if (error) throw error;
     var count = JSON.stringify(json).length;
 
-    createGraph(json);
-    update();
-
-    setTimeout(function () { requery(); }, 3000);
     if (count > 20) {
         // document.getElementById("back").style.display="none";
         // document.getElementById("main").style.display="none";
         createGraph(json);
         update();
         setTimeout(function () { requery(); }, 3000);
     }
     else {
         window.location.href = "./noresults";
         // document.getElementById("column").style.display="none";
     }
 });
 
 function search_page(){
@@ -353,22  361,6 @@ function libraryQuery(data) {
     }
 }
 
-d3.json("http://localhost:8080/TripleDataProcessor/webapi/myresource", function(error, json) {
-    if (error) throw error;
-    var count = JSON.stringify(json).length;
-
-    if (count > 20) {
-        // document.getElementById("back").style.display="none";
-        // document.getElementById("main").style.display="none";
-        createGraph(json);
-        update();
-    }
-    else {
-        window.location.href = "./noresults";
-        // document.getElementById("column").style.display="none";
-    }
-});
-
 function update() {
     var links = UniversalL;
     var nodes = UniversalN;