Changeset 29445 for main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-script.js

Timestamp:

2014-11-17T16:44:35+13:00 (9 years ago)

Author:

sjs49

Message:

Tidied comparison code and improved comments a little. Changed some function names to be more descriptive.

File:

• main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-script.js (modified) (16 diffs)

main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-script.js

@@ +1 @@
+// Von-Sparql Collection Comparison Script
+//
+// Contains script to build queries to compare contents of
+// one collection with another.
+
+
+//Builds a single-collection query from inputs
 function generateQuery(side,dataset){
     var predicate = $('#sel_' + side + 'Predicate').val();  
@@ -31 +38 @@
 }
 
+//Builds a query comparing data selected from two collections
 function generateComparisonQuery(){
 
@@ -38 +46 @@
 
     //Start generating query
-        var sparqlQuery = "";
+    var sparqlQuery = "";
     var sparqlQueryHeader = "";
-    ///////INTERSECTION///////
+
+    //If query type is an intersection of the collection data
     if(query.type=="intersection"){
         sparqlQueryHeader   +=  "SELECT DISTINCT ?common ";
@@ -51 +60 @@
             sparqlQuery     +=  "   ?s <" + query.pred_L + "> "// ?common;"; 
             
-        sparqlQuery += generateFilter("left", comparisonMethod);
+        sparqlQuery += setComparisonMethod("left", comparisonMethod);
 
         if(!$('#cb_showOnlyCommonObjects').is(':checked')){
@@ -79 +88 @@
             sparqlQuery     +=  "   ?s1 <" + query.pred_R + "> "// ?common;" ; 
 
-        sparqlQuery += generateFilter("right", comparisonMethod);
+        sparqlQuery += setComparisonMethod("right", comparisonMethod);
 
         if(!$('#cb_showOnlyCommonObjects').is(':checked')){
@@ -106 +115 @@
     
 
-    //////MINUS/////
+    //If query is for data that is in one collection, but not the other (MINUS)
     if(query.type=="minus"){
         sparqlQueryHeader   +=  "SELECT DISTINCT ?minus " ;
@@ -140 +149 @@
         sparqlQuery         +=  "} ";
         sparqlQuery         +=  "MINUS{" 
-                            +   "GRAPH gsdl:" + leftCollection + "{" ;
+                        +   "GRAPH gsdl:" + leftCollection + "{" ;
+    
         if(query.refine_L!="")
             sparqlQuery     +=  "   ?s <" + query.pred_L + "> \"" + query.predval_L + "\";"  
@@ -147 +157 @@
             sparqlQuery     +=  "   ?s <" + query.pred_L + "> "; 
 
-        sparqlQuery += generateFilter("left", comparisonMethod)
+        sparqlQuery += setComparisonMethod("left", comparisonMethod)
         sparqlQuery         +=  "}"  
                             +   "GRAPH gsdl:" + rightCollection +"{";
@@ -156 +166 @@
             sparqlQuery     +=  "   ?s1 <" + query.pred_R + "> " ; 
 
-        sparqlQuery += generateFilter("right", comparisonMethod)
+        sparqlQuery += setComparisonMethod("right", comparisonMethod)
         sparqlQuery         +=  "}"  
                             +   "}}";
@@ -163 +173 @@
     sparqlQuery += "LIMIT " + $('#sel_comparisonLimit').val() + " ";
     sparqlQuery += "OFFSET " + ((query.page-1) * $('#sel_comparisonLimit').val()); 
-    console.log(sparqlQuery);
     return sparqlQuery;
 } 
 
-function generateFilter(side, comparisonMethod){
+//Used when substrings of returned values are used for comparison 
+//i.e. when numbers are extracted from DATE triples for plotting in a line graph, etc"
+function setComparisonMethod(side, comparisonMethod){
     var query = "";
     var tempVar;
@@ -209 +220 @@
 
 
-
+//Updates the "value" selector with possible values
 function updateValueSelector(predicate, selector, collectionName){
     var refineDataset = "GRAPH gsdl:" + collectionName + " {\n";
@@ -255 +266 @@
 }
 
+//Updates the selector which contains available predicates after 
+//previously restricting a predicate to a certain value
 function updateVisualizePredicateSelector(predicate,value,selector,collection){
     var sparqlQuery;
@@ -295 +308 @@
 }
 
-function drawFilteredDataset(side, collection){
+function drawCollectionChart(side, collection){
     var Q = new sgvizler.Query();
     Q.query(generateQuery(side, collection))
@@ -316 +329 @@
     sgvizler.defaultChartWidth(defaultChartWidth);
     sgvizler.defaultChartHeight(defaultChartHeight);
-
-/*  var ajaxSparqlQuery = sparqlEndpoint + "?query=" + encodeURIComponent(generateComparisonQuery());
-
-    $('#table_combinedResults').jqGrid({
-        url: ajaxSparqlQuery,
-        datatype: "spreadsheet",
-        colNames: ['Common'],
-        colModel: [{name: 'common',
-                    index: 'results.bindings.common',
-                    width: '300'}],
-        rowNum: 10,
-        rowList: [10,20,30],
-        pager: '#table_combinedResultsPager',
-//      sortname: 'common',
-        viewrecords: true,
-        sortorder: 'desc',
-        caption: 'Results table'
-    });
-    $('#table_combinedResults').jqGrid('navGrid','#div_combinedResultsPager',{edit:false, add:false, del:false});
-
-*/  
 }
 
@@ -346 +338 @@
     return name;
 }
+
 //Fills the predicate selector with values
 function populatePredicateSelector(collection, selector){
@@ -398 +391 @@
 
 function setCursor(style){
-    console.log("Cursor: " + style);
     document.body.style.cursor = style;
 }