Holger Knublauch

Corrected ddrGraph function error

...@@ -105,15 +105,15 @@ arg:wellName ...@@ -105,15 +105,15 @@ arg:wellName
105 ] ; 105 ] ;
106 spin:constraint 106 spin:constraint
107 [ rdf:type spl:Argument ; 107 [ rdf:type spl:Argument ;
108 - rdfs:comment "The value to match against."^^xsd:string ;
109 - spl:predicate sp:arg1
110 - ] ;
111 - spin:constraint
112 - [ rdf:type spl:Argument ;
113 rdfs:comment "The property that must be used in the result resource."^^xsd:string ; 108 rdfs:comment "The property that must be used in the result resource."^^xsd:string ;
114 spl:predicate <http://topbraid.org/spin/spinmapl#predicate> ; 109 spl:predicate <http://topbraid.org/spin/spinmapl#predicate> ;
115 spl:valueType rdf:Property 110 spl:valueType rdf:Property
116 ] ; 111 ] ;
112 + spin:constraint
113 + [ rdf:type spl:Argument ;
114 + rdfs:comment "The value to match against."^^xsd:string ;
115 + spl:predicate sp:arg1
116 + ] ;
117 spin:returnType rdfs:Resource . 117 spin:returnType rdfs:Resource .
118 118
119 npdata:npd 119 npdata:npd
...@@ -388,15 +388,15 @@ rhspin:WDRTableTemplates ...@@ -388,15 +388,15 @@ rhspin:WDRTableTemplates
388 spin:abstract "true"^^xsd:boolean ; 388 spin:abstract "true"^^xsd:boolean ;
389 spin:constraint 389 spin:constraint
390 [ rdf:type spl:Argument ; 390 [ rdf:type spl:Argument ;
391 - rdfs:comment "The start date of the reporting week."^^xsd:string ;
392 - spl:predicate arg:startDate ;
393 - spl:valueType xsd:date
394 - ] ;
395 - spin:constraint
396 - [ rdf:type spl:Argument ;
397 rdfs:comment "The DDR that serves as root of the query."^^xsd:string ; 391 rdfs:comment "The DDR that serves as root of the query."^^xsd:string ;
398 spl:predicate arg:wellBore ; 392 spl:predicate arg:wellBore ;
399 spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore> 393 spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore>
394 + ] ;
395 + spin:constraint
396 + [ rdf:type spl:Argument ;
397 + rdfs:comment "The start date of the reporting week."^^xsd:string ;
398 + spl:predicate arg:startDate ;
399 + spl:valueType xsd:date
400 ] . 400 ] .
401 401
402 rhspin:baaById 402 rhspin:baaById
...@@ -805,16 +805,16 @@ rhspin:ddrOfWeek ...@@ -805,16 +805,16 @@ rhspin:ddrOfWeek
805 ] ; 805 ] ;
806 spin:constraint 806 spin:constraint
807 [ rdf:type spl:Argument ; 807 [ rdf:type spl:Argument ;
808 - rdfs:comment "The first day of the week."^^xsd:string ;
809 - spl:predicate sp:arg1 ;
810 - spl:valueType xsd:date
811 - ] ;
812 - spin:constraint
813 - [ rdf:type spl:Argument ;
814 rdfs:comment "The well bore that the DDR must be about."^^xsd:string ; 808 rdfs:comment "The well bore that the DDR must be about."^^xsd:string ;
815 spl:predicate sp:arg2 ; 809 spl:predicate sp:arg2 ;
816 spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore> 810 spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore>
817 ] ; 811 ] ;
812 + spin:constraint
813 + [ rdf:type spl:Argument ;
814 + rdfs:comment "The first day of the week."^^xsd:string ;
815 + spl:predicate sp:arg1 ;
816 + spl:valueType xsd:date
817 + ] ;
818 spin:returnType <http://www.reportinghub.no/ep/schema/report#DailyDrillingReport> . 818 spin:returnType <http://www.reportinghub.no/ep/schema/report#DailyDrillingReport> .
819 819
820 rhspin:ddrWellBoreId 820 rhspin:ddrWellBoreId
...@@ -901,15 +901,15 @@ rhspin:dtypeValue ...@@ -901,15 +901,15 @@ rhspin:dtypeValue
901 ] ; 901 ] ;
902 spin:constraint 902 spin:constraint
903 [ rdf:type spl:Argument ; 903 [ rdf:type spl:Argument ;
904 - rdfs:comment "The predicate that points to the reified value."^^xsd:string ;
905 - spl:predicate sp:arg2 ;
906 - spl:valueType rdf:Property
907 - ] ;
908 - spin:constraint
909 - [ rdf:type spl:Argument ;
910 rdfs:comment "The subject of the value."^^xsd:string ; 904 rdfs:comment "The subject of the value."^^xsd:string ;
911 spl:predicate sp:arg1 ; 905 spl:predicate sp:arg1 ;
912 spl:valueType rdfs:Resource 906 spl:valueType rdfs:Resource
907 + ] ;
908 + spin:constraint
909 + [ rdf:type spl:Argument ;
910 + rdfs:comment "The predicate that points to the reified value."^^xsd:string ;
911 + spl:predicate sp:arg2 ;
912 + spl:valueType rdf:Property
913 ] . 913 ] .
914 914
915 rhspin:facilityById 915 rhspin:facilityById
...@@ -965,7 +965,7 @@ rhspin:graphForDDR ...@@ -965,7 +965,7 @@ rhspin:graphForDDR
965 [ rdf:type sp:Select ; 965 [ rdf:type sp:Select ;
966 sp:resultVariables ([ rdf:type rhspin:graphForLicence ; 966 sp:resultVariables ([ rdf:type rhspin:graphForLicence ;
967 arg:licence 967 arg:licence
968 - [ sp:varName "wellBore"^^xsd:string 968 + [ sp:varName "licence"^^xsd:string
969 ] 969 ]
970 ]) ; 970 ]) ;
971 sp:where ([ rdf:type sp:TriplePath ; 971 sp:where ([ rdf:type sp:TriplePath ;
...@@ -1498,8 +1498,9 @@ rhspin:npdTripleExists ...@@ -1498,8 +1498,9 @@ rhspin:npdTripleExists
1498 ] ; 1498 ] ;
1499 spin:constraint 1499 spin:constraint
1500 [ rdf:type spl:Argument ; 1500 [ rdf:type spl:Argument ;
1501 - rdfs:comment "The object to match."^^xsd:string ; 1501 + rdfs:comment "The subject to find"^^xsd:string ;
1502 - spl:predicate sp:arg3 1502 + spl:predicate sp:arg1 ;
1503 + spl:valueType rdfs:Resource
1503 ] ; 1504 ] ;
1504 spin:constraint 1505 spin:constraint
1505 [ rdf:type spl:Argument ; 1506 [ rdf:type spl:Argument ;
...@@ -1509,9 +1510,8 @@ rhspin:npdTripleExists ...@@ -1509,9 +1510,8 @@ rhspin:npdTripleExists
1509 ] ; 1510 ] ;
1510 spin:constraint 1511 spin:constraint
1511 [ rdf:type spl:Argument ; 1512 [ rdf:type spl:Argument ;
1512 - rdfs:comment "The subject to find"^^xsd:string ; 1513 + rdfs:comment "The object to match."^^xsd:string ;
1513 - spl:predicate sp:arg1 ; 1514 + spl:predicate sp:arg3
1514 - spl:valueType rdfs:Resource
1515 ] ; 1515 ] ;
1516 spin:returnType xsd:boolean . 1516 spin:returnType xsd:boolean .
1517 1517
......