Changeset 3480

Timestamp:

08/28/13 12:30:13 (11 years ago)

Author:

vronk

Message:

simplified Term to node, corrected type (parts=relations)

File:

• SMC/trunk/SMC/src/xsl/terms2graph.xsl (modified) (10 diffs)

SMC/trunk/SMC/src/xsl/terms2graph.xsl

@@ -198 +198 @@
             <xsl:if test="'datcats' = $parts-sequence and 'components' = $parts-sequence" ><xsl:apply-templates select="$enriched-termsets//Term" mode="edges-datcats"/></xsl:if>
             <xsl:if test="'datcats' = $parts-sequence and not('components' = $parts-sequence)" ><xsl:apply-templates select="$enriched-termsets//Term" mode="edges-profiles-datcats"/></xsl:if>
-            <xsl:if test="'relation' = $parts-sequence" ><xsl:apply-templates select="$rr-relations//Relation" mode="edges-rels"/></xsl:if>            
+            <xsl:if test="'relations' = $parts-sequence" ><xsl:apply-templates select="$rr-relations//Relation" mode="edges-rels"/></xsl:if>            
             <xsl:if test="'profile-groups' = $parts-sequence">
                 <xsl:apply-templates select="$enriched-termsets//info/(groupName | domainName | creatorName)[. ne '']" mode="edges-profiles-groups"/>
@@ -205 +205 @@
         <xsl:variable name="distinct-nodes">
             <xsl:for-each-group select="$nodes/*" group-by="@key">
-                <node position="{position()}" count="{(sum(current-group()/@count[number(.)=number(.)]), count(current-group()))[1]}" avg_level="{avg(current-group()/@level)}" sum_level="{sum(current-group()/@level)}">
+                <node position="{position()}" count="{(sum(current-group()/@count[. ne ''][number(.)=number(.)])[.>0], count(current-group()))[1]}" avg_level="{avg(current-group()/@level)}" sum_level="{sum(current-group()/@level)}">
                     <xsl:copy-of select="@*[not (name()='count')]"/>
                 </node>
@@ -224 +224 @@
 <!--                                                            <xsl:copy-of select="$dcr-terms-copy"/>-->
                     <xsl:copy-of select="$distinct-nodes"/>
+<!--       DEBUG: <xsl:copy-of select="$nodes"/>-->
                 </nodes>
                 <edges>
@@ -259 +260 @@
     <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl">
         <xd:desc>
-            <xd:p>Generate nodes for CMD-Components (and CMD-Profiles in instance-data) </xd:p>
+            <xd:p>Generate nodes for CMD-Components and CMD-Elements (and CMD-Profiles in instance-data) </xd:p>
             <xd:p>Expects Terms with @id-attribute, so instance data has to be enriched first</xd:p>
             <xd:pre><Termset name="Bedevaartbank" id="clarin.eu:cr1:p_1280305685223" type="CMD_Profile">
@@ -268 +269 @@
         </xd:desc>        
     </xd:doc>
-    <xsl:template match="Term[Term]" mode="nodes">
-    
-        <xsl:variable name="current_comp_key" select="my:normalize(@id)"/>
+    <xsl:template match="Term" mode="nodes">
+    
+        <xsl:variable name="current_term_key" select="my:normalize(@id)"/>
         <xsl:variable name="type">
             <xsl:choose>
-                <xsl:when test="@type='CMD_Profile' or parent::Termset">Profile</xsl:when>
+                <xsl:when test="@type='CMD_Profile' or parent::Termset[@context]">Profile</xsl:when>
                 <xsl:when test="@type='CMD_Component'">Component</xsl:when>
+                <xsl:when test="@type='CMD_Element'">Element</xsl:when>
                 <!-- pass special types -->
                 <xsl:otherwise>
@@ -282 +284 @@
         </xsl:variable>
         <xsl:variable name="level" select="count(ancestor::Term)"/>
-        <node id="{@id}" key="{$current_comp_key}" name="{@name}" type="{$type}" level="{$level}" count="{@count}" path="{@path}">
+        <node id="{@id}" key="{$current_term_key}" name="{@name}" type="{$type}" level="{$level}" count="{@count}" path="{@path}">
             <!--       <xsl:value-of select="$equivalent_schema_term"></xsl:value-of>-->
         </node>
@@ -310 +312 @@
     <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl">
         <xd:desc>
+            <xd:p>OBSOLETING in favor of more general template for all Term</xd:p>
             <xd:p>Generate nodes for CMD-Elements (leaf nodes in cmd-terms)</xd:p>
+            <xd:p>However, in the data there is also CMD_ComponentsGenerate nodes for CMD-Elements (leaf nodes in cmd-terms)</xd:p>
             <xd:p>Expects Terms with @id-attribute, so instance data has to be enriched first</xd:p>
             <xd:pre><Term type="CMD_Element" name="applicationType"
@@ -321 +325 @@
         </xd:desc>        
     </xd:doc>
-    <xsl:template match="Term[not(Term)]" mode="nodes">        
+    <!--<xsl:template match="Term[not(Term)]" mode="nodes">        
         <xsl:variable name="current_elem_key" select="my:normalize(@id)"/>
         <xsl:variable name="level" select="count(ancestor::Term)"/>
         <xsl:variable name="type">
             <xsl:choose>
-                <xsl:when test="@type='CMD_Element'">Element</xsl:when>                
-                <!-- pass special types -->
+                <xsl:when test="@type='CMD_Element'">Element</xsl:when>
+                
+                <xsl:when test="@type='CMD_Component'">Component</xsl:when>                
+                <!-\- pass special types -\->
                 <xsl:otherwise>
                     <xsl:value-of select="@type"/>
@@ -334 +340 @@
         </xsl:variable>
         <node id="{@id}" key="{$current_elem_key}" name="{@name}" type="{$type}" level="{$level}" count="{@count}" path="{@path}"/>
-<!--        <xsl:message><xsl:value-of select="concat(@id, '-', ancestor::Term[1]/@id)"></xsl:value-of></xsl:message>-->
-    </xsl:template>
+<!-\-        <xsl:message><xsl:value-of select="concat(@id, '-', ancestor::Term[1]/@id)"></xsl:value-of></xsl:message>-\->
+    </xsl:template>-->
    
     <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl">
@@ -353 +359 @@
             <xsl:value-of select="if($get-mnemonic ne '') then $get-mnemonic else tokenize(@datcat,'/')[last()]"/>
         </xsl:variable>
-<!--     DEBUG:get-mnemonic:<xsl:value-of select="$get-mnemonic"/>-->
-        <node id="{$datcat-id}" key="{my:normalize($datcat-id)}" name="{$datcat-name}" type="DatCat" level="{$level}"/>
+<!--     DEBUG:get-mnemonic:<xsl:value-of select=""/>-->
+        <node id="{$datcat-id}" key="{my:normalize($datcat-id)}" name="{$datcat-name}" type="DatCat" level="{$level}"
+            mnemonic="{$get-mnemonic}" ref_term_id="{@id}"/>
     </xsl:template>