a.binder 5 vuotta sitten
vanhempi
commit
732a3d3895

+ 13 - 2
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.data.xsl

@@ -61,7 +61,18 @@
         
         <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.min" select="min($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*/@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value)"/>
         <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max" select="max($system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*/@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value)"/>
-        <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*[@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value = $system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max]/@system_cache__dita__x3A__svg:data.y.leadingTimeYear-month.bounds.X.label"/>
+        <xsl:variable name="system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label" >
+            <xsl:for-each select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X/*[@system_cache__dita__x3A__svg:data.x.leadingTimeYear-month.bounds.X.value = $system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max]/@system_cache__dita__x3A__svg:data.y.leadingTimeYear-month.bounds.X.label">
+                <xsl:choose>
+                    <xsl:when test="position() = 1">
+                        <xsl:value-of select="."/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message>#71[ERROR][X][MAX][LABEL][MORE_OCCURS][<xsl:value-of select="position()"/>]</xsl:message>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:for-each>
+        </xsl:variable>
         <!-- Again to fix date to -->
         
         
@@ -412,7 +423,7 @@
                     <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.value')}" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max"/>
                     <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.label')}" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label"/>
                     <xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.value.bounds(system_cache__dita__x3A__svg:resolution.coordinate.axis.y(),system_cache__dita__x3A__svg:resolution.coordinate.index(),system_cache__dita__x3A__svg:resolution.coordinate.value.bounds.data.value(),'leadingTimeYear-month.bounds')}" select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max"/>
-                    <xsl:attribute name="debug.TimeTo">#310</xsl:attribute>
+                    <xsl:attribute name="debug.TimeTo">#310 [system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label]=[<xsl:value-of select="$system_cache__dita__x3A__svg:data__x3A__assign.leadingTimeYear-month.bounds.X.max.label"/>]</xsl:attribute>
                 </xsl:when>
                 <xsl:otherwise>
                     <!--<xsl:attribute name="{system_cache__dita__x3A__svg:resolution.coordinate.data(system_cache__dita__x3A__svg:resolution.coordinate.axis.x(),system_cache__dita__x3A__svg:resolution.coordinate.index(),'leadingTimeYear-month.bounds.X.value')}" select="system_cache__dita:year-timestamp-day('1970-01-01')"/>-->

+ 21 - 2
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.data__x3A__read.xsl

@@ -669,7 +669,16 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name.value" required="yes" tunnel="yes"/><!--  = $system_cache__dita__x3A__svg:data.x.name.value -->
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" required="yes"  tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x.label" required="yes" tunnel="yes"/>
-        <xsl:value-of select="descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name]  ]/@*[ name() = $system_cache__dita__x3A__svg:data.x.label ]"/>
+        <xsl:for-each select="descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name]  ]/@*[ name() = $system_cache__dita__x3A__svg:data.x.label ]">
+            <xsl:choose>
+                <xsl:when test="position() = 1">
+                    <xsl:value-of select="."/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:message>#678[ERROR][LABEL][X][MORE][POSITION=[<xsl:value-of select="position()"/>]]</xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
     </xsl:template>
     
     <xsl:template name="system_cache__dita__x3A__svg:data.x1.label__x3A__read__x3A__tunnel">
@@ -677,7 +686,17 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" required="yes"  tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x1.label" required="yes" tunnel="yes"/>
         <xsl:variable name="system_cache__dita__x3A__svg:data.x1.label__x3A__read">
-            <xsl:value-of select="descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name]  ]//@*[ name() = $system_cache__dita__x3A__svg:data.x1.label ]"/>
+            <xsl:for-each select="descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name]  ]//@*[ name() = $system_cache__dita__x3A__svg:data.x1.label ]">
+                <xsl:choose>
+                    <xsl:when test="position() = 1">
+                        <xsl:value-of select="."/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message>#678-B[ERROR][LABEL][X1][MORE][POSITION=[<xsl:value-of select="position()"/>]]</xsl:message>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:for-each>
+            <!--<xsl:value-of select="descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name]  ]//@*[ name() = $system_cache__dita__x3A__svg:data.x1.label ]"/>-->
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$system_cache__dita__x3A__svg:data.x1.label__x3A__read=''">

+ 18 - 3
se.oxygen.xpr

@@ -2002,16 +2002,16 @@
                         <scenarioAssociation-array>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.complex.testROW.xsl</String>
+                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-174_000001/relations-174_000001.ditamap</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
-                                        <String>system_cache__dita__x3A__svg1 TEST ROW</String>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy - 3.3.3 SE sir</String>
                                     </list>
                                 </field>
                                 <field name="scenarioTypes">
                                     <list>
-                                        <String>XML</String>
+                                        <String>DITAMAP</String>
                                     </list>
                                 </field>
                             </scenarioAssociation>
@@ -2105,6 +2105,21 @@
                                     </list>
                                 </field>
                             </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.complex.testROW.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>system_cache__dita__x3A__svg1 TEST ROW</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XML</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-219_000001/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.3664597____APT_trasy_row.dita</String>