Mariusz Muszyński 9 лет назад
Родитель
Сommit
6a0b7fe363

+ 2 - 2
SE/schema/ant-url_action/procesy5_status/out/procesy5_status.xml

@@ -2,9 +2,9 @@
 <build_procesy5_status xmlns:raport="procesy5_raport">
    <storage_free.xml>
       <raport:df>
-         <disk Mountpoint="/dev/disk0s2">
+         <disk Filesystem="/dev/disk0s2">
             <Capacity error="Zbyt duże wykorzystanie">92%</Capacity>
-            <Available>21048</Available>
+            <Available>21036</Available>
          </disk>
       </raport:df>
    </storage_free.xml>

+ 11 - 3
SE/schema/ant-url_action/procesy5_status/procesy5_status.xsl

@@ -61,6 +61,14 @@
                             </xsl:for-each>
                         </row>
                     </xsl:if>
+                    <xsl:if test="position() = 1">
+                        <fields>
+                            <xsl:for-each select="tokenize(normalize-space(.),' ')">
+                                <el><xsl:attribute name="pos" select="position()"/>
+                                    <xsl:value-of select="."/></el>
+                            </xsl:for-each>
+                        </fields>
+                    </xsl:if>
                 </xsl:for-each>
             </df_output>
         </xsl:variable>
@@ -68,14 +76,14 @@
         <raport:df>
             <xsl:for-each select="$df_output//row">
                 <disk>
-                    <xsl:attribute name="Mountpoint" select="el[@pos='1']"/>
-                    <xsl:element name="Capacity">
+                    <xsl:attribute name="{$df_output//fields/el[@pos='1']}" select="el[@pos='1']"/>
+                    <xsl:element name="{$df_output//fields/el[@pos='5']}">
                         <xsl:if test="number(replace(el[@pos='5'],'%','')) &gt; number($raport:df_correct/disk/@raport:max_capacity)">
                             <xsl:attribute name="error" select="'Zbyt duże wykorzystanie'"/>
                         </xsl:if>
                         <xsl:value-of select="el[@pos='5']"/>
                     </xsl:element>
-                    <xsl:element name="Available">
+                    <xsl:element name="{$df_output//fields/el[@pos='4']}">
                         <xsl:if test="number(el[@pos='4']) &lt; number($raport:df_correct/disk/@raport:min_free)">
                             <xsl:attribute name="error" select="'Zbyt mało wolnego miejsca'"/>
                         </xsl:if>

+ 1 - 1
SE/schema/ant-url_action/procesy5_status/temp_procesy5_status/storage_free.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <storage_free.xml>Filesystem   1M-blocks   Used Available Capacity iused      ifree %iused  Mounted on
-/dev/disk0s2    238552 217254     21048    92% 2649581 4292317698    0%   /</storage_free.xml>
+/dev/disk0s2    238552 217266     21036    92% 2649566 4292317713    0%   /</storage_free.xml>