diff src/sparql/insert_vector_table_details.sparql @ 78:5577d8efc79a

now works on the assumption that all required dimVals already exist

--- a/src/sparql/insert_vector_table_details.sparql	Fri Aug 02 15:51:04 2013 +0100
+++ b/src/sparql/insert_vector_table_details.sparql	Fri Aug 02 15:52:25 2013 +0100
@@ -6,20 +6,24 @@
 PREFIX seq: <http://example.org/seq#>
 PREFIX sia: <http://example.org/sia#>
 
-INSERT { ?vte sia:dimVal _:dv .
-			_:dv sia:dimension ?dim;
-			     sia:value ?val}
+INSERT { ?vte sia:dimVal ?dimVal}
 WHERE
 {
 	?vte rdf:type sia:VectorTableElement .
 	?vte sia:fromDatapoint ?datapoint1 .
 	?vte sia:toDatapoint ?datapoint2 .
-	?datapoint1 sia:dimVal ?dv1 .
+	?datapoint1 sia:vector ?vector1 .
+	?vector1 sia:dimVal ?dv1 .
 	?dv1 sia:dimension ?dim .
 	?dv1 sia:value ?val1 .
-	?datapoint2 sia:dimVal ?dv2 .
+	?datapoint2 sia:vector ?vector2 .
+	?vector2 sia:dimVal ?dv2 .
 	?dv2 sia:dimension ?dim .
 	?dv2 sia:value ?val2 .
-	FILTER (( datatype(?val2) = xsd:double ) && ( datatype(?val1) = xsd:double ))
+	FILTER ( ( datatype(?val2) = xsd:double ) && ( datatype(?val1) = xsd:double ) )
 	BIND (?val2 - ?val1 AS ?val)
-}
+	?dimVal a sia:DimensionValue .
+	?dimVal sia:dimension ?dim .
+	?dimVal sia:value ?val
+	FILTER ( datatype(?val) = xsd:double )
+}
\ No newline at end of file