Merge pull request #190 from OP-TED/feature/EPO-834

Feature/epo 834
OP-TED · Oct 31, 2023 · d9dbd13 · d9dbd13
2 parents 65dddeb + 0374ccb
commit d9dbd13
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 24 deletions.
diff --git a/src/owl-core-lib/connectors-owl-core.xsl b/src/owl-core-lib/connectors-owl-core.xsl
@@ -190,7 +190,7 @@
                         ()"/>
 
         <xsl:variable name="documentation"
-            select="f:formatDocString(fn:string-join($connectorDocumentations))"/>
+            select="fn:normalize-space(f:formatDocString(fn:string-join($connectorDocumentations)))"/>
 
         <xsl:variable name="connectorNotes" as="xs:string*"
             select="
@@ -204,7 +204,7 @@
                         else
                             ()"/>
 
-        <xsl:variable name="note" select="f:formatDocString(fn:string-join($connectorNotes))"/>
+        <xsl:variable name="note" select="fn:normalize-space(f:formatDocString(fn:string-join($connectorNotes)))"/>
 
 
         <owl:ObjectProperty rdf:about="{$roleURI}"/>

diff --git a/src/owl-core-lib/descriptors-owl-core.xsl b/src/owl-core-lib/descriptors-owl-core.xsl
@@ -49,7 +49,7 @@
         <xsl:param name="elementUri"/>
         <rdf:Description rdf:about="{$elementUri}">
             <skos:definition xml:lang="en">
-                <xsl:value-of select="$definition"/>
+                <xsl:value-of select="fn:normalize-space($definition)"/>
             </skos:definition>
         </rdf:Description>
     </xsl:template>
@@ -65,7 +65,7 @@
         <xsl:param name="elementUri"/>
         <rdf:Description rdf:about="{$elementUri}">
             <skos:editorialNote xml:lang="en">
-                <xsl:value-of select="$comment"/>
+                <xsl:value-of select="fn:normalize-space($comment)"/>
             </skos:editorialNote>
         </rdf:Description>
     </xsl:template>

diff --git a/src/owl-core-lib/elements-owl-core.xsl b/src/owl-core-lib/elements-owl-core.xsl
@@ -122,7 +122,7 @@
         <xsl:variable name="className" select="./@name"/>
         <xsl:variable name="idref" select="./@xmi:idref"/>
         <xsl:variable name="classURI" select="f:buildURIFromElement(.)"/>
-        <xsl:variable name="documentation" select="f:formatDocString(./properties/@documentation)"/>
+        <xsl:variable name="documentation" select="fn:normalize-space(f:formatDocString(./properties/@documentation))"/>
 
         <owl:Class rdf:about="{$classURI}"/>
 
@@ -210,7 +210,7 @@
                 for $attribute in $attributesWithSameName
                 return
                     if ($attribute/documentation/@value) then
-                        fn:concat(f:formatDocString($attribute/documentation/@value), ' (', $attribute/../../@name, ') ')
+                    fn:concat(fn:normalize-space(f:formatDocString($attribute/documentation/@value)), ' (', $attribute/../../@name, ') ')
                     else
                         ()"/>
         <xsl:variable name="descriptionsWithAnnotations" as="xs:string"
@@ -316,7 +316,7 @@
         <xsl:variable name="dataTypeName" select="./@name"/>
         <xsl:variable name="idref" select="./@xmi:idref"/>
         <xsl:variable name="dataTypeURI" select="f:buildURIFromElement(.)"/>
-        <xsl:variable name="documentation" select="f:formatDocString(./properties/@documentation)"/>
+        <xsl:variable name="documentation" select="fn:normalize-space(f:formatDocString(./properties/@documentation))"/>
 
         <rdfs:Datatype rdf:about="{$dataTypeURI}"/>
 
@@ -357,7 +357,7 @@
 
             <xsl:variable name="conceptSchemeURI" select="f:buildURIFromElement(.)"/>
             <xsl:variable name="documentation"
-                select="f:formatDocString(./properties/@documentation)"/>
+                select="fn:normalize-space(f:formatDocString(./properties/@documentation))"/>
 
 
             <xsl:if
@@ -437,7 +437,7 @@
                         ./@name"/>
             <xsl:variable name="enumerationAttributeURI" select="f:buildURIFromElement(.)"/>
             <xsl:variable name="enumerationURI" select="f:buildURIFromElement(../..)"/>
-            <xsl:variable name="documentation" select="f:formatDocString(./documentation/@value)"/>
+            <xsl:variable name="documentation" select="fn:normalize-space(f:formatDocString(./documentation/@value))"/>
 
             <xsl:if
                 test="not(fn:contains($enumerationAttributeURI, $base-ontology-uri)) and $generateReusedConcepts">

diff --git a/src/reasoning-layer-lib/connectors-reasoning-layer.xsl b/src/reasoning-layer-lib/connectors-reasoning-layer.xsl
@@ -610,7 +610,7 @@
         <xsl:if test="f:getElementByIdRef($generalisation/source/@xmi:idref, root($generalisation)) and count($subClasses) > 1">
 
             <rdf:Description>
-                <rdf:type rdf:resource="http://www.w3.org/2002/07/owl##AllDisjointClasses"/>
+                <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AllDisjointClasses"/>
                 <owl:members rdf:parseType="Collection">
                     <xsl:for-each select="$subClasses">
                         <xsl:variable name="subClassURI" select="f:buildURIFromElement(.)"/>

diff --git a/src/shacl-shape-lib/connectors-shacl-shape.xsl b/src/shacl-shape-lib/connectors-shacl-shape.xsl
@@ -488,9 +488,9 @@
             <rdf:Description
                 rdf:about="{f:buildPropertyShapeURI($sourceClassName,$targetRole)}">
                 <sh:sparql rdf:parseType="Resource">
-                    <sh:select> SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
+                    <sh:select>SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
                         select="$targetRoleURI"/>&gt; ?that . ?that &lt;<xsl:value-of
-                            select="$targetRoleURI"/>&gt; ?this .} </sh:select>
+                            select="$targetRoleURI"/>&gt; ?this .}</sh:select>
                 </sh:sparql>
             </rdf:Description>
 
@@ -501,19 +501,19 @@
             <rdf:Description
                 rdf:about="{f:buildPropertyShapeURI($sourceClassName,$targetRole)}">
                 <sh:sparql rdf:parseType="Resource">
-                    <sh:select> SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
+                    <sh:select>SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
                         select="$targetRoleURI"/>&gt; ?that . ?that &lt;<xsl:value-of
-                            select="$targetRoleURI"/>&gt; ?this .} </sh:select>
+                            select="$targetRoleURI"/>&gt; ?this .}</sh:select>
                 </sh:sparql>
             </rdf:Description>
 
 
             <rdf:Description
                 rdf:about="{f:buildPropertyShapeURI($targetClassName,$sourceRole)}">
                 <sh:sparql rdf:parseType="Resource">
-                    <sh:select> SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
+                    <sh:select>SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
                         select="$sourceRoleURI"/>&gt; ?that . ?that &lt;<xsl:value-of
-                            select="$sourceRoleURI"/>&gt; ?this .} </sh:select>
+                            select="$sourceRoleURI"/>&gt; ?this .}</sh:select>
                 </sh:sparql>
             </rdf:Description>
 

diff --git a/src/shacl-shape-lib/descriptors-shacl-shape.xsl b/src/shacl-shape-lib/descriptors-shacl-shape.xsl
@@ -60,10 +60,10 @@
         <rdf:Description rdf:about="{$uri}">
             <xsl:choose>
                 <xsl:when test="$rdfsComment=fn:true()">
-                    <rdfs:comment><xsl:value-of select="$definition"/></rdfs:comment>
+                    <rdfs:comment><xsl:value-of select="fn:normalize-space($definition)"/></rdfs:comment>
                 </xsl:when>
                 <xsl:otherwise>
-                    <sh:description><xsl:value-of select="$definition"/></sh:description>
+                    <sh:description><xsl:value-of select="fn:normalize-space($definition)"/></sh:description>
                 </xsl:otherwise>
             </xsl:choose>
         </rdf:Description>
@@ -83,10 +83,10 @@
         <rdf:Description rdf:about="{$uri}">
             <xsl:choose>
                 <xsl:when test="$rdfsComment=fn:true()">
-                    <rdfs:comment><xsl:value-of select="$comment"/></rdfs:comment>
+                    <rdfs:comment><xsl:value-of select="fn:normalize-space($comment)"/></rdfs:comment>
                 </xsl:when>
                 <xsl:otherwise>
-                    <sh:description><xsl:value-of select="$comment"/></sh:description>
+                    <sh:description><xsl:value-of select="fn:normalize-space($comment)"/></sh:description>
                 </xsl:otherwise>
             </xsl:choose>
         </rdf:Description>

diff --git a/src/shacl-shape-lib/elements-shacl-shape.xsl b/src/shacl-shape-lib/elements-shacl-shape.xsl
@@ -109,7 +109,7 @@
             select="f:buildShapeURI($class/@name)"/>
         <xsl:variable name="classURI" select="f:buildURIFromElement($class)"/>
         <xsl:variable name="documentation"
-            select="f:formatDocString($class/properties/@documentation)"/>
+            select="fn:normalize-space(f:formatDocString($class/properties/@documentation))"/>
 
         <sh:NodeShape rdf:about="{$shapeClassUri}">
             <sh:targetClass rdf:resource="{$classURI}"/>
@@ -229,8 +229,7 @@
     <xsl:template name="abstractClassDeclaration">
         <xsl:param name="classURI"/>
         <sh:sparql rdf:parseType="Resource">
-            <sh:select>SELECT ?this WHERE { ?this a &lt;<xsl:value-of select="$classURI"/>&gt; . }
-            </sh:select>
+            <sh:select>SELECT ?this WHERE { ?this a &lt;<xsl:value-of select="$classURI"/>&gt; . }</sh:select>
         </sh:sparql>
     </xsl:template>
 

diff --git a/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec b/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec
@@ -215,7 +215,7 @@
             <x:param name="generalisation" href="../../testData/ePO_core_with_tags.xml" select="/xmi:XMI/xmi:Extension[1]/connectors[1]/connector[43]"/>
         </x:call>   
         <x:expect label="there is a rdf:Description" test="boolean(rdf:Description) "/>
-        <x:expect label="there is a rdf:type with correct URI" test="boolean(rdf:Description/rdf:type) and rdf:Description/rdf:type/@rdf:resource = 'http://www.w3.org/2002/07/owl##AllDisjointClasses'"/>
+        <x:expect label="there is a rdf:type with correct URI" test="boolean(rdf:Description/rdf:type) and rdf:Description/rdf:type/@rdf:resource = 'http://www.w3.org/2002/07/owl#AllDisjointClasses'"/>
         <x:expect label="there is a 3 disjoint classes" test="count(rdf:Description/owl:members/rdf:Description)=3 "/>
 
     </x:scenario>