arkadiusz binder 6 лет назад
Родитель
Сommit
10f50024a0

+ 5 - 3
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.Hi-Lo-Close.xsl

@@ -2530,11 +2530,13 @@
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
-        <xsl:message>#1700-B $x.label=[<xsl:value-of select="$x.label"/>] - 
+        <xsl:message>#1700-B-2544 $x.label=[<xsl:value-of select="$x.label"/>] - 
             srchd[data.x.name[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name"/>]]
             [$data.x.name.value[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.name.value"/>]] 
-            [$system_cache__dita__x3A__svg:data.x.label[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.label"/>]]</xsl:message>
-        
+            [$system_cache__dita__x3A__svg:data.x.label[<xsl:value-of select="$system_cache__dita__x3A__svg:data.x.label"/>]]
+            $x1Value=[<xsl:value-of select="$x1Value"/>]
+            $x2Value=[<xsl:value-of select="$x2Value"/>]
+        </xsl:message>
         <xsl:choose>
           <!--  <xsl:when test="$system_cache__dita__x3A__svg:data.x.label"/>
             <xsl:when test="$system_cache__dita__x3A__svg:data.y1.label"/>

+ 4 - 1
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.Hi-Lo-CloseYaxis.xsl

@@ -209,7 +209,10 @@
             <xsl:when test="$system_cache__dita__x3A__svg:data.x.name.value__x3A__validate = true()">
                 
                 <xsl:call-template name="system_cache__dita__x3A__svg:data.debug__x3A__row"/>
-                <xsl:message>#210 will call system_cache__dita__x3A__svg:labelMajor</xsl:message>
+                <xsl:message>#210 will call system_cache__dita__x3A__svg:labelMajor
+                    $x1Value=[<xsl:value-of select="$x1Value"/>]
+                    $x2Value=[<xsl:value-of select="$x2Value"/>]
+                </xsl:message>
                 <xsl:call-template name="system_cache__dita__x3A__svg:labelMajor">
                     <xsl:with-param name="system_cache__dita__x3A__svg:x1.count.leadingTimeDate" select="$system_cache__dita__x3A__svg:x.count__x3A__read"/><!-- TRODO $system_cache__dita__x3A__svg:x1.count.leadingTimeDate -->
                     <xsl:with-param name="system_cache__dita__x3A__svg:data.x1.label__x3A__read" select="$system_cache__dita__x3A__svg:data.x1.label__x3A__read" tunnel="yes"/>

+ 1 - 1
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.plot.complex.test.xsl

@@ -758,7 +758,7 @@
                                         <!--<xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select="doc('file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-209_000001/interested_row.xml')">
                                             <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
                                         </xsl:apply-templates>-->
-                                        <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select="doc('file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-1415_000001/interested_row.xml')">
+                                        <xsl:apply-templates mode="system_cache__dita__x3A__svg:data__x3A__assign" select="doc('/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-174_000001/interested_row.xml')">
                                             <xsl:with-param name="system_cache__dita__x3A__svg:cursor" select="$system_cache__dita__x3A__svg:cursor"/>
                                         </xsl:apply-templates>
                                     </xsl:variable>

+ 17 - 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

@@ -414,7 +414,14 @@
         <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.value" required="yes" tunnel="yes"/>
         <xsl:variable name="system_cache__dita__x3A__svg:x1__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.value ]"/>
+            <xsl:for-each select="descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name ]]//@*[ name() = $system_cache__dita__x3A__svg:data.x1.value ]">
+                <xsl:if test="position() = 1">
+                    <xsl:value-of select="."/>
+                </xsl:if>
+                <xsl:if test="position() &gt; 0 ">
+                    <xsl:message>#422 [ERROR][MORE POS][X][1]==[<xsl:value-of select="position()"/>]</xsl:message>
+                </xsl:if>
+            </xsl:for-each>
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$system_cache__dita__x3A__svg:x1__x3A__read=''">
@@ -431,7 +438,15 @@
         <xsl:param name="system_cache__dita__x3A__svg:data.x.name" required="yes"  tunnel="yes"/>
         <xsl:param name="system_cache__dita__x3A__svg:data.x2.value" required="yes" tunnel="yes"/>
         <xsl:variable name="system_cache__dita__x3A__svg:x2__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.x2.value ]"/>
+            <xsl:for-each select="descendant-or-self::*[ @*[name() = $system_cache__dita__x3A__svg:data.x.name ]]//@*[ name() = $system_cache__dita__x3A__svg:data.x2.value ]">
+                <xsl:choose>
+                    <xsl:when test="position() = 1"><xsl:value-of select="."/></xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message>#422-B [ERROR][MORE POS][X][2]==[<xsl:value-of select="position()"/>]</xsl:message> 
+                    </xsl:otherwise>
+                </xsl:choose>
+                
+            </xsl:for-each>
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$system_cache__dita__x3A__svg:x2__x3A__read=''">

+ 1 - 0
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.utils.translate.xsl

@@ -191,6 +191,7 @@
             <xsl:if test="$rotate">
                 <xsl:value-of select="system_cache__dita__x3A__svg:transform.translate.major.rotate($rotate)"/>
             </xsl:if>
+            <xsl:message>#DEB 194 $xValue=[<xsl:value-of select="$xValue"/>]</xsl:message>
             <xsl:value-of select="system_cache__dita__x3A__svg:transform.translate.major.offset(- $xValue, - $yValue)"/>