Changeset 1029 for MDService2/trunk/MDService2/src/xsl/model2matrix.xsl

Timestamp:

01/02/11 19:30:58 (13 years ago)

Author:

vronk

Message:

changes to columns, terms (unfinished) ; .ui-context-dialog

File:

• MDService2/trunk/MDService2/src/xsl/model2matrix.xsl (modified) (4 diffs)

MDService2/trunk/MDService2/src/xsl/model2matrix.xsl

@@ -46 +46 @@
                 <Termsets>
                 <xsl:for-each select="Term/Term" >
-                        <xsl:variable name="termset_name" select="@name" />                     
-                        <xsl:variable name="resolved_termset_uri" select="concat($model_matrix_uri,$termset_name,'&amp;maxdepth=8&amp;repository=',$repository_uri)" />
-                        <xsl:message>processing model-term($resolved_termset_uri): <xsl:value-of select="$resolved_termset_uri" /> </xsl:message>
-                        <xsl:variable name="termset" select="document($resolved_termset_uri)" />
+                        <xsl:variable name="termset_name" select="@name" />                                             
+                        
+                        <xsl:variable name="termset" >
+                                <xsl:choose>
+                                        <!-- if existing children, process directly those (enrich them in a separate matrix-run  -->
+                                        <xsl:when test="Term">
+                                                <xsl:variable name="terms" >                                                    
+                                                        <Terms>
+                                                                <xsl:copy-of select="." />
+                                                        </Terms>        
+                                                </xsl:variable>                                         
+                                                
+                                                <xsl:apply-templates select="$terms" mode="matrix" />                                           
+                                        </xsl:when>
+                                        <!--  else get the full summary for given termset -->
+                                        <xsl:otherwise>
+                                        <xsl:variable name="resolved_termset_uri" select="concat($model_matrix_uri,$termset_name,'&amp;maxdepth=8&amp;repository=',$repository_uri)" />
+                                                <xsl:message>processing model-term($resolved_termset_uri): <xsl:value-of select="$resolved_termset_uri" /> </xsl:message>                       
+                                                <xsl:copy-of select="document($resolved_termset_uri)" /> 
+                                        </xsl:otherwise>
+                                </xsl:choose>
+                        </xsl:variable>
+                        
+                        <xsl:message><xsl:copy-of select="$termset" ></xsl:copy-of></xsl:message> 
 
                         <xsl:variable name="termset_matrix" >
@@ -81 +101 @@
                                 <xsl:apply-templates mode="matrix"  >
                                         <xsl:with-param name="profile" select="$profile"></xsl:with-param>
-                                </xsl:apply-templates>
+                                </xsl:apply-templates>                          
                         </Terms>
                 </xsl:variable>
@@ -266 +286 @@
                 </xsl:apply-templates>
                         
-                
+                <xsl:copy-of select="v"  />
         </xsl:copy>                                                     
         
@@ -395 +415 @@
                                         <xsl:with-param name="profile" select="$profile" />
                                 </xsl:apply-templates>
+                                
                         </Term>