Changed the handling of substances so that there are no longer subclasses of flo…

…w by substance. Instead the material that flows is classified. The MPR has been upgraded. There are some minor incompatibilities with the DPR to fix.

@@ -25,6 +25,9 @@
 @prefix wellTest:  <http://www.reportinghub.no/ep/transform/1.0/mpr/wellTest#> .
 @prefix wellTest:  <http://www.reportinghub.no/ep/transform/1.0/mpr/wellTest#> .
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
 
 
+<http://www.reportinghub.no/ep/schema/production-activity#WaterSample>
+      rdfs:label "(temporal part of a) water sample"^^xsd:string .
+
 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector>
 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector>
       rdf:type owl:Ontology ;
       rdf:type owl:Ontology ;
       owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/1.0/mpr/wellTest> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/injectionTestResults> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumeReport-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-fluidSample-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/productionTestResults> ;
       owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/1.0/mpr/wellTest> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/injectionTestResults> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumeReport-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-fluidSample-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/productionTestResults> ;