Merge lp:~patrickas/ensoft-sextant/no-caching into lp:ensoft-sextant

[Patrick Stevens]

Make Sextant Web ask browsers not to cache the SVGs generated.

Make Sextant Web ask browsers not to cache the SVGs generated. (This is done by adding a random query parameter to the image request.)

[lp:~patrickas/ensoft-sextant/no-caching]

22. By Patrick Stevens <email address hidden> on 2014-09-04

Merge trunk changes

23. By Patrick Stevens <email address hidden> on 2014-09-04

Revert change to sextant.conf

[Phil Connell (pconnell)]

Change looks fine, but sadly the file's indentation is utterly screwed up (so needs a change for consistency).

[Phil Connell (pconnell)]

review: Needs Fixing

[lp:~patrickas/ensoft-sextant/no-caching]

24. By Patrick Stevens <email address hidden> on 2014-09-04

Expand tabs into spaces

[Phil Connell (pconnell)]

review: Approve

=== modified file 'resources/sextant/web/queryjavascript.js'
--- resources/sextant/web/queryjavascript.js	2014-09-04 09:46:18 +0000
+++ resources/sextant/web/queryjavascript.js	2014-09-04 16:05:30 +0000
@@ -7,13 +7,13 @@
 
 
 function get_names_for_autocomplete(info_needed){
-	//Function queries to database to create a list 
-	//which is used to populate the auto-complete text boxes.
-	var xmlhttp = new XMLHttpRequest();
-	xmlhttp.onreadystatechange = function(){
-		if (xmlhttp.status = 200){
-			var values_list = xmlhttp.responseText;
-			if (values_list != "") {
+    //Function queries to database to create a list 
+    //which is used to populate the auto-complete text boxes.
+    var xmlhttp = new XMLHttpRequest();
+    xmlhttp.onreadystatechange = function(){
+        if (xmlhttp.status = 200){
+            var values_list = xmlhttp.responseText;
+            if (values_list != "") {
                 values_list = JSON.parse(values_list);
                 if (info_needed =='programs'){
                     //We need to populate the program names list
@@ -22,42 +22,42 @@
                 if (info_needed =='funcs'){
                     //We need to populate the functions list for the arguments
                     add_options("function_names", values_list);
-                }	
+                }    
             }
-		}
-	}
-	if (info_needed == 'programs'){
-		var string = "/database_properties?query=" + info_needed + "&program_name=";
-	}
-	else{
-		var string = "/database_properties?query=" + "functions" + 
-		"&program_name=" + document.getElementById("program_name").value;
-	if (info_needed == 'programs'){
-		var string = "/database_properties?query=" + 
-		info_needed + "&program_name=" + prog_name;
-	}
-	//"GET" information from the specified url (string)
-	xmlhttp.open("GET", string, true);
-	xmlhttp.send();
-	}
-	xmlhttp.open("GET", string, true);
-	xmlhttp.send();
+        }
+    }
+    if (info_needed == 'programs'){
+        var string = "/database_properties?query=" + info_needed + "&program_name=";
+    }
+    else{
+        var string = "/database_properties?query=" + "functions" + 
+        "&program_name=" + document.getElementById("program_name").value;
+    if (info_needed == 'programs'){
+        var string = "/database_properties?query=" + 
+        info_needed + "&program_name=" + prog_name;
+    }
+    //"GET" information from the specified url (string)
+    xmlhttp.open("GET", string, true);
+    xmlhttp.send();
+    }
+    xmlhttp.open("GET", string, true);
+    xmlhttp.send();
 }
 
 
 function add_options(selectedlist, values_list){
-	//Adds all the options obtained from the list of program 
-	//names or function names to an auto complete drop-down box
-	var options = ''
-	if (values_list.length == 1 || values_list.length ==0){
-		options += '<option value="'+values_list+'"/>';
-	}
-	else{
-		for (var i=0; i < values_list.length;++i){
-			options += '<option value="'+values_list[i]+'"/>';
-		}
-	}
-	document.getElementById(selectedlist).innerHTML = options;
+    //Adds all the options obtained from the list of program 
+    //names or function names to an auto complete drop-down box
+    var options = ''
+    if (values_list.length == 1 || values_list.length ==0){
+        options += '<option value="'+values_list+'"/>';
+    }
+    else{
+        for (var i=0; i < values_list.length;++i){
+            options += '<option value="'+values_list[i]+'"/>';
+        }
+    }
+    document.getElementById(selectedlist).innerHTML = options;
 }
 
 
@@ -83,32 +83,32 @@
                     = (label1 == "" && label2 == "") ? "none" : "block";
 }
 
-	
+    
 function display_when(){
-	//For each query specifies when auto-complete text boxes should be made 
-	//visible or invisible and makes them read only
-	var query_list = document.getElementById("query_list");
+    //For each query specifies when auto-complete text boxes should be made 
+    //visible or invisible and makes them read only
+    var query_list = document.getElementById("query_list");
 
-	var no_functions = new Array();
-	var prog_name = document.getElementById("program_name").value;
-	if (query_list.options[query_list.selectedIndex].value == "functions_calling"){
+    var no_functions = new Array();
+    var prog_name = document.getElementById("program_name").value;
+    if (query_list.options[query_list.selectedIndex].value == "functions_calling"){
         set_arguments("Function being called", "");
-	}
-	if (query_list.options[query_list.selectedIndex].value == "functions_called_by"){
+    }
+    if (query_list.options[query_list.selectedIndex].value == "functions_called_by"){
         set_arguments("Function calling", "");
-	}
-	if (query_list.options[query_list.selectedIndex].value == "all_call_paths"){
-        set_arguments("Function calling", "Function being called");
-	}
-	if (query_list.options[query_list.selectedIndex].value == "shortest_call_path"){
-		set_arguments("Function calling", "Function being called");
-	}
-	if (query_list.options[query_list.selectedIndex].value == "whole_program") {
-		set_arguments("", "");
-	}
-	if (query_list.options[query_list.selectedIndex].value == "function_names"){
-		set_arguments("", "");
-	}
+    }
+    if (query_list.options[query_list.selectedIndex].value == "all_call_paths"){
+        set_arguments("Function calling", "Function being called");
+    }
+    if (query_list.options[query_list.selectedIndex].value == "shortest_call_path"){
+        set_arguments("Function calling", "Function being called");
+    }
+    if (query_list.options[query_list.selectedIndex].value == "whole_program") {
+        set_arguments("", "");
+    }
+    if (query_list.options[query_list.selectedIndex].value == "function_names"){
+        set_arguments("", "");
+    }
 }
 
 
@@ -116,66 +116,67 @@
 function execute_query(){
     document.getElementById("output_image").src = "";
 
-	//Returns error in alert window if query not executed properly, 
-	//otherwise performs the query and outputs it
-	show_item("please-wait");
-	var query_id = document.getElementById("query_list").value;
-	if (query_id == "function_names"){
-		//url for page containing all function names
-		var string = "/database_properties?program_name=" + 
-		document.getElementById("program_name").value + "&query=functions";
-	}
-	else{
-		//If not function names we will want a graph as an output; 
-		//url returns svg file of graph.
-		var string = "/output_graph.svg?program_name=" + 
-			document.getElementById("program_name").value + 
-			"&query=" + query_id + "&func1=";
+    //Returns error in alert window if query not executed properly, 
+    //otherwise performs the query and outputs it
+    show_item("please-wait");
+    var query_id = document.getElementById("query_list").value;
+    if (query_id == "function_names"){
+        //url for page containing all function names
+        var string = "/database_properties?program_name=" + 
+        document.getElementById("program_name").value + "&query=functions";
+    }
+    else{
+        //If not function names we will want a graph as an output; 
+        //url returns svg file of graph.
+                // We use a random number argument to prevent caching.
+        var string = "/output_graph.svg?stop_cache=" + String(Math.random()) + "&program_name=" + 
+            document.getElementById("program_name").value + 
+            "&query=" + query_id + "&func1=";
         string = string + document.getElementById("function_1").value + 
-			"&func2=" + document.getElementById("function_2").value;
+            "&func2=" + document.getElementById("function_2").value;
         string = string + "&suppress_common=" + 
-			document.getElementById('suppress_common').checked.toString();
+            document.getElementById('suppress_common').checked.toString();
 
-	}
-	var xmlhttp = new XMLHttpRequest();
-		xmlhttp.open("GET", string, true);
-		xmlhttp.send();
-	xmlhttp.onreadystatechange = function(){
-		if (xmlhttp.readyState == 4 && xmlhttp.status == 200){
-			//readyState == 4 means query has finished executing.
-			//status == 200 means "GET"ing has been successful.
-			if (query_id == "function_names"){
-				//Text output displayed in paragraph.
-				document.getElementById("function_names_output").innerHTML = 
-						xmlhttp.responseText;
-				show_item("function_names_output");
-			}
-			else{
+    }
+    var xmlhttp = new XMLHttpRequest();
+        xmlhttp.open("GET", string, true);
+        xmlhttp.send();
+    xmlhttp.onreadystatechange = function(){
+        if (xmlhttp.readyState == 4 && xmlhttp.status == 200){
+            //readyState == 4 means query has finished executing.
+            //status == 200 means "GET"ing has been successful.
+            if (query_id == "function_names"){
+                //Text output displayed in paragraph.
+                document.getElementById("function_names_output").innerHTML = 
+                        xmlhttp.responseText;
+                show_item("function_names_output");
+            }
+            else{
                 show_item("output_image");
-				document.getElementById("output_image").src = string;
-			}
-		}
-		else if (xmlhttp.readyState == 4 && xmlhttp.status == 400){
-			//Error occurred during query; display response.
-			show_error(xmlhttp.responseText);
-		}
-		else if(xmlhttp.readyState == 4 && xmlhttp.status == 404){
-			//Error occurred during query; display response.
-			show_error(xmlhttp.responseText);
-		}
-		else if(xmlhttp.readyState ==4 && xmlhttp.status == 204){
-			//Query executed correctly but graph returned is empty
-			show_error("Graph returned was empty");
-		}
-		else if (xmlhttp.readyState == 4 && xmlhttp.status == 502) {
-		    //Error occurs if Neo4j isn't running
-			show_error("Bad Gateway received - are you sure the database server is running?");
-		}
-		else if(xmlhttp.readyState ==4){
-			//query executed correctly
-			show_error("An unknown error occurred");
-		}
-	}
+                document.getElementById("output_image").src = string;
+            }
+        }
+        else if (xmlhttp.readyState == 4 && xmlhttp.status == 400){
+            //Error occurred during query; display response.
+            show_error(xmlhttp.responseText);
+        }
+        else if(xmlhttp.readyState == 4 && xmlhttp.status == 404){
+            //Error occurred during query; display response.
+            show_error(xmlhttp.responseText);
+        }
+        else if(xmlhttp.readyState ==4 && xmlhttp.status == 204){
+            //Query executed correctly but graph returned is empty
+            show_error("Graph returned was empty");
+        }
+        else if (xmlhttp.readyState == 4 && xmlhttp.status == 502) {
+            //Error occurs if Neo4j isn't running
+            show_error("Bad Gateway received - are you sure the database server is running?");
+        }
+        else if(xmlhttp.readyState ==4){
+            //query executed correctly
+            show_error("An unknown error occurred");
+        }
+    }
 }
 
 function show_item(id) {