David Leal

Minor bug fixes

...@@ -156,7 +156,7 @@ ep-dpr-spin-lib:buildChemicalTypeURI ...@@ -156,7 +156,7 @@ ep-dpr-spin-lib:buildChemicalTypeURI
156 sp:where ([ rdf:type sp:Bind ; 156 sp:where ([ rdf:type sp:Bind ;
157 sp:expression 157 sp:expression
158 [ rdf:type ep-spin-lib:buildURI ; 158 [ rdf:type ep-spin-lib:buildURI ;
159 - sp:arg1 "https://www.reportinghub.no/ep/data/chemical/" ; 159 + sp:arg1 "https://www.reportinghub.no/ep/data/chemicalType/" ;
160 sp:arg2 [ rdf:type ep-spin-lib:normalizeString ; 160 sp:arg2 [ rdf:type ep-spin-lib:normalizeString ;
161 sp:arg1 spin:_arg1 161 sp:arg1 spin:_arg1
162 ] 162 ]
...@@ -641,30 +641,13 @@ ep-dpr-spin-lib:buildProductionFlowName ...@@ -641,30 +641,13 @@ ep-dpr-spin-lib:buildProductionFlowName
641 ]) ; 641 ]) ;
642 sp:where ([ rdf:type sp:Bind ; 642 sp:where ([ rdf:type sp:Bind ;
643 sp:expression 643 sp:expression
644 - [ rdf:type sp:if ; 644 + [ rdf:type fn:concat ;
645 - sp:arg1 [ rdf:type sp:eq ;
646 - sp:arg1 spin:_arg3 ;
647 - sp:arg2 ""
648 - ] ;
649 - sp:arg2 [ rdf:type fn:concat ;
650 sp:arg1 spin:_arg1 ; 645 sp:arg1 spin:_arg1 ;
651 sp:arg2 "$" ; 646 sp:arg2 "$" ;
652 sp:arg3 [ rdf:type ep-spin-lib:normalizeString ; 647 sp:arg3 [ rdf:type ep-spin-lib:normalizeString ;
653 sp:arg1 spin:_arg2 648 sp:arg1 spin:_arg2
654 ] 649 ]
655 ] ; 650 ] ;
656 - sp:arg3 [ rdf:type fn:concat ;
657 - sp:arg1 spin:_arg1 ;
658 - sp:arg2 "$" ;
659 - sp:arg3 [ rdf:type ep-spin-lib:normalizeString ;
660 - sp:arg1 spin:_arg2
661 - ] ;
662 - sp:arg4 "$" ;
663 - sp:arg5 [ rdf:type ep-spin-lib:normalizeString ;
664 - sp:arg1 spin:_arg3
665 - ]
666 - ]
667 - ] ;
668 sp:variable 651 sp:variable
669 [ sp:varName "name"^^xsd:string 652 [ sp:varName "name"^^xsd:string
670 ] 653 ]
...@@ -681,12 +664,7 @@ ep-dpr-spin-lib:buildProductionFlowURI ...@@ -681,12 +664,7 @@ ep-dpr-spin-lib:buildProductionFlowURI
681 ]) ; 664 ]) ;
682 sp:where ([ rdf:type sp:Bind ; 665 sp:where ([ rdf:type sp:Bind ;
683 sp:expression 666 sp:expression
684 - [ rdf:type sp:if ; 667 + [ rdf:type ep-spin-lib:buildURI ;
685 - sp:arg1 [ rdf:type sp:eq ;
686 - sp:arg1 spin:_arg3 ;
687 - sp:arg2 ""
688 - ] ;
689 - sp:arg2 [ rdf:type ep-spin-lib:buildURI ;
690 sp:arg1 "https://www.reportinghub.no/ep/data/productionFlow/" ; 668 sp:arg1 "https://www.reportinghub.no/ep/data/productionFlow/" ;
691 sp:arg2 [ rdf:type fn:concat ; 669 sp:arg2 [ rdf:type fn:concat ;
692 sp:arg1 spin:_arg1 ; 670 sp:arg1 spin:_arg1 ;
...@@ -694,17 +672,6 @@ ep-dpr-spin-lib:buildProductionFlowURI ...@@ -694,17 +672,6 @@ ep-dpr-spin-lib:buildProductionFlowURI
694 sp:arg3 spin:_arg2 672 sp:arg3 spin:_arg2
695 ] 673 ]
696 ] ; 674 ] ;
697 - sp:arg3 [ rdf:type ep-spin-lib:buildURI ;
698 - sp:arg1 "https://www.reportinghub.no/ep/data/productionFlow/" ;
699 - sp:arg2 [ rdf:type fn:concat ;
700 - sp:arg1 spin:_arg1 ;
701 - sp:arg2 "$" ;
702 - sp:arg3 spin:_arg2 ;
703 - sp:arg4 "$" ;
704 - sp:arg5 spin:_arg3
705 - ]
706 - ]
707 - ] ;
708 sp:variable 675 sp:variable
709 [ sp:varName "uri"^^xsd:string 676 [ sp:varName "uri"^^xsd:string
710 ] 677 ]
...@@ -765,19 +732,12 @@ ep-dpr-spin-lib:buildProductionInventoryName ...@@ -765,19 +732,12 @@ ep-dpr-spin-lib:buildProductionInventoryName
765 ]) ; 732 ]) ;
766 sp:where ([ rdf:type sp:Bind ; 733 sp:where ([ rdf:type sp:Bind ;
767 sp:expression 734 sp:expression
768 - [ rdf:type sp:if ; 735 + [ rdf:type fn:concat ;
769 - sp:arg1 [ rdf:type sp:eq ;
770 - sp:arg1 spin:_arg2 ;
771 - sp:arg2 ""
772 - ] ;
773 - sp:arg2 spin:_arg1 ;
774 - sp:arg3 [ rdf:type fn:concat ;
775 sp:arg1 spin:_arg1 ; 736 sp:arg1 spin:_arg1 ;
776 sp:arg2 "$" ; 737 sp:arg2 "$" ;
777 sp:arg3 [ rdf:type ep-spin-lib:normalizeString ; 738 sp:arg3 [ rdf:type ep-spin-lib:normalizeString ;
778 sp:arg1 spin:_arg2 739 sp:arg1 spin:_arg2
779 ] 740 ]
780 - ]
781 ] ; 741 ] ;
782 sp:variable 742 sp:variable
783 [ sp:varName "name"^^xsd:string 743 [ sp:varName "name"^^xsd:string
...@@ -795,23 +755,13 @@ ep-dpr-spin-lib:buildProductionInventoryURI ...@@ -795,23 +755,13 @@ ep-dpr-spin-lib:buildProductionInventoryURI
795 ]) ; 755 ]) ;
796 sp:where ([ rdf:type sp:Bind ; 756 sp:where ([ rdf:type sp:Bind ;
797 sp:expression 757 sp:expression
798 - [ rdf:type sp:if ; 758 + [ rdf:type ep-spin-lib:buildURI ;
799 - sp:arg1 [ rdf:type sp:eq ;
800 - sp:arg1 spin:_arg2 ;
801 - sp:arg2 ""
802 - ] ;
803 - sp:arg2 [ rdf:type ep-spin-lib:buildURI ;
804 - sp:arg1 "https://www.reportinghub.no/ep/data/productionInventory/" ;
805 - sp:arg2 spin:_arg1
806 - ] ;
807 - sp:arg3 [ rdf:type ep-spin-lib:buildURI ;
808 sp:arg1 "https://www.reportinghub.no/ep/data/productionInventory/" ; 759 sp:arg1 "https://www.reportinghub.no/ep/data/productionInventory/" ;
809 sp:arg2 [ rdf:type fn:concat ; 760 sp:arg2 [ rdf:type fn:concat ;
810 sp:arg1 spin:_arg1 ; 761 sp:arg1 spin:_arg1 ;
811 sp:arg2 "$" ; 762 sp:arg2 "$" ;
812 sp:arg3 spin:_arg2 763 sp:arg3 spin:_arg2
813 ] 764 ]
814 - ]
815 ] ; 765 ] ;
816 sp:variable 766 sp:variable
817 [ sp:varName "uri"^^xsd:string 767 [ sp:varName "uri"^^xsd:string
...@@ -7553,59 +7503,59 @@ ep-dpr-spin-lib:selectWorkScale ...@@ -7553,59 +7503,59 @@ ep-dpr-spin-lib:selectWorkScale
7553 ]) 7503 ])
7554 ] . 7504 ] .
7555 7505
7556 -_:b10 7506 +_:b22
7557 - sp:varName "uri"^^xsd:string . 7507 + sp:varName "volumeFlowRateAtStdType"^^xsd:string .
7558 7508
7559 -_:b11 7509 +_:b21
7560 - sp:varName "uri"^^xsd:string . 7510 + sp:varName "specificVolumeScale"^^xsd:string .
7561 7511
7562 -_:b12 7512 +_:b20
7563 - sp:varName "uri"^^xsd:string . 7513 + sp:varName "safetyActivityType"^^xsd:string .
7564 7514
7565 -_:b13 7515 +_:b19
7566 - sp:varName "uri"^^xsd:string . 7516 + sp:varName "productionFlowPurposeType"^^xsd:string .
7567 7517
7568 -_:b14 7518 +_:b18
7569 - sp:varName "densityScale"^^xsd:string . 7519 + sp:varName "productionFlowDirectionRelationshipType"^^xsd:string .
7570 7520
7571 -_:b15 7521 +_:b17
7572 - sp:varName "productionFacilityType"^^xsd:string . 7522 + sp:varName "productionFlowDirectionRelationshipType"^^xsd:string .
7573 7523
7574 _:b16 7524 _:b16
7575 sp:varName "productionFlowDefinitionType"^^xsd:string . 7525 sp:varName "productionFlowDefinitionType"^^xsd:string .
7576 7526
7577 -_:b17 7527 +_:b15
7578 - sp:varName "productionFlowDirectionRelationshipType"^^xsd:string . 7528 + sp:varName "productionFacilityType"^^xsd:string .
7579 7529
7580 -_:b18 7530 +_:b14
7581 - sp:varName "productionFlowDirectionRelationshipType"^^xsd:string . 7531 + sp:varName "densityScale"^^xsd:string .
7582 7532
7583 -_:b19 7533 +_:b13
7584 - sp:varName "productionFlowPurposeType"^^xsd:string . 7534 + sp:varName "uri"^^xsd:string .
7585 7535
7586 -_:b20 7536 +_:b12
7587 - sp:varName "safetyActivityType"^^xsd:string . 7537 + sp:varName "uri"^^xsd:string .
7588 7538
7589 -_:b21 7539 +_:b11
7590 - sp:varName "specificVolumeScale"^^xsd:string . 7540 + sp:varName "uri"^^xsd:string .
7591 7541
7592 -_:b22 7542 +_:b10
7593 - sp:varName "volumeFlowRateAtStdType"^^xsd:string . 7543 + sp:varName "uri"^^xsd:string .
7594 7544
7595 -_:b1 sp:varName "uri"^^xsd:string . 7545 +_:b9 sp:varName "uri"^^xsd:string .
7596 7546
7597 -_:b2 sp:varName "UUID"^^xsd:string . 7547 +_:b8 sp:varName "uri"^^xsd:string .
7598 7548
7599 -_:b3 sp:varName "uri"^^xsd:string . 7549 +_:b7 sp:varName "uri"^^xsd:string .
7600 7550
7601 -_:b4 sp:varName "uri"^^xsd:string . 7551 +_:b6 sp:varName "uri"^^xsd:string .
7602 7552
7603 _:b5 sp:varName "uri"^^xsd:string . 7553 _:b5 sp:varName "uri"^^xsd:string .
7604 7554
7605 -_:b6 sp:varName "uri"^^xsd:string . 7555 +_:b4 sp:varName "uri"^^xsd:string .
7606 7556
7607 -_:b7 sp:varName "uri"^^xsd:string . 7557 +_:b3 sp:varName "uri"^^xsd:string .
7608 7558
7609 -_:b8 sp:varName "uri"^^xsd:string . 7559 +_:b2 sp:varName "UUID"^^xsd:string .
7610 7560
7611 -_:b9 sp:varName "uri"^^xsd:string . 7561 +_:b1 sp:varName "uri"^^xsd:string .
......