Minor cleaning.

anskaffelser · Oct 19, 2018 · 342dbee · 342dbee
1 parent 06a6a2d
commit 342dbee
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 94 deletions.
diff --git a/project.xml b/project.xml
@@ -59,7 +59,7 @@
         <Title>Empty elements</Title>
         <Tag>get-evidence-1.0</Tag>
     </Resource>
-    <Resource>
+    <!-- <Resource>
         <Identifier>ge-request</Identifier>
         <Type>native:Schematron</Type>
         <Path>rules/get-evidence-1.0/sch/EHF-GE-REQUEST.sch</Path>
@@ -70,7 +70,7 @@
         <Type>native:Schematron</Type>
         <Path>rules/get-evidence-1.0/sch/EHF-GE-RESPONSE.sch</Path>
         <Tag>get-evidence-1.0</Tag>
-    </Resource>
+    </Resource> -->
 
     <!-- Files -->
     <Resource>

diff --git a/rules/get-evidence-1.0/buildconfig.xml b/rules/get-evidence-1.0/buildconfig.xml
@@ -2,20 +2,20 @@
 <buildConfigurations xmlns="http://difi.no/xsd/vefa/validator/1.0">
 
     <testfolder>unit-EHF</testfolder>
-<!--    <testfolder>snippets</testfolder>-->
-<!--    <testfolder>example</testfolder>-->
+    <testfolder>snippets</testfolder>
+    <testfolder>example</testfolder>
 
     <configuration>
         <identifier>ehf-ge-request-1.0</identifier>
-        <title>EHF GetEvidence request 1.0 </title>
+        <title>EHF Get Evidence Request 1.0 </title>
         <profileId>urn:fdc:difi.no:2017:ehf:profile:01:1.0</profileId>
         <customizationId>urn:fdc:difi.no:2017:ehf:getevidence:1.0</customizationId>
         <file source="sch/EHF-GE-REQUEST.sch" path="xsl/EHF-GE-REQUEST.xsl"  />
     </configuration>
 
     <configuration>
         <identifier>ehf-ge-response-1.0</identifier>
-        <title>EHF GetEvidence response 1.0</title>
+        <title>EHF Get Evidence Response 1.0</title>
         <profileId>urn:fdc:difi.no:2017:ehf:profile:01:1.0</profileId>
         <customizationId>urn:fdc:difi.no:2017:ehf:getevidence:1.0</customizationId>
         <file source="sch/EHF-GE-RESPONSE.sch" path="xsl/EHF-GE-RESPONSE.xsl"  />

diff --git a/rules/get-evidence-1.0/example/request-full-example.xml b/rules/get-evidence-1.0/example/request-full-example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ge-req:QualificationApplicationRequest 
-    xmlns:ge-req ="urn:oasis:names:specification:ubl:schema:xsd:QualificationApplicationRequest-2"
+    xmlns:ge-req="urn:oasis:names:specification:ubl:schema:xsd:QualificationApplicationRequest-2"
     xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2"
@@ -43,7 +43,7 @@
     <cac:EconomicOperatorParty>
         <cac:Party>
             <cac:PartyIdentification>
-                <cbc:ID schemeID="0192">999999956</cbc:ID>             
+                <cbc:ID schemeID="0192">999999956</cbc:ID>
             </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>TenderCompany AS</cbc:Name>

diff --git a/rules/get-evidence-1.0/sch/EHF-GE-RESPONSE.sch b/rules/get-evidence-1.0/sch/EHF-GE-RESPONSE.sch
@@ -2,7 +2,7 @@
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" schemaVersion="iso" queryBinding="xslt2"
         xmlns:u="utils" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-    <title>EHF Get Evidence Request</title>
+    <title>EHF Get Evidence Response</title>
 
     <ns prefix="cac" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"/>
     <ns prefix="cbc" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"/>

diff --git a/rules/get-evidence-1.0/snippets/request-1.xml b/rules/get-evidence-1.0/snippets/request-1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ge-req:QualificationApplicationRequest 
-    xmlns:ge-req ="urn:oasis:names:specification:ubl:schema:xsd:QualificationApplicationRequest-2"
+    xmlns:ge-req="urn:oasis:names:specification:ubl:schema:xsd:QualificationApplicationRequest-2"
     xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2"

diff --git a/structure/syntax/QualificationReceptionConfirmation.xml b/structure/syntax/QualificationReceptionConfirmation.xml
@@ -182,7 +182,7 @@
                     <Name>External reference</Name>
 
                     <Element cardinality="0..1">
-                        <Term>aba:DocumentHash</Term>
+                        <Term>cbc:DocumentHash</Term>
                         <Name>Qualification document digest</Name>
                         <Description>Digest of the document.</Description>
                     </Element>

diff --git a/structure/syntax/get-evidence-request.xml b/structure/syntax/get-evidence-request.xml
@@ -5,7 +5,7 @@
     <Name>EHF Get Evidence Request</Name>
     <Description>Document type used to request evidences.</Description>
 
-    <Property key="sch:prefix">EHF-GetEvidence-REQ</Property>
+    <Property key="sch:prefix">EHF-GE-REQ</Property>
     <Property key="sch:identifier">request-basic</Property>
 
     <Namespace prefix="ge-req">urn:oasis:names:specification:ubl:schema:xsd:QualificationApplicationRequest-2</Namespace>
@@ -20,7 +20,7 @@
         <Name>EHF Get Evidence Request document</Name>
 
         <Include>part/responder.xml</Include>
-   
+
         <Element>
             <Term>cbc:CustomizationID</Term>
             <Name>Customization Identifier</Name>
@@ -41,7 +41,7 @@
         <Element>
             <Term>cbc:ID</Term>
             <Name>Document identifier</Name>
-            <Description>An identification of the specification containing the total set of rules regarding semantic content, cardinalities and business rules to which the data contained in the instance document conforms. 
+            <Description>An identification of the specification containing the total set of rules regarding semantic content, cardinalities and business rules to which the data contained in the instance document conforms.
                 The identification may include the version of the specification as well as any customizations applied. Use UUID (universally unique identifier), version 4</Description>
             <DataType>Identifier</DataType>
             <Value type="EXAMPLE">8a6e9c28-628d-4e64-8a1a-367c8973ff2a</Value>
@@ -60,7 +60,7 @@
                 <Value type="EXAMPLE">NGOJ</Value>
             </Attribute>
             <Value type="EXAMPLE">18/00001</Value>
-         
+
         </Element>
 
         <Element>
@@ -71,10 +71,9 @@
             <Value type="EXAMPLE">2017-12-26</Value>
         </Element>
 
-
         <Include>part/contracting-party.xml</Include>
-        <Include>part/eo-party.xml</Include>
 
+        <Include>part/eo-party.xml</Include>
 
         <Element>
             <Term>cac:TenderingCriterion</Term>
@@ -90,7 +89,7 @@
                 <DataType>Identifier</DataType>
                 <Value type="EXAMPLE">CRITERION.SELECTION.SUITABILITY.TRADE_REGISTER_ENROLMENT</Value>
             </Element>
-         
+
 
             <Element cardinality="1..n">
                 <Term>cac:TenderingCriterionPropertyGroup</Term>