a.binder 6 лет назад
Родитель
Сommit
07e2e61ed8

+ 1 - 1
SE/schema/WPS_Functions/apache_fop/build_apache_fop.xml

@@ -41,7 +41,7 @@
    
    <!--<taskdef resource="net/sf/antcontrib/antlib.xml"/>-->
    
-   <echo>#42 $apache_fop.current.home  = ${apache_fop.current.home}</echo>
+   <!--<echo>#42 $apache_fop.current.home  = ${apache_fop.current.home}</echo>-->
    <!--<taskdef name="fop"
       classname="org.apache.fop.tools.anttasks.Fop">
       <classpath>

+ 14 - 2
SE/schema/default_db_xml_cache.public/default_db/dateTime.xsl

@@ -15,6 +15,9 @@
     
     <xsl:function name="system_cache__dita:year">
         <xsl:param name="date"/>
+        <xsl:variable name="date">
+            <xsl:value-of select="$date"/>
+        </xsl:variable>
         <xsl:choose>
             
             <xsl:when test="string($date) castable as xs:dateTime">
@@ -127,8 +130,9 @@
             <xsl:when test="tokenize(string($date),'/')[3]">
                 <xsl:choose>
                     <xsl:when test="string-length(substring-before(tokenize(string($date),'/')[3],' '))=4">
-                        <xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/><xsl:text>|</xsl:text><xsl:value-of select="ceiling(number(tokenize(string($date),'/')[2]) div 3)"/>
-                        <xsl:message>#28-131A WARNING (system_cache__dita:year-quarter) date from="<xsl:value-of select="$date"/>" == "<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>-<xsl:value-of select="ceiling(number(tokenize(string($date),'/')[2]) div 3)"/>"</xsl:message>
+                        
+                        <xsl:value-of select="substring-before(tokenize(string(system_cache__dita:date.serialize_string($date)),'/')[3],' ')"/><xsl:text>|</xsl:text><xsl:value-of select="ceiling(number(tokenize(string(system_cache__dita:date.serialize_string($date)),'/')[2]) div 3)"/>
+                        <xsl:message>#28-131A WARNING (system_cache__dita:year-quarter) date from="<xsl:value-of select="$date"/>" == "<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>|<xsl:value-of select="ceiling(number(tokenize(string($date),'/')[2]) div 3)"/>"</xsl:message>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:message terminate="no">#28-131 ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! =="<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>" </xsl:message>
@@ -147,6 +151,14 @@
         
     </xsl:function>
     
+    <xsl:function name="system_cache__dita:date.serialize_string">
+        <xsl:param name="date_string"/>
+        <xsl:variable name="out">
+            <xsl:value-of select="$date_string"/>
+        </xsl:variable>
+        <xsl:value-of select="$out"/>
+    </xsl:function>
+    
     
     <xsl:template name="debug.dateTime">
         <xsl:value-of select="$debug.dateTime.data"/>=<xsl:value-of select="system_cache__dita:year($debug.dateTime.data)"/><xsl:text>

+ 5 - 1
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows__x3A__analyze.xsl

@@ -182,6 +182,10 @@
                 </xsl:variable>
                 
                 
+                <!--<foreign props="test_if_go_row" rev="debug.185">
+                    <xsl:copy-of select="$test_if_go_row"/>
+                </foreign>-->
+                
                 <xsl:choose>
                     <xsl:when test="count($test_if_go_row//DATA_AVIABLE) &gt;0 and count($test_if_go_row//NUMBER) &gt;0">
                         
@@ -260,7 +264,7 @@
                     </dd>
                 </dlentry>-->
             </xsl:for-each>
-            <dlentry>
+            <dlentry rev="graph_gnuplot.simpletable__x3A__from_rows__x3A__analyze.xsl#267">
                 <dt>
                     Podsumowanie całościowe
                 </dt>

+ 6 - 6
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__graph.stats__x3A__analyze.xsl

@@ -103,7 +103,7 @@
                         
                         
                         
-                        <dlentry>  
+                        <dlentry rev="graph_gnuplot.simpletable__x3A__graph.stats__x3A__analyze.xsl#106">  
                                         
                         
                         <xsl:element name="dt">
@@ -129,7 +129,7 @@
                         
                         </dlentry>
                         <xsl:if test="count(current-group()) &gt; 3">
-                            <dlentry>
+                            <dlentry rev="graph_gnuplot.simpletable__x3A__graph.stats__x3A__analyze.xsl#132">
                                 <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
                                     <xsl:with-param name="fid" select="$fid"/>
                                     <xsl:with-param name="fileindex" select="$fileindex"/>
@@ -161,7 +161,7 @@
                         
                         <xsl:choose>
                             <xsl:when test="number(current-group()[1])">
-                                <dlentry>
+                                <dlentry rev="graph_gnuplot.simpletable__x3A__graph.stats__x3A__analyze.xsl#164">
                                     <dt>
                                         min/max
                                     </dt>
@@ -197,7 +197,7 @@
                                 </dlentry>
                             </xsl:when>
                             <xsl:otherwise>
-                                <dlentry>
+                                <dlentry rev="graph_gnuplot.simpletable__x3A__graph.stats__x3A__analyze.xsl#200">
                                     <dt>
                                         wykrycie danych 
                                     </dt>
@@ -213,7 +213,7 @@
                         <xsl:comment>#155 going all </xsl:comment>
                         
                         <xsl:for-each-group select="current-group()[1]" group-by="parent::stentry/concat(@props,' ',@audience,' ',@group)"> <!-- stentry/p5gnuplot:stats -->
-                            <dlentry>
+                            <dlentry rev="graph_gnuplot.simpletable__x3A__graph.stats__x3A__analyze.xsl#216">
                                 <dt>
                                     poz. <xsl:value-of select="position()"/> <sup>(<xsl:value-of select="current-grouping-key()"/>)</sup> (<xsl:value-of select="position()"/>)
                                 </dt>
@@ -229,7 +229,7 @@
                             </xsl:element>
                             </dlentry>
                             <xsl:if test="count(current-group()) &gt;3">
-                            <dlentry>
+                                <dlentry rev="graph_gnuplot.simpletable__x3A__graph.stats__x3A__analyze.xsl#232">
                                 <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
                                     <xsl:with-param name="title">APU4_umowy</xsl:with-param>
                                     <xsl:with-param name="graph.name">GAD_Linear_Regres</xsl:with-param>