Bläddra i källkod

to test jeszcze beda zmiany

a.binder 7 år sedan
förälder
incheckning
cf688249f5
12 ändrade filer med 664 tillägg och 120 borttagningar
  1. 78 51
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl
  2. 156 29
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_context.path.keyrefs.xsl
  3. 1 1
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA.xsl
  4. 27 15
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.sources.xsl
  5. 47 5
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows.xsl
  6. 126 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows__x3A__analyze.xsl
  7. 40 15
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl
  8. 72 3
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.xsl
  9. 30 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__detect.xsl
  10. 49 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl
  11. 7 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat__x3A__init.xsl
  12. 31 1
      se.oxygen.xpr

+ 78 - 51
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl

@@ -61,24 +61,24 @@
         </xsl:variable>
         
         <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph">
-            <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+            <xsl:with-param name="fid" select="@fid"/>                                                                           
             <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
             <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>
             <xsl:with-param name="title" select="$title"/>
         </xsl:call-template>
         <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals">
-            <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+            <xsl:with-param name="fid" select="@fid"/>                                                                           
             <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
             <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>
             <xsl:with-param name="title" select="$title"/>
         </xsl:call-template>
         <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals.values">
-            <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+            <xsl:with-param name="fid" select="@fid"/>                                                                           
             <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>
             <xsl:with-param name="title" select="$title"/>
         </xsl:call-template>
         <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.related">
-            <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+            <xsl:with-param name="fid" select="@fid"/>                                                                           
             <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset"/>
             <xsl:with-param name="title" select="$title"/>
         </xsl:call-template>
@@ -168,13 +168,13 @@
                                 </foreign>
                                 
                                 <dl>
-                                    <dlentry>
+                                    <dlentry props="do_171">
                                         <dt>Kontekty </dt>
                                         <dd>Przejścia do obiektów w innych kontekstach</dd>
                                     </dlentry>
                                     
                                     <xsl:if test="string-length($system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs)&gt;0">
-                                        <dlentry>
+                                        <dlentry props="do_200">
                                             <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__resolve__key">
                                                 <xsl:with-param name="fid" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs"/>
                                                 <xsl:with-param name="link__x3A__title">kontekst od</xsl:with-param>
@@ -201,7 +201,7 @@
                                             <xsl:with-param name="system_cache__dita:element__x3A__surrounding">xref</xsl:with-param>
                                         </xsl:call-template>
                                         <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__resolve__key">
-                                            <xsl:with-param name="end_fid" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs[1]"/>
+                                            <xsl:with-param name="end_fid" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs"/>
                                             <xsl:with-param name="fid" select="@fid"/>
                                             <xsl:with-param name="link__x3A__title"> do APT </xsl:with-param>
                                             <xsl:with-param name="system_cache__dita:element__x3A__surrounding">xref</xsl:with-param>
@@ -239,7 +239,7 @@
                                             <xsl:otherwise>
                                                 <p>
                                                 <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph">
-                                                    <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+                                                    <xsl:with-param name="fid" select="@fid"/>                                                                           
                                                     <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
                                                     <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>
                                                     <xsl:with-param name="title" select="$title"/>
@@ -250,7 +250,7 @@
                                  
                                         <p>
                                             <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.related">
-                                                <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+                                                <xsl:with-param name="fid" select="@fid"/>                                                                           
                                                 <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset"/>
                                                 <xsl:with-param name="title" select="$title"/>
                                             </xsl:call-template>
@@ -258,7 +258,7 @@
                                   
                                     <p>
                                     <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals">
-                                        <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+                                        <xsl:with-param name="fid" select="@fid"/>                                                                           
                                         <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
                                         <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>
                                         <xsl:with-param name="title" select="$title"/>
@@ -267,7 +267,7 @@
                               
                                     <p>
                                         <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals.values">
-                                            <xsl:with-param name="generate_id" select="@fid"/>                                                                           
+                                            <xsl:with-param name="fid" select="@fid"/>                                                                           
                                             <xsl:with-param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>
                                             <xsl:with-param name="title" select="$title"/>
                                         </xsl:call-template>
@@ -335,22 +335,29 @@
     
     <xsl:template mode="system_cache__dita:ANALIZA_UMOW_4UA " match="text()|comment()"/>
         
+        
+        
+    
     
     
     <xsl:template name="system_cache__dita:ANALIZA_UMOW_4UA.graph" >
-        <xsl:param name="generate_id" select="@generate-id"/>
+        <xsl:param name="fid" select="@fid"/>
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" required="yes"/>
         <xsl:param name="title" required="yes"/>
+        <xsl:param name="graph.name" select="'APU4-P'"/>
         <!--<strow>
             <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
         </strow>-->
         <xsl:variable name="SIMPLETABLE_WTITLE">
             <SIMPLETABLE_WTITLE>
             <simpletable frame="all"
-                id="ANALIZA_UMOW_4UA.graph_table_2_5_{$generate_id}_{$title}"
-                props="graph.ylabel.ilosc graph.y2label.dlugosc graph.style.histogram  font15"><!-- font15 --><!-- print__no  -->
-                
+                props="graph.ylabel.ilosc graph.y2label.dlugosc graph.style.histogram  font15"><!-- font15 --><!-- print__no  --><!-- id="ANALIZA_UMOW_4UA.graph_table_2_5_{$generate_id}_{$title}" -->
+                <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="graph.name" select="$graph.name"/>
+                    <xsl:with-param name="title" select="$title"/>
+                </xsl:call-template>
                 <strow props="graph.headers">
                     <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset//*" group-by="@fid">
                         <stentry current-grouping-key="{@fid}" props="graph.xtic" audience="powiazania"><xsl:copy-of select="string-join(*[@default_db__x3A__BI_audit_BENFORD:NameField]/text(),' ')"></xsl:copy-of></stentry><!--<xsl:value-of select="position()"/>-->
@@ -414,7 +421,8 @@
                     <xsl:with-param name="title"> (APU4-T) powiązania tabela </xsl:with-param>
                 </xsl:call-template>-->
                 <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows" select="$simpletable">
-                    <xsl:with-param name="title"> (APU4-T) powiązania tabela </xsl:with-param>
+                    <!--<xsl:with-param name="title"> (APU4-T) powiązania tabela </xsl:with-param>-->
+                    <xsl:with-param name="title" select="$title"/>
                 </xsl:apply-templates>
                 
                 <p> (APU4) powiązania wykres </p>
@@ -437,21 +445,24 @@
     
     
     <xsl:template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals" >
-        <xsl:param name="generate_id" select="@generate-id"/>
+        <xsl:param name="fid" select="@fid"/>
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" required="yes"/>
         <xsl:param name="title" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter'"/>
-        
+        <xsl:param name="graph.name" select="'APU4-DW'"/>
         <!--<strow>
             <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
         </strow>-->
         <xsl:variable name="SIMPLETABLE_WTITLE">
             <SIMPLETABLE_WTITLE>
                 <simpletable frame="all"
-                    id="ANALIZA_UMOW_4UA.graph.deals_table_2_5_{$generate_id}_{$title}"
-                    props="graph.ylabel.wartosc  no.logscale.y1 no.logscale.y2  graph.style.histogram.rowstacked font15"><!-- graph.y2label.wartosc --><!-- graph.style.histogram --><!-- font15 --><!-- print__no  -->
-                    
+                    props="graph.ylabel.wartosc  no.logscale.y1 no.logscale.y2  graph.style.histogram.rowstacked font15"><!-- id="ANALIZA_UMOW_4UA.graph.deals_table_2_5_{$generate_id}_{$title}" --><!-- graph.y2label.wartosc --><!-- graph.style.histogram --><!-- font15 --><!-- print__no  -->
+                    <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="graph.name" select="$graph.name"/>
+                        <xsl:with-param name="title" select="$title"/>
+                    </xsl:call-template>
                     <strow props="graph.headers">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
@@ -618,7 +629,7 @@
                     <xsl:with-param name="title"> (APU4-DT) umowy obiektu tabela </xsl:with-param>
                     <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
                 </xsl:apply-templates>
-                <p> (APU4-DW) umowy obiektu wykres </p>
+                <p> (<xsl:value-of select="$graph.name"/>) umowy obiektu wykres </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
@@ -640,19 +651,24 @@
     
     
     <xsl:template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals.values" >
-        <xsl:param name="generate_id" select="@generate-id"/>
+        <xsl:param name="fid" select="@fid"/>
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset" required="yes"/>
         <xsl:param name="title" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter'"/>
-        
+        <xsl:param name="graph.name" select="'APU4-DKW'"/>
         <!--<strow>
             <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
         </strow>-->
         <xsl:variable name="SIMPLETABLE_WTITLE">
             <SIMPLETABLE_WTITLE>
                 <simpletable frame="all"
-                    id="ANALIZA_UMOW_4UA.graph.deals.values_table_2_5_{$generate_id}_{$title}"
-                    props="graph.ylabel.ilosc  no.logscale.y1 graph.y2label.wartosc   graph.style.histogram font15"><!-- no.logscale.y2 graph.y2label.wartosc --><!-- graph.style.histogram --><!-- font15 --><!-- print__no  -->
+                    
+                    props="graph.ylabel.ilosc  no.logscale.y1 graph.y2label.wartosc   graph.style.histogram font15"><!-- id="ANALIZA_UMOW_4UA.graph.deals.values_table_2_5_{$generate_id}_{$title}" --><!-- no.logscale.y2 graph.y2label.wartosc --><!-- graph.style.histogram --><!-- font15 --><!-- print__no  -->
+                    <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="graph.name" select="$graph.name"/>
+                        <xsl:with-param name="title" select="$title"/>
+                    </xsl:call-template>
                     <strow props="graph.headers">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
@@ -743,8 +759,8 @@
                             <!--<stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu</stentry>-->
                             <!--<xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">-->
                                 <!--<xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>-->
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n kosztu <!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>--></stentry>
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n kosztu <!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>--></stentry><!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
+                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n kosztu <xsl:value-of select="$graph.name"/> <!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>--></stentry>
+                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n kosztu <xsl:value-of select="$graph.name"/> <!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>--></stentry><!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
                             <!--</xsl:for-each-group>-->
                         </xsl:for-each-group>
                     </strow>
@@ -764,11 +780,12 @@
                 </xsl:call-template>-->
                 <!--<p>-->
                 <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows" select="$simpletable">
-                    <xsl:with-param name="title"> (APU4-DKT) umowy koszty obiektu tabela </xsl:with-param>
+                    <xsl:with-param name="title" select="$title"/>
+                    <!--<xsl:with-param name="title"> (APU4-DKT) umowy koszty obiektu tabela </xsl:with-param>-->
                     <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
                 </xsl:apply-templates>
                 <!--</p>-->
-                <!--<p>--> (APU4-DKW) umowy koszty obiektu wykres <!--</p>-->
+                <!--<p>--> (<xsl:value-of select="$graph.name"/>) umowy koszty obiektu wykres <!--</p>-->
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
@@ -789,29 +806,34 @@
     
     
     <xsl:template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.related" >
-        <xsl:param name="generate_id" select="@generate-id"/>
+        <xsl:param name="fid" select="@fid"/>
         
         <xsl:param name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset" required="yes"/>
         <xsl:param name="title" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter'"/>
+        <xsl:param name="graph.name" select="'APU4-DPW'"/>
         <!--<strow>
             <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset"/>
         </strow>-->
         <xsl:variable name="SIMPLETABLE_WTITLE">
             <SIMPLETABLE_WTITLE>
                 <simpletable frame="all"
-                    id="ANALIZA_UMOW_4UA.DW.graph.related.deals_table_2_5_{$generate_id}_{$title}"
-                    props="print__no graph.ylabel.. graph.y2label.wartosc graph.style.histogram.rowstacked no.logscale.y1 no.logscale.y2 font15 "><!-- font15 -->
                     
+                    props="print__no graph.ylabel.. graph.y2label.wartosc graph.style.histogram graph.style.histogram  no.logscale.y1 no.logscale.y2 font15 graph.separate.outputs.auto "><!-- graph.style.histogram.rowstacked --><!-- id="ANALIZA_UMOW_4UA.DW.graph.related.deals_table_2_5_{$generate_id}_{$title}" --><!-- font15 -->
+                    <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="graph.name" select="$graph.name"/>
+                        <xsl:with-param name="title" select="$title"/>
+                    </xsl:call-template>
                     <strow props="graph.headers">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
-                            <!--<stentry  current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" props="graph.xtic" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
-                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
+                            <stentry  current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" props="graph.xtic" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>
+                            <!--<stentry  current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
                                 <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
                                 <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>
-                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -820,11 +842,11 @@
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <!--<stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" ><xsl:value-of select="count(current-group())"/></stentry>-->
                             <xsl:variable name="current-group.parent.count" select="count(current-group())"/>
-                            <!--<stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" ><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>-->
+                            <stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" ><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
                                 <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
                                 <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="count(current-group()) "/></stentry><!-- div $current-group.parent.count -->
-                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>-->
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><xsl:value-of select="sum(current-group()/*[@default_db__x3A__BI_audit_BENFORD:leadingNumber]/number())"/></stentry>
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                         
@@ -833,11 +855,11 @@
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
                             <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="rozklad" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">rozkład</stentry>-->
-                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="koszt" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>--><!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
+                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="koszt.{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry><!--<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
                                 <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="iloscB.{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">ilość B.<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry><!--<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
-                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="kosztB.{@default_db__x3A__BI_audit_BENFORD:leadingNumber}" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt B.<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>--><!--<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="iloscB.{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">ilość B.<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry><!--<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" group="kosztB.{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt B.<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry><!--<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>.<xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -890,35 +912,35 @@
                     <strow props="graph.yaxis">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
-                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"/>-->
+                            <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">2</stentry>
                             <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">2</stentry>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
                                 <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
                                 <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  />
-                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >2</stentry>-->
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >2</stentry>
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
                     <strow props="graph.fill.style">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
-                            <!--<stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> with boxes </stentry>-->
+                            <stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><!-- with boxes --></stentry>
                             <!--<stentry current-grouping-key="{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"/>-->
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
                                 <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
-                                <stentry props="graph.title.unique" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />
-                                <!--<stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />-->
+    <!-- graph.title.unique --> <stentry props="graph.title" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />
+                                <stentry props="graph.notitle" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  ><!--with impulses--></stentry>
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
                     <strow props="graph.newhistogram">
                         <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset/*/*" group-by="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]">
                             <xsl:sort select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]" order="ascending"/>
-                            <!--<stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><!-\- analiza \n rozkładu -\-><xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/></stentry>-->
+                            <stentry audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}" current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu <xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/></stentry>
                             <xsl:for-each-group select="current-group()" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
                                 <xsl:sort select="number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)" data-type="number" order="ascending"/>
-                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu <!--<xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/>--></stentry><!-- analiza \n rozkładu -->
-                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"><!-\- analiza \n rozkładu -\-><xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/></stentry>--><!--  analiza \n rozkładu -->
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu <xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/></stentry><!-- analiza \n rozkładu -->
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"> analiza \n rozkładu <xsl:value-of select="replace(@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ],'-','\\n')"/></stentry><!--  analiza \n rozkładu -->
                                 <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">an. <xsl:value-of select="@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]"/></stentry>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
@@ -938,10 +960,11 @@
                     <xsl:with-param name="title"> (APU4-DPT) umowy pośrednio powiązane z obiektem - tabela </xsl:with-param>
                 </xsl:call-template>-->
                 <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows" select="$simpletable">
-                    <xsl:with-param name="title"> (APU4-DPT) umowy pośrednio powiązane z obiektem - tabela </xsl:with-param>
+                    <!--<xsl:with-param name="title"> (APU4-DPT) umowy pośrednio powiązane z obiektem - tabela </xsl:with-param>-->
+                    <xsl:with-param name="title" select="$title"/>
                     <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
                 </xsl:apply-templates>
-                 (APU4-DPW) umowy pośrednio powiązane z obiektem 
+                 (<xsl:value-of select="$graph.name"/>) umowy pośrednio powiązane z obiektem 
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
@@ -951,6 +974,10 @@
                     <xsl:with-param name="path.prefix">../</xsl:with-param>
                 </xsl:apply-templates>
                 
+                <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__analyze">
+                    <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
+                </xsl:call-template>
+                
             </xsl:when>
             <xsl:otherwise>
                 <!--<p props="214a">

+ 156 - 29
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_context.path.keyrefs.xsl

@@ -23,17 +23,93 @@
     <xsl:strip-space elements="*"/>
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__generate__key">
+        <xsl:param name="system_cache__dita:element__x3A__name"/>
+        <xsl:param name="title"/>
+        <xsl:param name="graph.name"/>
+        <xsl:param name="fid"/>
+        <xsl:param name="fileindex"/>
+        <xsl:param name="get_wfs:name_from_fid"/>
+        <xsl:param name="foreign_fallback"/>
+        <xsl:variable name="out">
+            <xsl:if test="$system_cache__dita:element__x3A__name"><xsl:value-of select="concat(',',$system_cache__dita:element__x3A__name)"/></xsl:if>
+            <xsl:if test="$get_wfs:name_from_fid"><xsl:value-of select="concat(',',$get_wfs:name_from_fid)"/></xsl:if>
+            <xsl:if test="$title"><xsl:value-of select="concat(',',$title)"/></xsl:if>
+            <xsl:if test="$graph.name"><xsl:value-of select="concat(',',$graph.name)"/></xsl:if>
+            <xsl:if test="$fid"><xsl:value-of select="concat(',',$fid)"/></xsl:if>
+            <xsl:if test="$fileindex"><xsl:value-of select="concat(',',$fileindex)"/></xsl:if>
+            <xsl:if test="$foreign_fallback"><xsl:value-of select="concat(',',$foreign_fallback)"/></xsl:if>
+            
+        </xsl:variable>
+        <xsl:for-each select="tokenize($out,',')">
+            <xsl:choose>
+                <xsl:when test="current()=''"/>
+                <xsl:when test="position()=last()"><xsl:value-of select="."/><xsl:text></xsl:text></xsl:when>
+                <xsl:otherwise><xsl:value-of select="."/><xsl:text>_</xsl:text></xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+        
+    </xsl:template>
+    
+    
+    
+    
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+        <xsl:param name="system_cache__dita:element__x3A__name"/>
         <xsl:param name="title"/>
+        <xsl:param name="graph.name"/>
         <xsl:param name="fid"/>
-        <xsl:param name="end_name"/>
-        <xsl:param name="end_fid"/>
-        <xsl:param name="pos" />
-        <xsl:attribute name="keys" select="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key.title(system_cache__dita:files.key.DETECT.OTHER($fid,$end_name,$end_fid,$pos),$title)"/>
+        <xsl:param name="fileindex"/>
+        <xsl:param name="get_wfs:name_from_fid" select="get_wfs:name_from_fid($fid)"/>
+        <xsl:param name="foreign_fallback"/>
+            <xsl:attribute name="keys">
+                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__generate__key">
+                    <xsl:with-param name="title" select="$title"/>
+                    <xsl:with-param name="graph.name" select="$graph.name"/>
+                    <xsl:with-param name="fid" select="$fid"/>
+                    <xsl:with-param name="fileindex" select="$fileindex"/>
+                    <xsl:with-param name="system_cache__dita:element__x3A__name" select="$system_cache__dita:element__x3A__name"/>
+                    <xsl:with-param name="get_wfs:name_from_fid" select="$get_wfs:name_from_fid"/>
+                    <xsl:with-param name="foreign_fallback" select="$foreign_fallback"/>
+                </xsl:call-template>
+            </xsl:attribute>
+        
+    </xsl:template>
+    
+    <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
+        <xsl:param name="system_cache__dita:element__x3A__name"/>
+        <xsl:param name="title"/>
+        <xsl:param name="graph.name"/>
+        <xsl:param name="fid"/>
+        <xsl:param name="fileindex"/>
+        
+        <xsl:attribute name="id" >
+            <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+                <xsl:with-param name="system_cache__dita:element__x3A__name" select="$system_cache__dita:element__x3A__name"/>
+                <xsl:with-param name="title" select="$title"/>
+                <xsl:with-param name="graph.name" select="$graph.name"/>
+                <xsl:with-param name="fid" select="$fid"/>
+                <xsl:with-param name="fileindex" select="$fileindex"/>
+                
+            </xsl:call-template>
+        </xsl:attribute>
     </xsl:template>
     
+    
+    
+    
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__resolve__key">
+        
         <xsl:param name="title"/>
+        
         <xsl:param name="fid"/>
         <xsl:param name="end_name"/>
         <xsl:param name="end_fid"/>
@@ -42,11 +118,14 @@
         <xsl:param name="system_cache__dita:element__x3A__surrounding.title">ph</xsl:param>
         <xsl:param name="link__x3A__title"/>
         
+        
+        
         <xsl:variable name="end_fid" select="tokenize($end_fid,' ')[1]"/>
         
         <xsl:choose>
             <xsl:when test="string-length($fid)&gt;0">
-                <xsl:for-each select="tokenize($fid,' ')">
+                <xsl:for-each select="tokenize($fid,' ')[1]">
+                    <xsl:variable name="fid" select="current()"/>
                     <xsl:if test="$link__x3A__title"><xsl:element name="{$system_cache__dita:element__x3A__surrounding.title}"><xsl:value-of select="$link__x3A__title"/></xsl:element></xsl:if>
                     <xsl:element name="{$system_cache__dita:element__x3A__surrounding}">
                         <xsl:choose>
@@ -56,11 +135,21 @@
                             <xsl:otherwise>
                                 <xsl:choose>
                                     <xsl:when test="$system_cache__dita:element__x3A__surrounding='xref'">
-                                        <xsl:attribute name="keyref" select="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key.title(system_cache__dita:files.key.DETECT.OTHER(current(),$end_name,$end_fid,$pos),$title)"/>
+                                        <xsl:attribute name="keyref">
+                                            <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+                                                <xsl:with-param name="fid" select="$fid"/>
+                                                <xsl:with-param name="title" select="$title"/>
+                                            </xsl:call-template>
+                                        </xsl:attribute>
                                     </xsl:when>
                                     <xsl:otherwise>
                                         <xref>
-                                            <xsl:attribute name="keyref" select="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key.title(system_cache__dita:files.key.DETECT.OTHER(current(),$end_name,$end_fid,$pos),$title)"/>
+                                            <xsl:attribute name="keyref" >
+                                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+                                                    <xsl:with-param name="fid" select="$fid"/>
+                                                    <xsl:with-param name="title" select="$title"/>
+                                                </xsl:call-template>
+                                            </xsl:attribute><!-- select="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key.title(system_cache__dita:files.key.DETECT.OTHER(current(),$end_name,$end_fid,$pos),$title)" -->
                                         </xref>
                                     </xsl:otherwise>
                                 </xsl:choose>
@@ -82,35 +171,77 @@
     
     
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__resolve__conkey">
+        <xsl:param name="system_cache__dita:element__x3A__name"/>
         <xsl:param name="title"/>
+        <xsl:param name="graph.name"/>
         <xsl:param name="fid"/>
-        <xsl:param name="end_name"/>
-        <xsl:param name="end_fid"/>
-        <xsl:param name="pos" />
-        <xsl:param name="system_cache__dita:element__x3A__surrounding">ph</xsl:param>
-        <xsl:param name="link__x3A__title"/>
-        <xsl:param name="foreign_fallback"/>
+        
+        <xsl:param name="get_wfs:name_from_fid" select="get_wfs:name_from_fid($fid)"/>
+        <!--<xsl:param name="end_name"/>-->
+        <!--<xsl:param name="end_fid"/>-->
+        <!--<xsl:param name="pos" />-->
+        <!--<xsl:param name="system_cache__dita:element__x3A__surrounding">ph</xsl:param>-->
+        <!--<xsl:param name="link__x3A__title"/>-->
+        <!--<xsl:param name="foreign_fallback"/>-->
         <xsl:param name="foreign_fallback.current_topic_id"/>
         <xsl:param name="foreign_fallback.current_element_id" select="$fid"/>
-        <ph><xsl:value-of select="$fid"/></ph>
+        <!-- <image id="image_hx4_nht_wfb"
+                     conkeyref="BI_audit_ENERGA_PRACOWNICY__x2F__BI_audit_ENERGA_PRACOWNICY.4570___APU4_umowy/image_APU4_umowy_APU4-DPW_BI_audit_ENERGA_PRACOWNICY.4570"
+                  /> -->
         <xsl:choose>
-            <xsl:when test="string-length($fid)&gt;0">
-                <xsl:for-each select="tokenize($fid,' ')">
-                    <xsl:if test="$link__x3A__title"><xsl:element name="ph"><xsl:value-of select="$link__x3A__title"/></xsl:element></xsl:if>
-                    <xsl:element name="{$system_cache__dita:element__x3A__surrounding}">
-                        <xsl:attribute name="conkeyref" select="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key.title(system_cache__dita:files.key.DETECT.OTHER(current(),$end_name,$end_fid,$pos),$title)"/>
-                    </xsl:element>
-                </xsl:for-each>
+            <xsl:when test="string-length($fid)&gt;0 and string-length($system_cache__dita:element__x3A__name)&gt;0">
+                <xsl:element name="{$system_cache__dita:element__x3A__name}">
+                    <xsl:attribute name="conkeyref">
+                        <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+                            <xsl:with-param name="get_wfs:name_from_fid" select="$get_wfs:name_from_fid"/>
+                            <xsl:with-param name="title" select="$title"/>
+                            <xsl:with-param name="fid" select="$fid"/>
+                            <!--<xsl:with-param name="fileindex" select="$fileindex"/>-->
+                        </xsl:call-template>
+                        <xsl:text>/</xsl:text>
+                        <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+                            <xsl:with-param name="system_cache__dita:element__x3A__name" select="$system_cache__dita:element__x3A__name"/>
+                            <xsl:with-param name="title" select="$title"/>
+                            <xsl:with-param name="graph.name" select="$graph.name"/>
+                            <xsl:with-param name="fid" select="$fid"/>
+                            <!--<xsl:with-param name="fileindex" select="$fileindex"/>-->
+                        </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:choose>
+                        <xsl:when test="$foreign_fallback.current_topic_id">
+                            <xsl:attribute name="conref">
+                                <xsl:text>#</xsl:text><xsl:value-of select="$foreign_fallback.current_topic_id"/><xsl:text>/</xsl:text>
+                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+                                    <xsl:with-param name="system_cache__dita:element__x3A__name" select="$system_cache__dita:element__x3A__name"/>
+                                    <xsl:with-param name="title" select="$title"/>
+                                    <xsl:with-param name="graph.name" select="$graph.name"/>
+                                    <xsl:with-param name="fid" select="$fid"/>
+                                    <xsl:with-param name="foreign_fallback" select="true()"/>
+                                    <!--<xsl:with-param name="fileindex" select="$fileindex"/>-->
+                                </xsl:call-template>
+                            </xsl:attribute>
+                        </xsl:when>
+                    </xsl:choose>
+                </xsl:element>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:comment>#56 string-length($fid) =0 </xsl:comment>
             </xsl:otherwise>
         </xsl:choose>
         <xsl:choose>
-            <xsl:when test="$foreign_fallback">
+            <xsl:when test=" $foreign_fallback.current_topic_id">
                 <foreign>
-                    <xsl:element name="{$system_cache__dita:element__x3A__surrounding}">
-                        <xsl:attribute name="id" select="$foreign_fallback.current_element_id"/>
+                    <xsl:element name="{$system_cache__dita:element__x3A__name}">
+                        <xsl:attribute name="id">
+                            <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key">
+                                <xsl:with-param name="system_cache__dita:element__x3A__name" select="$system_cache__dita:element__x3A__name"/>
+                                <xsl:with-param name="title" select="$title"/>
+                                <xsl:with-param name="graph.name" select="$graph.name"/>
+                                <xsl:with-param name="fid" select="$fid"/>
+                                <xsl:with-param name="foreign_fallback" select="true()"/>
+                                <!--<xsl:with-param name="fileindex" select="$fileindex"/>-->
+                            </xsl:call-template>
+                        </xsl:attribute>
                     </xsl:element>
                 </foreign>
             </xsl:when>
@@ -119,10 +250,6 @@
     </xsl:template>
     
     
-    <xsl:function name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__key.title">
-        <xsl:param name="key_string"/>
-        <xsl:param name="title"/>
-        <xsl:value-of select="concat($key_string,$title)"/>
-    </xsl:function>
+    
     
 </xsl:stylesheet>

+ 1 - 1
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA.xsl

@@ -120,7 +120,7 @@
                                         <xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]/*[1]/concat(imiona,' ', nazwisko, ' ',nazwa,' ', nip)"/><!-\- XX1 sure -\->
                                     </xref>-->
                             
-                            <simpletable frame="all" relcolwidth="1* 1* 3* 3*" >
+                            <simpletable frame="all" relcolwidth="1* 1* 3* 5*" >
                                 <sthead>
                                     <stentry><sup>rejestr</sup></stentry>
                                     <stentry><sup>ilosc</sup></stentry>

+ 27 - 15
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.sources.xsl

@@ -273,15 +273,19 @@
                                         <xsl:attribute name="system_cache__dita:interested_row.path.generate-id">
                                             <xsl:value-of select="descendant-or-self::*[position()=1]/@generate-id"/>
                                         </xsl:attribute>
-                                        <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs">
+                                        <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs">
                                             <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                             <xsl:with-param name="context" select="."/>
-                                        </xsl:call-template>
-                                        <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs">
+                                        </xsl:call-template>-->
+                                        <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs">
                                             <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                             <xsl:with-param name="context" select="."/>
-                                        </xsl:call-template>
-                                        <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
+                                        </xsl:call-template>-->
+                                        <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
+                                            <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
+                                            <xsl:with-param name="context" select="."/>
+                                        </xsl:call-template>-->
+                                        <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.parent.attrs">
                                             <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                             <xsl:with-param name="context" select="."/>
                                         </xsl:call-template>
@@ -304,15 +308,19 @@
                                 <xsl:attribute name="system_cache__dita:interested_row.path.generate-id">
                                     <xsl:value-of select="descendant-or-self::*[position()=1]/@generate-id"/>
                                 </xsl:attribute>
-                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs">
+                                <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs">
                                     <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                     <xsl:with-param name="context" select="."/>
-                                </xsl:call-template>
-                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs">
+                                </xsl:call-template>-->
+                                <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs">
                                     <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                     <xsl:with-param name="context" select="."/>
-                                </xsl:call-template>
-                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
+                                </xsl:call-template>-->
+                                <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
+                                    <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
+                                    <xsl:with-param name="context" select="."/>
+                                </xsl:call-template>-->
+                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.parent.attrs">
                                     <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                     <xsl:with-param name="context" select="."/>
                                 </xsl:call-template>
@@ -333,15 +341,19 @@
                                 <xsl:attribute name="system_cache__dita:interested_row.path.generate-id">
                                     <xsl:value-of select="descendant-or-self::*[position()=1]/@generate-id"/>
                                 </xsl:attribute>
-                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs">
+                                <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs">
                                     <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                     <xsl:with-param name="context" select="."/>
-                                </xsl:call-template>
-                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs">
+                                </xsl:call-template>-->
+                                <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs">
                                     <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                     <xsl:with-param name="context" select="."/>
-                                </xsl:call-template>
-                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
+                                </xsl:call-template>-->
+                                <!--<xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
+                                    <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
+                                    <xsl:with-param name="context" select="."/>
+                                </xsl:call-template>-->
+                                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.parent.attrs">
                                     <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                     <xsl:with-param name="context" select="."/>
                                 </xsl:call-template>

+ 47 - 5
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows.xsl

@@ -5,11 +5,15 @@
     xmlns:system_cache__dita="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
     xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot"
     xmlns:default_db__x3A__BI_audit_ENERGA_RUM_UMOWY="https://biuro.biall-net.pl/wfs/default_db/BI_audit_ENERGA_RUM_UMOWY"
+    xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA="https://biuro.biall-net.pl/wfs/default_db/ENERGA_RUM_KONTRAHENCI_POWIAZANIA"
     exclude-result-prefixes="xs"
     version="2.0">
     
     
+    <xsl:output indent="yes"/>
+    <xsl:strip-space elements="*"/>
     
+    <xsl:include href="graph_gnuplot.simpletable__x3A__from_rows__x3A__analyze.xsl"/>
     
     <xsl:template mode="p5gnuplot:simpletable__x3A__from_rows" match="simpletable">
         <xsl:param name="title" />
@@ -23,6 +27,38 @@
         
     
     
+    
+    <xsl:template name="p5gnuplot:simpletable__x3A__from_rows.xsl.dita">
+        <xsl:param name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml"/>
+        <xsl:param name="title" required="yes" />
+        <xsl:param name="xtics" required="yes" />
+        <xsl:param name="ytics" required="yes" />
+        <xsl:param name="ditadir" required="yes"/>
+        <xsl:param name="fileindex" required="yes"/>
+        
+        <xsl:result-document  href="{p5gnuplot:set.graph.gnuplot.dita($fileindex)}" > <!-- hreaf="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.dita" -->
+            <topic xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
+                <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
+                    <xsl:with-param name="title" select="$title"/>
+                    <xsl:with-param name="fileindex" select="$fileindex"/>
+                    <xsl:with-param name="system_cache__dita:element__x3A__name">topic</xsl:with-param>
+                </xsl:call-template>
+                <title/>
+                <body>
+                    <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                        <xsl:with-param name="title" select="$title"/>
+                        <xsl:with-param name="xtics" select="$xtics"/>
+                        <xsl:with-param name="ytics" select="$ytics"/>
+                        <xsl:with-param name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml" select="$system_cache__dita:graph.dat.row__x3A__from__ytics.xml"/>
+                    </xsl:call-template>
+                </body>
+            </topic>
+        </xsl:result-document>
+    </xsl:template>
+    
+    
+    
     <xsl:template name="p5gnuplot:simpletable__x3A__from_rows">
         <xsl:param name="title"/>
         <xsl:param name="xtics" required="yes"/>
@@ -241,13 +277,18 @@
             <xsl:value-of select="$title"/>
         <!--</p>-->
         <simpletable props="nograph">
+            <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
+                <xsl:with-param name="title" select="$title"/>
+                <xsl:with-param name="fileindex" select="$fileindex"/>
+                <xsl:with-param name="system_cache__dita:element__x3A__name">simpletable</xsl:with-param>
+            </xsl:call-template>
             <xsl:call-template name="p5gnuplot:simpletable__x3A__ytics.xml.id">
                 <xsl:with-param name="fileindex" select="$fileindex"/>
             </xsl:call-template>
              <!--<xsl:apply-templates mode="#current" select="@*"/>-->
             <xsl:variable name="xtics.count" select="count(.//p5gnuplot:dat.sthead.ytics.row)"/>
             <xsl:variable name="ytics.count" select="count(.//ytics.row.header/p5gnuplot:dat.sthead)"/>
-            <strow props="xtics xtics.count {$xtics.count} ytics.count {$ytics.count}">
+            <strow props="xtics xtics.count {$xtics.count} ytics.count {$ytics.count}" id="row_0">
                 <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml.xtics">
                     <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
                 </xsl:apply-templates>
@@ -255,9 +296,9 @@
             <xsl:variable name="context" select="."/>
             <xsl:for-each select="1 to $ytics.count">
                 <xsl:variable name="ytics.count.current" select="number(.)"/>
-                <strow props="pos $ytics.count {$ytics.count} - $xtics.count {$xtics.count}  take every n-th for step {$ytics.count}">
+                <strow id="row_{$ytics.count.current}" props="pos $ytics.count {$ytics.count} - $xtics.count {$xtics.count}  take every n-th for step {$ytics.count}">
                     
-                    <stentry props="test_242 header row xtics.count.current= y={$ytics.count.current}">
+                    <stentry id="row_{$ytics.count.current}_col_0" props="test_242 header row xtics.count.current= y={$ytics.count.current}">
                         <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml" select="$context//p5gnuplot:dat.sthead[position()=xs:integer($ytics.count.current)]/@p5gnuplot:text">
                             <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
                         </xsl:apply-templates>
@@ -266,6 +307,7 @@
                     <xsl:for-each select="1 to $xtics.count">
                         <xsl:variable name="xtics.count.current" select="number(.)" />
                         <xsl:comment>#262 ytics.count.current = xtics.count.current = <xsl:value-of select="$xtics.count.current"/> ; <xsl:value-of select="$ytics.count.current"/></xsl:comment>
+                        <xsl:variable name="current.row" select="$xtics.count.current"/>
                         <!--<stentry_test props="test_250 regular row y= {$ytics.count.current} xtics.count.current = ${$xtics.count.current}"/>-->
                         <!--<xsl:if test="$ytics.count.current = 1">
                             <xsl:for-each select="$context//p5gnuplot:dat.sthead[position()=$ytics.count.current]">
@@ -274,9 +316,9 @@
                         </xsl:if>-->
                         <xsl:for-each select="$context//p5gnuplot:ytics.path.row[position() = $xtics.count.current]">
                                  <!--<stentry pos="{position()} test_250 regular row y= {$ytics.count.current} xtics.count.current = {$xtics.count.current}" />-->
-                                    
+                            <xsl:variable name="row_pos_detect" select="position()"/>
                                 <xsl:for-each select="p5gnuplot:dat.strow[position()=$ytics.count.current]">
-                                    <stentry  props="a289">
+                                    <stentry id="row_{$ytics.count.current}_col_{$row_pos_detect}" props="a289">
                                         <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml.value__x3A__expected" select="@p5gnuplot:text">
                                         <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
                                         </xsl:apply-templates>

+ 126 - 0
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows__x3A__analyze.xsl

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
+    xmlns:system_cache__dita="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
+    xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot"
+    xmlns:default_db__x3A__BI_audit_ENERGA_RUM_UMOWY="https://biuro.biall-net.pl/wfs/default_db/BI_audit_ENERGA_RUM_UMOWY"
+    xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA="https://biuro.biall-net.pl/wfs/default_db/ENERGA_RUM_KONTRAHENCI_POWIAZANIA"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    
+    
+    
+    <xsl:template name="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__analyze">
+        <xsl:param name="fileindex" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="p5gnuplot:graph.gnuplot.dita__x3A__if__x3A__aviable($fileindex) and p5gnuplot:graph.debug.xtics.xml__x3A__if__x3A__aviable($fileindex)">
+                <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__analyze" select="doc(p5gnuplot:set.gnuplot.debug.xtics.xml($fileindex))"/>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__analyze" match="*|text()|comment()"/>
+        
+    
+    
+    <xsl:template match="p5gnuplot:xtics" mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__analyze">
+        
+        <dl props="match p5gnuplot xtics mode dita__x3A__analyze">
+        <dlhead>
+            <dthd>opis znalezionych danych </dthd>
+            <ddhd>źródła danych,  osi, wartości, grupy, okresy</ddhd>
+        </dlhead>
+        
+            <xsl:for-each select=".//p5gnuplot:set.graph.separate.outputs.auto">
+                <dlentry>
+                <dt>Raster z wykresem</dt>
+                <dd><xsl:value-of select="@p5gnuplot:value"/><xsl:text> </xsl:text></dd>
+                    <dd><equation-inline>
+                        <image width="150" 
+                            href="{p5gnuplot:graph.output.image__x3A__detect__x3A__path(@p5gnuplot:value)}">
+                            <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
+                                <xsl:with-param name="fileindex" select="@p5gnuplot:value"/>
+                            </xsl:call-template>
+                        </image>
+                    </equation-inline>
+                    
+                        <equation-inline>
+                            
+                            <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset" >
+                                <xsl:with-param name="p5gnuplot:value" select="@p5gnuplot:value"/>
+                            </xsl:call-template>
+                            
+                            
+                        </equation-inline>
+                    
+                    </dd>   
+                    <dd>
+                        Przeważające wartości
+                    </dd>
+                    <dd>
+                        Przeważające obiekty kontekstowe
+                    </dd>
+                    <dd>
+                        Powiązania do innych elementów o podobnych cechach
+                    </dd>
+                    <dd>
+                        Wnioski 
+                    </dd>
+                </dlentry>
+            </xsl:for-each>
+        
+        
+        </dl>
+    </xsl:template>
+    
+    
+    
+    
+    <xsl:template name="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset">
+        <xsl:param name="p5gnuplot:value" required="yes"/>
+        <xsl:comment>#68 p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset</xsl:comment>
+        <!--<xsl:for-each select="">--><!-- root()//p5gnuplot:set.graph.separate.outputs.auto[@p5gnuplot:value=$p5gnuplot:value] -->
+        <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset" select="root()//*[p5gnuplot:set.graph.separate.outputs.auto[@p5gnuplot:value=$p5gnuplot:value]]"/>
+        <!--</xsl:for-each>-->
+        
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset" match="text()|comment()"/>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset" match="*">
+        <!--<xsl:copy>-->
+            <!--<xsl:copy-of select="@*"/>-->
+            <xsl:apply-templates mode="#current"/>
+        <!--</xsl:copy>-->
+    </xsl:template>
+    
+    <xsl:template match="p5gnuplot:file.row.y" mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset">
+        <ph> dane z osi : <xsl:value-of select="@p5gnuplot:value"/></ph>
+    </xsl:template>
+    
+    <!--<xsl:template mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset" match="*">
+        <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:choose>
+                <xsl:when test="following-sibling::p5gnuplot:set.graph.separate.outputs.auto">
+                    <xsl:comment>#88-A found self bypass recurse</xsl:comment> 
+                </xsl:when>
+                <xsl:when test="p5gnuplot:set.graph.separate.outputs.auto">
+                    <xsl:comment>#88-C found self bypass recurse</xsl:comment> 
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates mode="#current"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            
+        </xsl:copy>
+    </xsl:template>-->
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset" match="p5gnuplot:set.graph.separate.outputs.auto">
+        <xsl:comment>#88-B found self bypass recurse</xsl:comment>
+    </xsl:template>
+    
+</xsl:stylesheet>

+ 40 - 15
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl

@@ -5,6 +5,7 @@
     xmlns:system_cache__dita="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
     xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot"
     xmlns:default_db__x3A__BI_audit_ENERGA_RUM_UMOWY="https://biuro.biall-net.pl/wfs/default_db/BI_audit_ENERGA_RUM_UMOWY"
+    xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA="https://biuro.biall-net.pl/wfs/default_db/ENERGA_RUM_KONTRAHENCI_POWIAZANIA"
     exclude-result-prefixes="xs"
     version="2.0">
     
@@ -309,7 +310,7 @@
         <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>
         <xsl:param name="strow" required="yes"/>
         <xsl:param name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml" required="yes"/>
-        
+        <xsl:param name="system_cache__dita:graph.separate.outputs.auto" required="yes"/>
         <xsl:apply-templates mode="system_cache__dita:graph__write" select=".">
             <xsl:with-param name="fileindex" select="$fileindex"/>
         </xsl:apply-templates>
@@ -317,23 +318,23 @@
          <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.xml" >
             <p5gnuplot:DEBUG xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
                 <!--<xsl:copy-of select="$xtics.cols"/>-->
-                <xsl:copy-of select="current()"/>
-                <xsl:copy-of select="//namespace-uri()"/>
+                <!--<xsl:copy-of select="current()"/>-->
+                <!--<xsl:copy-of select="//namespace-uri()"/>-->
             </p5gnuplot:DEBUG>
         </xsl:result-document>
-        <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.xtics.xml" >
+        <xsl:result-document href="{p5gnuplot:set.gnuplot.debug.xtics.xml($fileindex)}" ><!-- {$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.xtics.xml -->
             <p5gnuplot:xtics xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
                         <!--<xsl:copy-of select="$xtics.cols"/>-->
-                <xsl:copy-of select="namespace-uri()"/>
-                <xsl:copy-of select="//namespace-uri()"/>
+                <!--<xsl:copy-of select="namespace-uri()"/>-->
+                <!--<xsl:copy-of select="//namespace-uri()"/>-->
                 <xsl:copy-of select="$xtics"/>
             </p5gnuplot:xtics>
         </xsl:result-document>
         
         <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.graph.ytics_detect_row.xml" >
             <p5gnuplot:graph.ytics_detect_row xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
-                <xsl:copy-of select="namespace-uri()"/>
-                <xsl:copy-of select="//namespace-uri()"/>
+                <!--<xsl:copy-of select="namespace-uri()"/>-->
+                <!--<xsl:copy-of select="//namespace-uri()"/>-->
                 <xsl:copy-of select="$system_cache__dita:graph.ytics_detect_row"/>
             </p5gnuplot:graph.ytics_detect_row>
         </xsl:result-document>
@@ -341,8 +342,8 @@
         <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.ytics.xml" >
             <p5gnuplot:graph.ytics xmlns:p5gnuplot="http://biuro.biall-net.pl/WPS_Functions/graph_gnuplot">
                 <!--<xsl:copy-of select="$xtics.cols"/>-->
-                <xsl:copy-of select="namespace-uri()"/>
-                <xsl:copy-of select="//namespace-uri()"/>
+                <!--<xsl:copy-of select="namespace-uri()"/>-->
+                <!--<xsl:copy-of select="//namespace-uri()"/>-->
                 <xsl:copy-of select="$ytics"/>
             </p5gnuplot:graph.ytics>
         </xsl:result-document>
@@ -382,8 +383,10 @@
 </xsl:text>
     </xsl:otherwise>
 </xsl:choose>
+<xsl:call-template name="p5gnuplot:set.graph.output">
+    <xsl:with-param name="fileindex" select="$fileindex"/>
+</xsl:call-template>
 <xsl:text>
-set output '</xsl:text><xsl:value-of select="$fileindex"/>.png'<xsl:text>
 set boxwidth 0.75
 set datafile missing "-"
 set style fill solid
@@ -514,7 +517,17 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:result-document>
-       
+        
+            <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows.xsl.dita">
+                <xsl:with-param name="title" select="$title"/>
+                <xsl:with-param name="xtics" select="$xtics"/>
+                <xsl:with-param name="ytics" select="$ytics"/>
+                <xsl:with-param name="fileindex" select="$fileindex"/>
+                <xsl:with-param name="ditadir" select="$ditadir"/>
+                
+                <xsl:with-param name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml" select="$system_cache__dita:graph.dat.row__x3A__from__ytics.xml"/>
+            </xsl:call-template>
+        
         
     </xsl:template>
     
@@ -633,7 +646,11 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
             <xsl:when test="$title">
                 <fig>
                     <title><xsl:value-of select="$title"/></title>
-                    <image href="{$path.prefix}graph_to_image/{$fileindex}.png" width="{$width}">
+                    <image href="{$path.prefix}graph_to_image/{$fileindex}.png" width="{$width}" ><!-- id="image.{$fileindex}" -->
+                        <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
+                            <xsl:with-param name="fileindex" select="$fileindex"/>
+                            <xsl:with-param name="system_cache__dita:element__x3A__name">image</xsl:with-param>
+                        </xsl:call-template>
                         <xsl:choose>
                             <xsl:when test="string-length(string($height)) &gt;0"><xsl:attribute name="height" select="$height"/></xsl:when>
                         </xsl:choose>
@@ -641,14 +658,22 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
                 </fig>
             </xsl:when>
             <xsl:otherwise>
-                <image href="{$path.prefix}graph_to_image/{$fileindex}.png" width="{$width}" id="image.{$fileindex}">
+                <image href="{$path.prefix}graph_to_image/{$fileindex}.png" width="{$width}" ><!-- id="image.{$fileindex}" -->
+                    <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.keyref__x3A__assign__id">
+                        <xsl:with-param name="fileindex" select="$fileindex"/>
+                        <xsl:with-param name="system_cache__dita:element__x3A__name">image</xsl:with-param>
+                    </xsl:call-template>
                     <xsl:choose>
                         <xsl:when test="string-length(string($height)) &gt;0"><xsl:attribute name="height" select="$height"/></xsl:when>
                     </xsl:choose>
                 </image>
             </xsl:otherwise>
         </xsl:choose>
-        
+        <!--<xsl:choose>
+            <xsl:when test="p5gnuplot:graph.gnuplot.dita__x3A__if__x3A__aviable($fileindex) and p5gnuplot:graph.debug.xtics.xml__x3A__if__x3A__aviable($fileindex)">
+                <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__analyze" select="doc(p5gnuplot:set.gnuplot.debug.xtics.xml($fileindex))"/>
+            </xsl:when>
+        </xsl:choose>-->
     </xsl:template>
     
     <xsl:template mode="system_cache__dita:graph_to_image" match="*">

+ 72 - 3
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.xsl

@@ -41,6 +41,7 @@
         <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
+        <xsl:param name="system_cache__dita:graph.separate.outputs.auto"/>
         <xtics fileindex="{$fileindex}">
             <xsl:variable name="xtics">
                 <xtics>
@@ -158,6 +159,32 @@
                 </p5gnuplot:graph.newhistogram__x3A__to_analyze>
             </xsl:variable>
             <xsl:copy-of select="$p5gnuplot:graph.newhistogram__x3A__to_analyze//graph.newhistogram"/><!-- //graph.newhistogram -->
+            <xsl:choose>
+                <xsl:when test="string-length($system_cache__dita:graph.separate.outputs.auto)&gt;0">
+                    <xsl:comment>#182 extra all graph copied</xsl:comment>
+                    <xsl:apply-templates mode="p5gnuplot:graph.newhistogram" select="$p5gnuplot:graph.newhistogram__x3A__to_analyze">
+                        <xsl:with-param name="fileindex"  tunnel="yes" select="$fileindex"/>
+                        <xsl:with-param name="graph.fill.style" tunnel="yes"  select="$graph.fill.style" />
+                        <xsl:with-param name="graph.color.name" select="$graph.color.name" tunnel="yes"/>
+                        <xsl:with-param name="xtics" select="$xtics" tunnel="yes"/>
+                        <xsl:with-param name="graph.color.variable" select="$graph.color.variable" tunnel="yes"/>
+                        <xsl:with-param name="graph.yaxis" select="$graph.yaxis" tunnel="yes"/>
+                        <xsl:with-param name="p5gnuplot:font__x3A__size" select="$p5gnuplot:font__x3A__size" tunnel="yes"/>
+                        <xsl:with-param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" select="$p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" tunnel="yes"/>
+                        <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size" tunnel="yes"/>
+                        <xsl:with-param name="graph.data" select="$graph.data" tunnel="yes"/>
+                        <xsl:with-param name="ytics" select="$ytics" tunnel="yes"/>
+                        <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram" tunnel="yes"/>
+                        <xsl:with-param name="simpletable.props" select="$simpletable.props" tunnel="yes"/>
+                        <xsl:with-param name="p5gnuplot:logscale.y1" select="$p5gnuplot:logscale.y1" tunnel="yes"/>
+                        <xsl:with-param name="p5gnuplot:logscale.y2" select="$p5gnuplot:logscale.y2" tunnel="yes"/>
+                        <xsl:with-param name="system_cache__dita:graph.separate.outputs.auto" select="''" tunnel="yes"/>
+                    </xsl:apply-templates>
+                    <xsl:call-template name="p5gnuplot:set.graph.output">
+                        <xsl:with-param name="fileindex" select="$fileindex"/>
+                    </xsl:call-template>
+                </xsl:when>
+            </xsl:choose>
             <xsl:apply-templates mode="p5gnuplot:graph.newhistogram" select="$p5gnuplot:graph.newhistogram__x3A__to_analyze">
                 <xsl:with-param name="fileindex"  tunnel="yes" select="$fileindex"/>
                 <xsl:with-param name="graph.fill.style" tunnel="yes"  select="$graph.fill.style" />
@@ -174,8 +201,11 @@
                 <xsl:with-param name="simpletable.props" select="$simpletable.props" tunnel="yes"/>
                 <xsl:with-param name="p5gnuplot:logscale.y1" select="$p5gnuplot:logscale.y1" tunnel="yes"/>
                 <xsl:with-param name="p5gnuplot:logscale.y2" select="$p5gnuplot:logscale.y2" tunnel="yes"/>
+                <xsl:with-param name="system_cache__dita:graph.separate.outputs.auto" select="$system_cache__dita:graph.separate.outputs.auto" tunnel="yes"/>
             </xsl:apply-templates>
-                
+            
+            
+            
         </xtics>
     </xsl:template>
     
@@ -201,7 +231,7 @@
         <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
-        
+        <xsl:param name="system_cache__dita:graph.separate.outputs.auto" required="yes" tunnel="yes"/>
         <p5gnuplot:graph.newhistogram>
             <xsl:call-template name="p5gnuplot:set.graph.style.histogram.rowstacked"/>
             <xsl:call-template name="p5gnuplot:set.xtics.rotate"/>
@@ -211,6 +241,18 @@
             <xsl:call-template name="p5gnuplot:set.yrange"/>
             <xsl:call-template name="p5gnuplot:set.logscale.y1"/>
             <xsl:call-template name="p5gnuplot:set.logscale.y2"/>
+            
+            <xsl:choose>
+                <xsl:when test="string-length($system_cache__dita:graph.separate.outputs.auto) &gt;0">
+                    <xsl:call-template name="p5gnuplot:set.graph.separate.outputs.auto">
+                        <xsl:with-param name="fileindex" select="$fileindex"/>
+                        <xsl:with-param name="position" select="0"/>
+                    </xsl:call-template>
+                </xsl:when>
+            </xsl:choose>
+            
+            
+            
             <p5gnuplot:graph.newhistogram.child>
                 <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
 </xsl:text></xsl:attribute>
@@ -242,6 +284,7 @@
         <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
+        <xsl:param name="system_cache__dita:graph.separate.outputs.auto" required="yes" tunnel="yes"/>
         <xsl:comment>#72 @pos=<xsl:value-of select="@pos"/></xsl:comment>
         <p5gnuplot:plot p5gnuplot:text.join=" ">
             <xsl:variable name="current.current-grouping-key">
@@ -307,13 +350,37 @@
                 <xsl:when test="1=1 and audience[@current-grouping-key.foreign='false'] and string-length($test.following.current-grouping-key_x3A__different)=0 ">
                     <xsl:comment>#146 bypassed  histograms</xsl:comment>
                 </xsl:when>
+                
+                <!--<xsl:when test="$system_cache__dita:graph.separate.outputs.auto">
+                    <xsl:call-template name="p5gnuplot:set.graph.separate.outputs.auto">
+                        <xsl:with-param name="fileindex" select="$fileindex"/>
+                        <xsl:with-param name="position" select="count(preceding::graph.newhistogram)"/>
+                    </xsl:call-template>
+                </xsl:when>-->
+                
                 <xsl:otherwise>
                     <xsl:choose>
+                        <xsl:when test="$system_cache__dita:graph.separate.outputs.auto">
+                            <xsl:attribute name="debug">#324 due to $system_cache__dita:graph.separate.outputs.auto bypassed (,,,)</xsl:attribute>
+                            <xsl:choose>
+                                <xsl:when test="preceding::graph.newhistogram">
+                                    <xsl:call-template name="p5gnuplot:set.graph.separate.outputs.auto">
+                                        <xsl:with-param name="fileindex" select="$fileindex"/>
+                                        <xsl:with-param name="position" select="count(preceding::graph.newhistogram)"/>
+                                    </xsl:call-template>
+                                </xsl:when>
+                                <xsl:otherwise/>
+                            </xsl:choose>
+                            
+                        </xsl:when>
                         <xsl:when test="preceding::graph.newhistogram">
                             <xsl:attribute name="p5gnuplot:text.line.join"> , </xsl:attribute>
                         </xsl:when>
                     </xsl:choose>
-                    <xsl:attribute name="p5gnuplot:text"> newhistogram <xsl:value-of select="system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(@graph.newhistogram.text,40),$system_cache__dita:graph.lingstring__x3A__break.size)"/> </xsl:attribute>
+                    <p5gnuplot:newhistogram.child>
+                        <xsl:attribute name="p5gnuplot:text"> newhistogram <xsl:value-of select="system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(@graph.newhistogram.text,40),$system_cache__dita:graph.lingstring__x3A__break.size)"/> </xsl:attribute>
+                    </p5gnuplot:newhistogram.child>
+                    
                 </xsl:otherwise>
             </xsl:choose>
             <xsl:apply-templates mode="#current"/>
@@ -338,6 +405,7 @@
         <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
+        <xsl:param name="system_cache__dita:graph.separate.outputs.auto" required="yes" tunnel="yes"/>
         <p5gnuplot:newhistogram  p5gnuplot:text.join=" " debug="#281 matched: {name()}">
             <!--<xsl:choose>
                 <xsl:when test="preceding::audience">-->
@@ -364,6 +432,7 @@
         <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
+        <xsl:param name="system_cache__dita:graph.separate.outputs.auto" required="yes" tunnel="yes"/>
         <p5gnuplot:plot_arg p5gnuplot:text.join=" " debug="#303 matched: {name()}">
             <!--<xsl:if test="preceding::current-grouping-key">
             <xsl:attribute name="p5gnuplot:text.join"> , </xsl:attribute>

+ 30 - 0
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__detect.xsl

@@ -318,7 +318,37 @@ set xtics rotate
         </xsl:choose>
     </xsl:template>
     
+    <xsl:template name="system_cache__dita:graph.separate.outputs.auto__x3A__detect">
+        <xsl:choose>
+            <xsl:when test="contains(@props,'graph.separate.outputs.auto')"><xsl:value-of select="1"/></xsl:when>
+            <xsl:otherwise></xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:function name="p5gnuplot:graph.gnuplot.dita__x3A__if__x3A__aviable">
+        <xsl:param name="fileindex"/>
+        <xsl:choose>
+            <xsl:when test="doc-available(p5gnuplot:set.graph.gnuplot.dita($fileindex))">
+                <xsl:value-of select="true()"/>
+                <xsl:message>#323 p5gnuplot:set.graph.gnuplot.dita__x3A__if__x3A__aviable for $fileindex=<xsl:value-of select="$fileindex"/></xsl:message>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:function>
+    
+    <xsl:function name="p5gnuplot:graph.debug.xtics.xml__x3A__if__x3A__aviable">
+        <xsl:param name="fileindex"/>
+        <xsl:choose>
+            <xsl:when test="doc-available(p5gnuplot:set.gnuplot.debug.xtics.xml($fileindex))">
+                <xsl:value-of select="true()"/>
+                <xsl:message>#323 p5gnuplot:set.graph.debug.ytics.xml__x3A__if__x3A__aviable for $fileindex=<xsl:value-of select="$fileindex"/></xsl:message>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:function>
     
     
+    <xsl:function name="p5gnuplot:graph.output.image__x3A__detect__x3A__path">
+        <xsl:param name="p5gnuplot:value"/>
+        <xsl:value-of select="concat($ditadir,'/graph_to_image/',$p5gnuplot:value)"/>
+    </xsl:function>
     
 </xsl:stylesheet>

+ 49 - 0
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl

@@ -180,4 +180,53 @@
     </xsl:template>
     
     
+    
+    <xsl:template name="p5gnuplot:set.graph.separate.outputs.auto">
+        <xsl:param name="position" required="yes"/>
+        <xsl:param name="fileindex" required="yes"/>
+        <p5gnuplot:set.graph.separate.outputs.auto debug="test multi out" >
+            <xsl:attribute name="p5gnuplot:position" select="$position"/>
+            
+            <xsl:attribute name="p5gnuplot:value"><xsl:value-of select="$fileindex"/>.<xsl:value-of select="$position"/>.png</xsl:attribute>
+            <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+            <xsl:attribute name="p5gnuplot:text"> set output &apos;<xsl:value-of select="$fileindex"/>.<xsl:value-of select="$position"/>.png&apos; </xsl:attribute>
+            <p5gnuplot:set.newline>
+                <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                <xsl:choose>
+                    <xsl:when test="$position=0"/>
+                    <xsl:otherwise>
+                        <xsl:attribute name="p5gnuplot:text"> plot </xsl:attribute>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </p5gnuplot:set.newline>
+        </p5gnuplot:set.graph.separate.outputs.auto>
+    </xsl:template>
+    
+    
+    <xsl:template name="p5gnuplot:set.graph.output">
+        <xsl:param name="fileindex" required="yes"/>
+        <xsl:text>
+set output '</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.png'
+</xsl:text>
+    </xsl:template>
+    
+    
+    
+    <xsl:function name="p5gnuplot:set.gnuplot.debug.xtics.xml">
+        <xsl:param name="fileindex"/>
+        <xsl:value-of select="concat($ditadir,'/graph_to_image/',$fileindex,'.gnuplot.debug.xtics.xml')"/>
+    </xsl:function>
+    
+    <xsl:function name="p5gnuplot:set.graph.gnuplot.dita">
+        <xsl:param name="fileindex"/>
+        <xsl:value-of select="concat($ditadir,'/graph_to_image/',$fileindex,'.gnuplot.dita')"/>
+    </xsl:function>
+    
+    <xsl:function name="p5gnuplot:set.graph.output.image">
+        <xsl:param name="fileindex"/>
+        <xsl:value-of select="concat($ditadir,'/graph_to_image/',$fileindex,'.png')"/>
+    </xsl:function>
+    
 </xsl:stylesheet>

+ 7 - 0
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat__x3A__init.xsl

@@ -26,6 +26,11 @@
         <xsl:param name="graph.nokey"/>
         <xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" select="50"/>
         <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" select="12"/>
+        
+        <xsl:variable name="system_cache__dita:graph.separate.outputs.auto">
+            <xsl:call-template name="system_cache__dita:graph.separate.outputs.auto__x3A__detect"/>
+        </xsl:variable>
+        
         <xsl:variable name="system_cache__dita:graph.lingstring__x3A__break.size">
             <xsl:call-template name="system_cache__dita:graph.lingstring__x3A__break.size__x3A__detect">
                 <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size"/>
@@ -172,6 +177,7 @@
                 <xsl:with-param name="simpletable.props" select="@props" tunnel="yes"/>
                 <xsl:with-param name="p5gnuplot:logscale.y1" select="$p5gnuplot:logscale.y1" tunnel="yes"/>
                 <xsl:with-param name="p5gnuplot:logscale.y2" select="$p5gnuplot:logscale.y2" tunnel="yes"/>
+                <xsl:with-param name="system_cache__dita:graph.separate.outputs.auto" select="$system_cache__dita:graph.separate.outputs.auto"/>
             </xsl:call-template>
         </xsl:variable>
         
@@ -225,6 +231,7 @@
                     <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size"/>
                     <xsl:with-param name="strow" select="$strow"/>
                     <xsl:with-param name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml" select="$system_cache__dita:graph.dat.row__x3A__from__ytics.xml"/>
+                    <xsl:with-param name="system_cache__dita:graph.separate.outputs.auto" select="$system_cache__dita:graph.separate.outputs.auto"/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:when test="$system_cache__dita:graph__x3A__variables__x3A__init__x3A__call='p5gnuplot:simpletable__x3A__from_rows'">

+ 31 - 1
se.oxygen.xpr

@@ -18,7 +18,7 @@
                         <scenarioAssociation-array>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-136_000006_/relations-136_000006_.ditamap</String>
+                                    <String>../../procesy5-dita-templates-druki/PROJEKTY/6768.Grozby_Karalne_rafal_zol_2017_06/6768.grozby_karalne_rafal_zol_2017_06.reltable.ditamap</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -46,6 +46,36 @@
                                     </list>
                                 </field>
                             </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-136_000006_/relations-136_000006_.ditamap</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>DITAMAP</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-136_000006_/graph_to_image/BI_audit_ENERGA_PRACOWNICY_APU4_umowy_APU4-DPW_BI_audit_ENERGA_PRACOWNICY.432.gnuplot.dita</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>DITAMAP</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-136_000004/relations-136_000004.ditamap</String>