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

Timestamp:

2014-11-18T13:40:32+13:00 (9 years ago)

Author:

sjs49

Message:

Fixed query failing to parse when restricted data from two collections was compared

File:

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

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

@@ -122 +122 @@
         if(query.datasetSelection==leftCollection){
             sparqlQuery     +=  "GRAPH gsdl:" + leftCollection + "{   ?s <" + query.pred_L + "> ?minus;"
+
+            if(query.refine_L!="")
+                sparqlQuery     +=  "    <" + query.pred_L + "> \"" + query.predval_L + "\";"  
+
             subj = "?s ";
         }
         else{
             sparqlQuery     +=  "GRAPH gsdl:" + rightCollection +"{   ?s1 <" + query.pred_R + "> ?minus;";
+
+            if(query.refine_R!="")
+                sparqlQuery     +=  "    <" + query.pred_R + "> \"" + query.predval_L + "\";" 
+
             subj = "?s1 ";
         }
@@ -161 +169 @@
                             +   "GRAPH gsdl:" + rightCollection +"{";
         if(query.refine_R!="")
-            sparqlQuery     +=  "   ?s1 <" + query.pred_R + "> \"" + query.predval_L + "\";" 
-                            +   query.refine_L;
+            sparqlQuery     +=  "   ?s1 <" + query.pred_R + "> \"" + query.predval_R + "\";" 
+                            +   query.refine_R;
         else
             sparqlQuery     +=  "   ?s1 <" + query.pred_R + "> " ;