David Price

Merge branch 'jul23-10pm'

...@@ -761,521 +761,6 @@ mpr-tables:CargoOwnership ...@@ -761,521 +761,6 @@ mpr-tables:CargoOwnership
761 ] ; 761 ] ;
762 rhspin:tableHeaders ("Facility"^^xsd:string "Cargo Number"^^xsd:string "Cargo Batch"^^xsd:string "Owner"^^xsd:string "Share"^^xsd:string) . 762 rhspin:tableHeaders ("Facility"^^xsd:string "Cargo Number"^^xsd:string "Cargo Batch"^^xsd:string "Owner"^^xsd:string "Share"^^xsd:string) .
763 763
764 -mpr-tables:Cargo_1
765 - rdf:type rhspin:TableTemplate ;
766 - rdfs:label "Cargo Information 1"^^xsd:string ;
767 - rdfs:subClassOf rhspin:MPRGTableTemplates ;
768 - spin:body
769 - [ rdf:type sp:Select ;
770 - sp:orderBy ([ sp:varName "facilityName"^^xsd:string
771 - ] [ sp:varName "purposeTypeName"^^xsd:string
772 - ]) ;
773 - sp:resultVariables ([ sp:varName "facilityName"^^xsd:string
774 - ] [ sp:varName "purposeTypeName"^^xsd:string
775 - ] [ sp:varName "materialTypeName"^^xsd:string
776 - ] [ sp:varName "definitionTypeName"^^xsd:string
777 - ] [ sp:varName "movementType"^^xsd:string
778 - ] [ sp:varName "cargoNumber"^^xsd:string
779 - ] [ sp:varName "cargoBatchNumber"^^xsd:string
780 - ] [ sp:varName "billOfLadingDate"^^xsd:string
781 - ] [ sp:varName "volumeValue"^^xsd:string
782 - ] [ sp:varName "massValue"^^xsd:string
783 - ] [ sp:varName "densityValue"^^xsd:string
784 - ] [ sp:varName "shipperName"^^xsd:string
785 - ] [ sp:varName "destinationName"^^xsd:string
786 - ] [ sp:varName "countryName"^^xsd:string
787 - ] [ sp:varName "ownerName"^^xsd:string
788 - ] [ sp:varName "ownedPercent"^^xsd:string
789 - ]) ;
790 - sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
791 - sp:predicate rdf:type ;
792 - sp:subject
793 - [ sp:varName "productionReport"^^xsd:string
794 - ]
795 - ] [ sp:object
796 - [ sp:varName "productionReport"^^xsd:string
797 - ] ;
798 - sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ;
799 - sp:subject
800 - [ sp:varName "productVolumeReport"^^xsd:string
801 - ]
802 - ] [ sp:object <http://www.reportinghub.no/ep/schema/report#ProductVolumeReport> ;
803 - sp:predicate rdf:type ;
804 - sp:subject
805 - [ sp:varName "productVolumeReport"^^xsd:string
806 - ]
807 - ] [ sp:object
808 - [ sp:varName "productionFlowNetwork"^^xsd:string
809 - ] ;
810 - sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
811 - sp:subject
812 - [ sp:varName "productVolumeReport"^^xsd:string
813 - ]
814 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
815 - sp:predicate rdf:type ;
816 - sp:subject
817 - [ sp:varName "productionFlowNetwork"^^xsd:string
818 - ]
819 - ] [ sp:object
820 - [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
821 - ] ;
822 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasNetworkPart> ;
823 - sp:subject
824 - [ sp:varName "productionFlowNetwork"^^xsd:string
825 - ]
826 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
827 - sp:predicate rdf:type ;
828 - sp:subject
829 - [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
830 - ]
831 - ] [ sp:object
832 - [ sp:varName "productionFlowWhole"^^xsd:string
833 - ] ;
834 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
835 - sp:subject
836 - [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
837 - ]
838 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
839 - sp:predicate rdf:type ;
840 - sp:subject
841 - [ sp:varName "productionFlowWhole"^^xsd:string
842 - ]
843 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#HydrocarbonAccountingFlow> ;
844 - sp:predicate rdf:type ;
845 - sp:subject
846 - [ sp:varName "productionFlowWhole"^^xsd:string
847 - ]
848 - ] [ sp:object
849 - [ sp:varName "productionFlowFacility"^^xsd:string
850 - ] ;
851 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
852 - sp:subject
853 - [ sp:varName "productionFlowWhole"^^xsd:string
854 - ]
855 - ] [ sp:object
856 - [ sp:varName "facilityName"^^xsd:string
857 - ] ;
858 - sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
859 - sp:subject
860 - [ sp:varName "productionFlowFacility"^^xsd:string
861 - ]
862 - ] [ sp:object
863 - [ sp:varName "productionFlowMixedPart"^^xsd:string
864 - ] ;
865 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
866 - sp:subject
867 - [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
868 - ]
869 - ] [ sp:object
870 - [ sp:varName "productionFlowMixedPart"^^xsd:string
871 - ] ;
872 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
873 - sp:subject
874 - [ sp:varName "productFlowInMonth"^^xsd:string
875 - ]
876 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductFlow> ;
877 - sp:predicate rdf:type ;
878 - sp:subject
879 - [ sp:varName "productFlowInMonth"^^xsd:string
880 - ]
881 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ;
882 - sp:predicate rdf:type ;
883 - sp:subject
884 - [ sp:varName "productFlowInMonth"^^xsd:string
885 - ]
886 - ] [ sp:object
887 - [ sp:varName "materialFlowedInMonth"^^xsd:string
888 - ] ;
889 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialThatFlows> ;
890 - sp:subject
891 - [ sp:varName "productFlowInMonth"^^xsd:string
892 - ]
893 - ] [ sp:object
894 - [ sp:varName "materialFlowedInMonth"^^xsd:string
895 - ] ;
896 - sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
897 - sp:subject
898 - [ sp:varName "spatialPartOfMaterialFlowedInMonth"^^xsd:string
899 - ]
900 - ] [ sp:object
901 - [ sp:varName "spatialPartOfMaterialFlowedInMonth"^^xsd:string
902 - ] ;
903 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
904 - sp:subject
905 - [ sp:varName "movedProduct"^^xsd:string
906 - ]
907 - ] [ sp:object
908 - [ sp:varName "movedProduct"^^xsd:string
909 - ] ;
910 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#movedProduct> ;
911 - sp:subject
912 - [ sp:varName "movementOfProduct"^^xsd:string
913 - ]
914 - ] [ sp:object
915 - [ sp:varName "massQuantity"^^xsd:string
916 - ] ;
917 - sp:predicate rdf:type ;
918 - sp:subject
919 - [ sp:varName "movedProduct"^^xsd:string
920 - ]
921 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mass> ;
922 - sp:predicate rdf:type ;
923 - sp:subject
924 - [ sp:varName "massQuantity"^^xsd:string
925 - ]
926 - ] [ rdf:type sp:Bind ;
927 - sp:expression
928 - [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
929 - sp:arg1 [ sp:varName "massQuantity"^^xsd:string
930 - ]
931 - ] ;
932 - sp:variable
933 - [ sp:varName "massValue"^^xsd:string
934 - ]
935 - ] [ sp:object
936 - [ sp:varName "movedProduct"^^xsd:string
937 - ] ;
938 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
939 - sp:subject
940 - [ sp:varName "volumeOfMovedProduct"^^xsd:string
941 - ]
942 - ] [ sp:object
943 - [ sp:varName "volumeQuantity"^^xsd:string
944 - ] ;
945 - sp:predicate rdf:type ;
946 - sp:subject
947 - [ sp:varName "volumeOfMovedProduct"^^xsd:string
948 - ]
949 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ;
950 - sp:predicate rdf:type ;
951 - sp:subject
952 - [ sp:varName "volumeQuantity"^^xsd:string
953 - ]
954 - ] [ rdf:type sp:Bind ;
955 - sp:expression
956 - [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
957 - sp:arg1 [ sp:varName "volumeQuantity"^^xsd:string
958 - ]
959 - ] ;
960 - sp:variable
961 - [ sp:varName "volumeValue"^^xsd:string
962 - ]
963 - ] [ sp:object
964 - [ sp:varName "movedProduct"^^xsd:string
965 - ] ;
966 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
967 - sp:subject
968 - [ sp:varName "densityOfMovedProduct"^^xsd:string
969 - ]
970 - ] [ sp:object
971 - [ sp:varName "densityQuantity"^^xsd:string
972 - ] ;
973 - sp:predicate rdf:type ;
974 - sp:subject
975 - [ sp:varName "densityOfMovedProduct"^^xsd:string
976 - ]
977 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
978 - sp:predicate rdf:type ;
979 - sp:subject
980 - [ sp:varName "densityQuantity"^^xsd:string
981 - ]
982 - ] [ rdf:type sp:Bind ;
983 - sp:expression
984 - [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
985 - sp:arg1 [ sp:varName "densityQuantity"^^xsd:string
986 - ]
987 - ] ;
988 - sp:variable
989 - [ sp:varName "densityValue"^^xsd:string
990 - ]
991 - ] [ sp:object
992 - [ sp:varName "cargoNumber"^^xsd:string
993 - ] ;
994 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoNumber> ;
995 - sp:subject
996 - [ sp:varName "movedProduct"^^xsd:string
997 - ]
998 - ] [ sp:object
999 - [ sp:varName "cargoBatchNumber"^^xsd:string
1000 - ] ;
1001 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoBatchNumber> ;
1002 - sp:subject
1003 - [ sp:varName "movedProduct"^^xsd:string
1004 - ]
1005 - ] [ sp:object
1006 - [ sp:varName "secondOfPair"^^xsd:string
1007 - ] ;
1008 - sp:predicate rdf:type ;
1009 - sp:subject
1010 - [ sp:varName "movedProduct"^^xsd:string
1011 - ]
1012 - ] [ sp:object
1013 - [ sp:varName "secondOfPair"^^xsd:string
1014 - ] ;
1015 - sp:predicate <http://www.reportinghub.no/ep/schema/core#secondOfPair> ;
1016 - sp:subject
1017 - [ sp:varName "volumePair"^^xsd:string
1018 - ]
1019 - ] [ sp:object
1020 - [ sp:varName "firstOfPair"^^xsd:string
1021 - ] ;
1022 - sp:predicate <http://www.reportinghub.no/ep/schema/core#firstOfPair> ;
1023 - sp:subject
1024 - [ sp:varName "volumePair"^^xsd:string
1025 - ]
1026 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ;
1027 - sp:predicate rdf:type ;
1028 - sp:subject
1029 - [ sp:varName "firstOfPair"^^xsd:string
1030 - ]
1031 - ] [ sp:object
1032 - [ sp:varName "ratio"^^xsd:string
1033 - ] ;
1034 - sp:predicate <http://www.reportinghub.no/ep/schema/core#divide> ;
1035 - sp:subject
1036 - [ sp:varName "volumePair"^^xsd:string
1037 - ]
1038 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Ratio> ;
1039 - sp:predicate rdf:type ;
1040 - sp:subject
1041 - [ sp:varName "ratio"^^xsd:string
1042 - ]
1043 - ] [ rdf:type sp:Bind ;
1044 - sp:expression
1045 - [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1046 - sp:arg1 [ sp:varName "ratio"^^xsd:string
1047 - ]
1048 - ] ;
1049 - sp:variable
1050 - [ sp:varName "ownedPercent"^^xsd:string
1051 - ]
1052 - ] [ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
1053 - sp:predicate rdf:type ;
1054 - sp:subject
1055 - [ sp:varName "quantityOfMaterial"^^xsd:string
1056 - ]
1057 - ] [ sp:object
1058 - [ sp:varName "firstOfPair"^^xsd:string
1059 - ] ;
1060 - sp:predicate rdf:type ;
1061 - sp:subject
1062 - [ sp:varName "quantityOfMaterial"^^xsd:string
1063 - ]
1064 - ] [ sp:object
1065 - [ sp:varName "owner"^^xsd:string
1066 - ] ;
1067 - sp:predicate <http://www.reportinghub.no/ep/schema/organization#owner> ;
1068 - sp:subject
1069 - [ sp:varName "quantityOfMaterial"^^xsd:string
1070 - ]
1071 - ] [ sp:object
1072 - [ sp:varName "company"^^xsd:string
1073 - ] ;
1074 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
1075 - sp:subject
1076 - [ sp:varName "owner"^^xsd:string
1077 - ]
1078 - ] [ rdf:type sp:TriplePath ;
1079 - sp:object
1080 - [ sp:varName "ownerName"^^xsd:string
1081 - ] ;
1082 - sp:path [ rdf:type sp:AltPath ;
1083 - sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
1084 - sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
1085 - ] ;
1086 - sp:subject
1087 - [ sp:varName "company"^^xsd:string
1088 - ]
1089 - ] [ rdf:type sp:Optional ;
1090 - sp:elements ([ sp:object
1091 - [ sp:varName "productionFlowPurposeType"^^xsd:string
1092 - ] ;
1093 - sp:predicate rdf:type ;
1094 - sp:subject
1095 - [ sp:varName "productionFlowWhole"^^xsd:string
1096 - ]
1097 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
1098 - sp:predicate rdf:type ;
1099 - sp:subject
1100 - [ sp:varName "productionFlowPurposeType"^^xsd:string
1101 - ]
1102 - ] [ sp:object
1103 - [ sp:varName "purposeTypeName"^^xsd:string
1104 - ] ;
1105 - sp:predicate rdfs:label ;
1106 - sp:subject
1107 - [ sp:varName "productionFlowPurposeType"^^xsd:string
1108 - ]
1109 - ])
1110 - ] [ rdf:type sp:Optional ;
1111 - sp:elements ([ sp:object
1112 - [ sp:varName "productionFlowDefinitionType"^^xsd:string
1113 - ] ;
1114 - sp:predicate rdf:type ;
1115 - sp:subject
1116 - [ sp:varName "productionFlowWhole"^^xsd:string
1117 - ]
1118 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
1119 - sp:predicate rdf:type ;
1120 - sp:subject
1121 - [ sp:varName "productionFlowDefinitionType"^^xsd:string
1122 - ]
1123 - ] [ sp:object
1124 - [ sp:varName "definitionTypeName"^^xsd:string
1125 - ] ;
1126 - sp:predicate rdfs:label ;
1127 - sp:subject
1128 - [ sp:varName "productionFlowDefinitionType"^^xsd:string
1129 - ]
1130 - ])
1131 - ] [ rdf:type sp:Optional ;
1132 - sp:elements ([ sp:object
1133 - [ sp:varName "destination"^^xsd:string
1134 - ] ;
1135 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#destination> ;
1136 - sp:subject
1137 - [ sp:varName "movementOfProduct"^^xsd:string
1138 - ]
1139 - ] [ rdf:type sp:Optional ;
1140 - sp:elements ([ sp:object
1141 - [ sp:varName "destinationName"^^xsd:string
1142 - ] ;
1143 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
1144 - sp:subject
1145 - [ sp:varName "destination"^^xsd:string
1146 - ]
1147 - ])
1148 - ] [ rdf:type sp:Optional ;
1149 - sp:elements ([ sp:object
1150 - [ sp:varName "country"^^xsd:string
1151 - ] ;
1152 - sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
1153 - sp:subject
1154 - [ sp:varName "destination"^^xsd:string
1155 - ]
1156 - ] [ sp:object
1157 - [ sp:varName "countryName"^^xsd:string
1158 - ] ;
1159 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
1160 - sp:subject
1161 - [ sp:varName "country"^^xsd:string
1162 - ]
1163 - ])
1164 - ] [ rdf:type sp:Optional ;
1165 - sp:elements ([ rdf:type sp:TriplePath ;
1166 - sp:object
1167 - [ sp:varName "destinationName"^^xsd:string
1168 - ] ;
1169 - sp:path [ rdf:type sp:AltPath ;
1170 - sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
1171 - sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
1172 - ] ;
1173 - sp:subject
1174 - [ sp:varName "destination"^^xsd:string
1175 - ]
1176 - ])
1177 - ])
1178 - ] [ rdf:type sp:Optional ;
1179 - sp:elements ([ sp:object
1180 - [ sp:varName "shipperPart"^^xsd:string
1181 - ] ;
1182 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#shipper> ;
1183 - sp:subject
1184 - [ sp:varName "movementOfProduct"^^xsd:string
1185 - ]
1186 - ] [ sp:object
1187 - [ sp:varName "shipper"^^xsd:string
1188 - ] ;
1189 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
1190 - sp:subject
1191 - [ sp:varName "shipperPart"^^xsd:string
1192 - ]
1193 - ] [ rdf:type sp:TriplePath ;
1194 - sp:object
1195 - [ sp:varName "shipperName"^^xsd:string
1196 - ] ;
1197 - sp:path [ rdf:type sp:AltPath ;
1198 - sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
1199 - sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
1200 - ] ;
1201 - sp:subject
1202 - [ sp:varName "shipper"^^xsd:string
1203 - ]
1204 - ])
1205 - ] [ rdf:type sp:Optional ;
1206 - sp:elements ([ sp:object
1207 - [ sp:varName "productFlowWhole"^^xsd:string
1208 - ] ;
1209 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
1210 - sp:subject
1211 - [ sp:varName "productionFlowMixedPart"^^xsd:string
1212 - ]
1213 - ] [ sp:object
1214 - [ sp:varName "productFlowMaterialType"^^xsd:string
1215 - ] ;
1216 - sp:predicate rdf:type ;
1217 - sp:subject
1218 - [ sp:varName "productFlowWhole"^^xsd:string
1219 - ]
1220 - ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
1221 - sp:predicate rdf:type ;
1222 - sp:subject
1223 - [ sp:varName "productFlowMaterialType"^^xsd:string
1224 - ]
1225 - ] [ sp:object
1226 - [ sp:varName "materialTypeName"^^xsd:string
1227 - ] ;
1228 - sp:predicate rdfs:label ;
1229 - sp:subject
1230 - [ sp:varName "productFlowMaterialType"^^xsd:string
1231 - ]
1232 - ])
1233 - ] [ rdf:type sp:Optional ;
1234 - sp:elements ([ sp:object
1235 - [ sp:varName "movementOfProductType"^^xsd:string
1236 - ] ;
1237 - sp:predicate rdf:type ;
1238 - sp:subject
1239 - [ sp:varName "movementOfProduct"^^xsd:string
1240 - ]
1241 - ] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#MovementOfProductType> ;
1242 - sp:predicate rdf:type ;
1243 - sp:subject
1244 - [ sp:varName "movementOfProductType"^^xsd:string
1245 - ]
1246 - ] [ sp:object
1247 - [ sp:varName "movementType"^^xsd:string
1248 - ] ;
1249 - sp:predicate rdfs:label ;
1250 - sp:subject
1251 - [ sp:varName "movementOfProductType"^^xsd:string
1252 - ]
1253 - ])
1254 - ] [ rdf:type sp:Optional ;
1255 - sp:elements ([ sp:object
1256 - [ sp:varName "billOfLading"^^xsd:string
1257 - ] ;
1258 - sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
1259 - sp:subject
1260 - [ sp:varName "movementOfProduct"^^xsd:string
1261 - ]
1262 - ] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#IssueBillOfLading> ;
1263 - sp:predicate rdf:type ;
1264 - sp:subject
1265 - [ sp:varName "billOfLading"^^xsd:string
1266 - ]
1267 - ] [ sp:object
1268 - [ sp:varName "billOfLadingDate"^^xsd:string
1269 - ] ;
1270 - sp:predicate <http://www.reportinghub.no/ep/schema/activity#nominallyAt> ;
1271 - sp:subject
1272 - [ sp:varName "billOfLading"^^xsd:string
1273 - ]
1274 - ])
1275 - ])
1276 - ] ;
1277 - rhspin:tableHeaders ("Facility"^^xsd:string "Purpose"^^xsd:string "Material"^^xsd:string "Flow type"^^xsd:string "Movement Type"^^xsd:string "Cargo Number"^^xsd:string "Cargo Batch"^^xsd:string "Bill of Lading"^^xsd:string "Volume"^^xsd:string "Mass"^^xsd:string "Density"^^xsd:string "Shipper"^^xsd:string "Destination"^^xsd:string "Country"^^xsd:string "Owner"^^xsd:string "Share"^^xsd:string) .
1278 -
1279 mpr-tables:FluidSampleAnalysisResults 764 mpr-tables:FluidSampleAnalysisResults
1280 rdf:type rhspin:TableTemplate ; 765 rdf:type rhspin:TableTemplate ;
1281 rdfs:label "Fluid Sample Analysis Results"^^xsd:string ; 766 rdfs:label "Fluid Sample Analysis Results"^^xsd:string ;
......
...@@ -178,8 +178,6 @@ OPTIONAL { ...@@ -178,8 +178,6 @@ OPTIONAL {
178 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" /> 178 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" />
179 179
180 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" /> 180 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
181 -
182 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" />
183 181
184 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" /> 182 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" />
185 183
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
17 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 17 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
18 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 18 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
19 19
20 -<file:///www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/tqedits/MIKKEL-MONTH_2012-01-01_final-mprg-cargo.xml#r-2-2-1> 20 +<file:///www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/tqedits/MIKKEL-MONTH_2012-01-01_final-mprg-cargo.xml#r-2-2-1-3>
21 - rdfs:label "STEP 20301a" . 21 + rdfs:label "20400e" .
22 22
23 <http://www.reportinghub.no/data/erh/Field-1630514-Flow-MIKKEL_ALLOCATED_TANKLIFT> 23 <http://www.reportinghub.no/data/erh/Field-1630514-Flow-MIKKEL_ALLOCATED_TANKLIFT>
24 ep-flow:hasMixedPart 24 ep-flow:hasMixedPart
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
31 rdf:type ep-fac:ProductionFacility . 31 rdf:type ep-fac:ProductionFacility .
32 32
33 <http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/test-results/triples/MIKKEL-MONTH_2012-01-01_final-mprg-cargo> 33 <http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/test-results/triples/MIKKEL-MONTH_2012-01-01_final-mprg-cargo>
34 - rdf:type owl:Ontology ;
35 owl:imports <http://www.reportinghub.no/data/erh> , <http://www.reportinghub.no/ep/schema/1.0/production> ; 34 owl:imports <http://www.reportinghub.no/data/erh> , <http://www.reportinghub.no/ep/schema/1.0/production> ;
36 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 35 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
37 36
...@@ -57,6 +56,10 @@ ...@@ -57,6 +56,10 @@
57 rdf:type ep-org:Organization ; 56 rdf:type ep-org:Organization ;
58 ep-core:name "STATOIL"^^xsd:string . 57 ep-core:name "STATOIL"^^xsd:string .
59 58
59 +<https://www.reportinghub.no/ep/data/organization/TOTAL>
60 + rdf:type ep-org:Organization ;
61 + ep-core:name "TOTAL"^^xsd:string .
62 +
60 <https://www.reportinghub.no/ep/data/productionReport/FIELD-1630514$2012-01-01$2012-01-31> 63 <https://www.reportinghub.no/ep/data/productionReport/FIELD-1630514$2012-01-01$2012-01-31>
61 rdf:type ep-report:FinalVersionOfAReport , ep-report:MonthlyProductionReport , ep-report:MonthlyProductionReportGovernment , ep-report:ProductionReport , ep-report:Report , <https://www.reportinghub.no/ep/data/productionReportKind/COPEX> ; 64 rdf:type ep-report:FinalVersionOfAReport , ep-report:MonthlyProductionReport , ep-report:MonthlyProductionReportGovernment , ep-report:ProductionReport , ep-report:Report , <https://www.reportinghub.no/ep/data/productionReportKind/COPEX> ;
62 ep-core:name "ÅSGARD"^^xsd:string ; 65 ep-core:name "ÅSGARD"^^xsd:string ;
...@@ -332,7 +335,9 @@ _:b2 rdf:type ep-material:QuantityOfMaterial , _:b6 ; ...@@ -332,7 +335,9 @@ _:b2 rdf:type ep-material:QuantityOfMaterial , _:b6 ;
332 ep-prodact:movedProduct 335 ep-prodact:movedProduct
333 _:b2 ; 336 _:b2 ;
334 ep-prodact:shipper 337 ep-prodact:shipper
335 - [ rdf:type ep-org:Organization 338 + [ rdf:type ep-org:Organization ;
339 + ep-core:temporalPartOf
340 + <https://www.reportinghub.no/ep/data/organization/TOTAL>
336 ] . 341 ] .
337 342
338 _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ; 343 _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ;
...@@ -379,7 +384,9 @@ _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ; ...@@ -379,7 +384,9 @@ _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ;
379 ep-prodact:movedProduct 384 ep-prodact:movedProduct
380 _:b3 ; 385 _:b3 ;
381 ep-prodact:shipper 386 ep-prodact:shipper
382 - [ rdf:type ep-org:Organization 387 + [ rdf:type ep-org:Organization ;
388 + ep-core:temporalPartOf
389 + <https://www.reportinghub.no/ep/data/organization/STATOIL>
383 ] . 390 ] .
384 391
385 _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ; 392 _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ;
...@@ -439,7 +446,9 @@ _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ; ...@@ -439,7 +446,9 @@ _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ;
439 ep-prodact:movedProduct 446 ep-prodact:movedProduct
440 _:b4 ; 447 _:b4 ;
441 ep-prodact:shipper 448 ep-prodact:shipper
442 - [ rdf:type ep-org:Organization 449 + [ rdf:type ep-org:Organization ;
450 + ep-core:temporalPartOf
451 + <https://www.reportinghub.no/ep/data/organization/ENI_NORGE>
443 ] . 452 ] .
444 453
445 _:b14 454 _:b14
......