Merge pull request #138 from OP-TED/feature/TEDSWS-358_fix-rml-ref

schivmeister · web-flow · commit 7bcc1fc9267f · 2025-07-14T16:27:08.000+06:00
[TEDSWS-358] Fix BT-541-LotsGroup-ThresholdNumber rr:child -&gt; rml:reference
diff --git a/mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.3_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.3_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.5_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.5_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.6_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.6_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.7_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.7_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.8_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.8_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/mappings/package_eforms_sdk1.9_epo4.0/transformation/mappings/LotGroup.rml.ttl b/mappings/package_eforms_sdk1.9_epo4.0/transformation/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/src/mappings/LotGroup.rml.ttl b/src/mappings/LotGroup.rml.ttl
@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo
             rr:predicate epo:hasThresholdValue ;
             rr:objectMap
                 [
-                    rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
+                    rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;
                     rr:datatype xsd:decimal;
                 ]
         ] ;
diff --git a/test_data/sampling_eforms_all_cn/eforms-sdk-1.12/op-test-eforms2/2025-OJS054-00173230.xml b/test_data/sampling_eforms_all_cn/eforms-sdk-1.12/op-test-eforms2/2025-OJS054-00173230.xml

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lo`
`611`	`611`	`rr:predicate epo:hasThresholdValue ;`
`612`	`612`	`rr:objectMap`
`613`	`613`	`[`
`614`		`- rr:child "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;`
	`614`	`+ rml:reference "if(not(exists(efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']) and efbc:ParameterNumeric/text() = '-1' )) then efbc:ParameterNumeric else null" ;`
`615`	`615`	`rr:datatype xsd:decimal;`
`616`	`616`	`]`
`617`	`617`	`] ;`