Przeglądaj źródła

Merge branch 'master' of bn.git:plabudda/se

Piotr Labudda 7 lat temu
rodzic
commit
06f584b1fd
35 zmienionych plików z 3065 dodań i 802 usunięć
  1. 1 1
      SE/bash_sync_perms.php
  2. 8 7
      SE/schema/WPS_Functions/ant/build.p5ant.create_new_WPS_Function.from_git.xml
  3. 3 0
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.xsl
  4. 26 0
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD__x3A__generate.xsl
  5. 113 26
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.xsl
  6. 418 102
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl
  7. 255 0
      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
  8. 7 1
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_context.path.xsl
  9. 1 0
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_middle_ref.xsl
  10. 9 0
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_operational_raport_note.xsl
  11. 15 6
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.xsl
  12. 20 12
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA.xsl
  13. 91 1
      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
  14. 9 0
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.stats_all.xsl
  15. 89 1
      SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.xsl
  16. 381 52
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows.xsl
  17. 146 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows__x3A__analyze.xsl
  18. 112 499
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl
  19. 150 38
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.xsl
  20. 58 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__dat.xsl
  21. 238 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__detect.xsl
  22. 97 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__fix.xsl
  23. 102 1
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl
  24. 245 31
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.xsl
  25. 1 1
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.yaxis.xsl
  26. 256 0
      SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat__x3A__init.xsl
  27. 6 3
      SE/schema/default_db_xml_cache.public/default_db/system_cache__dita.map.title__x3A__to_merge/tree_to_dita__x3A__map.title.xsl
  28. 8 2
      SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__to_merge/tree_to_dita__x3A__indexterm.xsl
  29. 2 2
      SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__to_merge/tree_to_dita__x3A__parts__x3A__map.title.xsl
  30. 30 0
      SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__to_merge/tree_to_dita__x3A__platform.xsl
  31. 9 0
      SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.files.xsl
  32. 28 0
      SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.localname.translate.xsl
  33. 2 0
      SE/schema/default_db_xml_cache.public/default_db/tree_to_dita__x3A__to_merge.xsl
  34. 30 13
      SE/se-lib/Route/UrlAction/BiAuditGenerate.php
  35. 99 3
      se.oxygen.xpr

+ 1 - 1
SE/bash_sync_perms.php

@@ -545,7 +545,7 @@ class SyncPerms {
 		echo "DBG: UrlAction_WmsGenerate->doGenerate() END\n";
 
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() START...\n";
-		Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate(); //musze przetestowac raport!
+		//Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate(); //musze przetestowac raport!
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() END\n";
 	}
 

+ 8 - 7
SE/schema/WPS_Functions/ant/build.p5ant.create_new_WPS_Function.from_git.xml

@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="../../."  
+<project basedir="../../."  name="create_new_WPS_Function.from_git"
     xmlns:p5ant="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache.public/ant/ant.xsd"
     >
     
     <description>to extend p5ant.PRODUCT for dymamic download and install some module from git and maintain its changes/reposiory etc for further implementations</description>
   
     <!--<include file="build.p5ant.PRODUCT.xml" optional="yes" as="PRODUCT"/>-->
-    <!--<include file="build_ant.xml" optional="true" as="build_ant"/>-->
+    <!--<import file="build_ant.xml"  as="p5ant"/>--><!-- optional="true" -->
     <!--<import file="build_ant.xml" optional="yes" as="p5ant"/>-->
+    <!--<include file="build.p5ant.create_new_WPS_Function.xml" as="create_new_WPS_Function"/>-->
+    <include file="build.p5ant.create_new_WPS_Function.input.xml"  as="input" />
+    <extension-point name="from_git"  depends="url_input,input.input,create_new_WPS_Function.create_all,install" description="to create new module with initial git clone "/>
     
-    <extension-point name="create_new_WPS_Function.from_git"  depends="git.url.input,create_new_WPS_Function.input,create_new_WPS_Function,from_git.install" description="to create new module with initial git clone "/>
-    
-    <target name="git.url.input"  depends="create_new_WPS_Function.input">
+    <target name="url_input"  depends="input.input">
         <input addproperty="p5ant.WPS_Functions.PRODUCT.git.url.input" message="p5ant.WPS_Functions.PRODUCT.git.url.input - type git url e.g. https://github.com/shen139/openwebspider.git"/>
         
     </target>
     
-    <target name="from_git.install"    >
+    <target name="install"    >
         <description>will create ant build for maintain git resource</description>
         <property name="p5ant.WPS_Functions.PRODUCT.git.xml" location="${p5ant.WPS_Functions.basedir}/build.${p5ant.WPS_Functions.PRODUCT.prefix.input}.INSTALL.git.xml"/>
         
@@ -43,7 +44,7 @@
                         <available file="$${${p5ant.WPS_Functions.PRODUCT.prefix.input}.repository}/${p5ant.WPS_Functions.PRODUCT.prefix.input}.git" />
                 </condition>
                 
-                <target name="default"  depends="clone" /> <!-- depends="PRODUCT.PRODUCT,INSTALL.INSTALL" -->
+                <extension-point name="default"  depends="clone" extensionOf="INSTALL.git" /> <!-- depends="PRODUCT.PRODUCT,INSTALL.INSTALL" -->
                 
                 <target name="clone" unless="${p5ant.WPS_Functions.PRODUCT.prefix.input}.git.if.exists" description="To git clone from $${${p5ant.WPS_Functions.PRODUCT.prefix.input}.git.url}">
                     <mkdir dir="$${${p5ant.WPS_Functions.PRODUCT.prefix.input}.git}"/>

+ 3 - 0
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.xsl

@@ -72,6 +72,9 @@
         </default_db__x3A__BI_audit_BENFORD:valueField>
     </xsl:template>
  
+ 
+    
+ 
     <xsl:template name="default_db__x3A__BI_audit_BENFORD:groupField" >
         <default_db__x3A__BI_audit_BENFORD:groupField>
             <xsl:choose>

+ 26 - 0
SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD__x3A__generate.xsl

@@ -61,6 +61,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField" required="yes" tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField" required="yes" tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField" required="yes" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField" required="yes" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField" required="yes" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" required="yes" tunnel="yes" />
         <xsl:choose>
             <xsl:when test="local-name()=$default_db__x3A__BI_audit_BENFORD:valueField  and number(text())">
                 <xsl:attribute name="default_db__x3A__BI_audit_BENFORD:leadingNumber" select="substring(text(),1,1)"/>
@@ -74,6 +77,7 @@
                 <xsl:attribute name="default_db__x3A__BI_audit_BENFORD:leadingTimeUnit" select="'year'"/>
             </xsl:when>
         </xsl:choose>
+        
         <xsl:variable name="current" select="."/>
         <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:groupField,',')">
             <xsl:choose>
@@ -83,6 +87,28 @@
                 </xsl:when>
             </xsl:choose>
         </xsl:for-each>
+        <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:AddressField,',')">
+            <xsl:choose>
+                <xsl:when test="$current/local-name() = current()">
+                    <xsl:attribute name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$current/text()"/>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:for-each>
+        <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:PeselField,',')">
+            <xsl:choose>
+                <xsl:when test="$current/local-name() = current()">
+                    <xsl:attribute name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$current/text()"/>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:for-each>
+        <xsl:for-each select="tokenize($default_db__x3A__BI_audit_BENFORD:TaxIdField,',')">
+            <xsl:choose>
+                <xsl:when test="$current/local-name() = current()">
+                    <xsl:attribute name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$current/text()"/>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:for-each>
+        
         <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:generate.leadingNumber.column">
             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:FieldType" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:FieldTypeName" select="'NameField'"/>

+ 113 - 26
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.xsl

@@ -37,6 +37,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"   required="yes" tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"   required="yes" tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField" tunnel="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField" required="yes" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField" required="yes" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" required="yes" tunnel="yes" />
         <!--<xsl:param name="system_cache__dita:bypass_pos_grouping"/>-->
         <!--<xsl:variable name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed">
             <xsl:choose>
@@ -156,6 +159,9 @@
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField"    select="$default_db__x3A__BI_audit_BENFORD:valueField" />
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"  />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
@@ -173,6 +179,9 @@
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField"    select="$default_db__x3A__BI_audit_BENFORD:valueField" />
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"  />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
@@ -193,6 +202,9 @@
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField"    select="$default_db__x3A__BI_audit_BENFORD:valueField" />
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"  />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
@@ -209,6 +221,9 @@
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField"    select="$default_db__x3A__BI_audit_BENFORD:valueField" />
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                                                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"  />
+                                                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq"/>
                                                     <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
@@ -264,6 +279,7 @@
                                             <xsl:with-param name="position" select="position()"/>
                                             <xsl:with-param name="resulset" select="$resulset"/>
                                             <xsl:with-param name="title" select="concat($title,$source)"/>
+                                            <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
                                         </xsl:apply-templates>
                                     </xsl:when>
                                     <xsl:when test="$mode = 'BI_audit_ENERGA_RUM_KONTRAHENCI'">
@@ -272,6 +288,7 @@
                                             <xsl:with-param name="position" select="position()"/>
                                             <xsl:with-param name="resulset" select="$resulset"/>
                                             <xsl:with-param name="title" select="concat($title,$source)"/>
+                                            <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed//fixed[@generate-id=current()/@generate-id][1]"/>
                                         </xsl:apply-templates>
                                     </xsl:when>
                                     <xsl:otherwise>
@@ -351,10 +368,12 @@
     <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.title system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" match="text()|comment()"/>
     
     <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.title" match="*">
+        <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" />
         <xsl:param name="title" select="'Powiązań '"/>
         <xsl:param name="count"/>
         <xsl:param name="position"/>
         <xsl:param name="limit"/>
+        
         <title>
             
             <menucascade>
@@ -449,17 +468,18 @@
     </xsl:template>-->
     
     <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" match="*">
+        <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" />
         <xsl:param name="title" select="'Ścieżka śledzenia do '"/>
         <xsl:param name="count"/>
         <xsl:variable name="context" select="."/>
         <xsl:choose>
             <xsl:when test="Numer_kontrahenta/text()|ID/text()|source/text()|jednostka_organizacyjna/text()">
-                <ph>
+               <sup><ph>
                     <xsl:if test="Numer_kontrahenta/text()"> nr kontr: <b><xsl:value-of select="Numer_kontrahenta"/></b></xsl:if>
                     <xsl:if test="jednostka_organizacyjna/text()"> nr kontr: <b><xsl:value-of select="jednostka_organizacyjna"/></b></xsl:if>
                     <xsl:if test="ID/text()"> ID <b><xsl:value-of select="ID"/></b></xsl:if>
                     <xsl:if test="source/text()"> source <b><xsl:value-of select="source"/></b></xsl:if>
-                </ph>
+               </ph></sup> 
             </xsl:when>
         </xsl:choose>
         <xsl:choose>
@@ -470,34 +490,35 @@
                     <xsl:with-param name="text"/>
                     <xsl:with-param name="system_cache__dita:indexterm" select="system_cache__dita:indexterm('Ścieżka śledzenia','')"/>
                 </xsl:call-template>
-                <ph>
+                <sup><ph>
                     <xsl:if test="nazwa/text()"> nazwa: <b><xsl:value-of select="replace(nazwa,'SPÓŁKA Z OGRANICZONĄ ODPOWIEDZIALNOŚCIĄ',' (Sp. z o.o.) ')"/></b></xsl:if>
                     <xsl:if test="Pelna_nazwa_kontrahenta/text()"> nazwa : <b><xsl:value-of select="replace(Pelna_nazwa_kontrahenta,'SPÓŁKA Z OGRANICZONĄ ODPOWIEDZIALNOŚCIĄ',' (Sp. z o.o.) ')"/></b></xsl:if>
-                </ph>
+                </ph></sup>
             </xsl:when>
         </xsl:choose>
         
         <xsl:choose>
             <xsl:when test="imiona/text()|nazwisko/text()">
-                <ph>
+                <sup><ph>
                     <xsl:if test="nazwisko/text()"> nazwisko: <b><xsl:value-of select="nazwisko"/></b></xsl:if>
                     <xsl:if test="imiona/text()"> imiona: <b><xsl:value-of select="imiona"/></b></xsl:if>
-                </ph>
+                </ph></sup>
             </xsl:when>
         </xsl:choose>
         
         <xsl:choose>
             <xsl:when test="pesel/text()|PESEL/text()">
-                <ph>
+                <sup><ph>
                     <xsl:if test="pesel/text()"> PESEL: <b><xsl:value-of select="pesel"/></b></xsl:if>
                     <xsl:if test="PESEL/text()"> PESEL: <b><xsl:value-of select="PESEL"/></b></xsl:if>
-                </ph>
+                </ph></sup>
             </xsl:when>
         </xsl:choose>
         
         <xsl:choose>
             <xsl:when test="krs/text()|regon/text()|KRS/text()|REGON/text()|NIP/text()|nip/text()">
-                <ph>
+                <sup>
+                    <ph>
                     <xsl:if test="krs/text()"> KRS: <b><xsl:value-of select="krs"/></b></xsl:if>
                     <xsl:if test="KRS/text()"> KRS: <b><xsl:value-of select="KRS"/></b></xsl:if>
                     <xsl:if test="regon/text()"> REGON: <b><xsl:value-of select="regon"/></b></xsl:if>
@@ -506,23 +527,27 @@
                     <xsl:if test="nip/text()"> NIP: <b><xsl:value-of select="nip"/></b></xsl:if>
                     
                 </ph>
+                </sup>
             </xsl:when>
         </xsl:choose>
         
         <xsl:choose>
             <xsl:when test="S_kraj/text()|S_wojewodztwo/text()">
-                <ph>
+                <sup>
+                    <ph>
                     <xsl:if test="S_kraj/text()"> kraj: <b><xsl:value-of select="S_kraj"/></b></xsl:if>
                     <xsl:if test="S_wojewodztwo/text()"> woj.: <b><xsl:value-of select="S_wojewodztwo"/></b></xsl:if>
                     
-                </ph>
+                    </ph>
+                </sup>
             </xsl:when>
         </xsl:choose>
         
         
         <xsl:choose>
             <xsl:when test="A_miejscowosc/text()|Miejscowosc/text()|A_ulica/text()|A_nrDomu/text()|ulica/text()|Numer_budynku/text()|nrLokalu/text()|Numer_mieszkania_lokalu/text()|Ulica/text()">
-                <ph>
+                <sup>
+                    <ph>
                     <xsl:if test="A_miejscowosc/text()"> msc.: <b><xsl:value-of select="A_miejscowosc"/></b></xsl:if>
                     <xsl:if test="Miejscowosc/text()"> msc.: <b><xsl:value-of select="Miejscowosc"/></b></xsl:if>
                     <xsl:if test="A_ulica/text()"> ul.: <b><xsl:value-of select="A_ulica"/></b></xsl:if>
@@ -536,23 +561,26 @@
                     <xsl:if test="Numer_mieszkania_lokalu/text()"> lok.: <b><xsl:value-of select="Numer_mieszkania_lokalu"/></b></xsl:if>
                     
                 </ph>
+                </sup>
             </xsl:when>
         </xsl:choose>
         
         <xsl:choose>
             <xsl:when test="A_poczta/text()|kodPocztowy/text()|A_kod/text()">
-                <ph>
-                    <xsl:if test="A_poczta/text()"> pcozta: <b><xsl:value-of select="A_poczta"/></b></xsl:if>
+                <sup>
+                    <ph>
+                    <xsl:if test="A_poczta/text()"> poczta: <b><xsl:value-of select="A_poczta"/></b></xsl:if>
                     <xsl:if test="kodPocztowy/text()"> kod: <b><xsl:value-of select="kodPocztowy"/></b></xsl:if>
                     <xsl:if test="A_kod/text()"> kod: <b><xsl:value-of select="A_kod"/></b></xsl:if>
-                </ph>
+                    </ph>
+                </sup>
             </xsl:when>
         </xsl:choose>
         
         <xsl:choose>
             <xsl:when test="BI_audit_ENERGA_PRACOWNICY_adresy/*">
                 <xsl:for-each select="BI_audit_ENERGA_PRACOWNICY_adresy">
-                    <p>
+                    <p><sup>
                         <xsl:choose>
                             <xsl:when test="last() &gt; 0"><i> adres nr <xsl:value-of select="position()"/>/<xsl:value-of select="last()"/></i></xsl:when>
                         </xsl:choose>
@@ -562,7 +590,7 @@
                         <xsl:if test="ulica/text()"> ul.: <b><xsl:value-of select="ulica"/></b> </xsl:if>
                         <xsl:if test="nrBudynku/text()"> dom: <b><xsl:value-of select="nrBudynku"/></b> </xsl:if>
                         <xsl:if test="nrLokalu/text()"> lok.: <b><xsl:value-of select="nrLokalu"/></b> </xsl:if>
-                    </p>
+                    </sup></p>
                 </xsl:for-each>
             </xsl:when>
         </xsl:choose>
@@ -571,6 +599,7 @@
             <xsl:when test="TERYT_names/*">
                 <xsl:for-each select="TERYT_names">
                     <p>
+                        <sup>
                         <xsl:choose>
                             <xsl:when test="last() &gt; 0"><i> teryt. adres: </i></xsl:when>
                         </xsl:choose>
@@ -584,24 +613,61 @@
                         <xsl:if test="ulica_nazwa_2/text()"> <b><xsl:value-of select="ulica_nazwa_2"/></b> </xsl:if>
                         <xsl:if test="$context/nrDomu/text()"> dom: <b><xsl:value-of select="$context/nrDomu"/></b> </xsl:if>
                         <xsl:if test="$context/nrLokalu/text()"> lok.: <b><xsl:value-of select="$context/nrLokalu"/></b> </xsl:if>
+                    </sup>
                     </p>
                 </xsl:for-each>
             </xsl:when>
         </xsl:choose>
+        <xsl:choose>
+            <xsl:when test="BI_audit_taxpayer   or $context/BI_audit_taxpayer">
+                <p>
+                    <!--<dl>-->
+                        <!--<dlentry>-->
+                            <!--<dt>-->
+                                <sup>Status VAT:</sup>
+                            <!--</dt>-->
+                            <!--<dd>-->
+                                <!--<sup><xsl:value-of select="BI_audit_taxpayer/taxpayer_status"/></sup>-->
+                            <!--</dd>-->
+                        <!--</dlentry>-->
+                        <!--<dlentry>-->
+                            <!--<dt>-->
+                                <!--<sup>informacja</sup>-->
+                            <!--</dt>-->
+                            <!--<dd>-->
+                    <sup><b><xsl:value-of select="BI_audit_taxpayer/taxpayer_status_info"/></b></sup>
+                            <!--</dd>-->
+                        <!--</dlentry>-->
+                        <!--<dlentry>-->
+                            <!--<dt>-->
+                                <sup>(stan na dzień</sup>
+                            <!--</dt>-->
+                            <!--<dd>-->
+                                <sup><xsl:value-of select="BI_audit_taxpayer/taxpayer_status_date"/>)</sup>
+                            <!--</dd>-->
+                        <!--</dlentry>-->
+                    <!--</dl>-->
+                </p>
+                
+                
+            </xsl:when>
+        </xsl:choose>
         
         
     </xsl:template>
     <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" match="text()|comment()"/>
     
     <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.table" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row">
+        <xsl:param name="foreign_fallback.current_topic_id"/>
+        <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" required="yes" />
         <draft-comment author="a.binder">#159 system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.table  </draft-comment>
         <simpletable frame="all" relcolwidth="1* 2* 2* 4*" id="{$uuid}__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.table_{system_cache__dita:files.topic.table.id('',@fid)}_path_{generate-id()}">
             <xsl:attribute name="props">mode__universal.last.table</xsl:attribute>
             <strow>
-                <stentry>Lp</stentry>
-                <stentry>Sposób wyszukania</stentry>
-                <stentry>Rejestr</stentry>
-                <stentry>Dane z rejestru</stentry>
+                <stentry><sup>Lp</sup></stentry>
+                <stentry><sup>Sposób wyszukania</sup></stentry>
+                <stentry><sup>Rejestr</sup></stentry>
+                <stentry><sup>Dane z rejestru</sup></stentry>
             </strow>
             <xsl:for-each select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object">
                 <strow>
@@ -609,25 +675,46 @@
                     <stentry>
                         <xsl:choose>
                             <xsl:when test="relation_from/text()">
-                                <xsl:value-of select="system_cache__dita:localname.translate(relation_from)"/>
+                                <sup><xsl:value-of select="system_cache__dita:localname.translate(relation_from)"/></sup>
                             </xsl:when>
                             <xsl:when test="position() = 1">
-                                wybrany początkowy obiekt
+                                <sup>wybrany początkowy obiekt </sup>
                             </xsl:when>
                             <xsl:otherwise>
-                                inny
+                                <sup>inny</sup>
                             </xsl:otherwise>
                         </xsl:choose>
-                        
+                        <!--<foreign>
+                            
+                            <ph>
+                                <!-\-<xsl:for-each select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@*">
+                                    <xsl:value-of select="name()"/> = <xsl:value-of select="."/> <xsl:text> </xsl:text>
+                                </xsl:for-each>-\->
+                            </ph>
+                            
+                            <!-\-<xsl:value-of select="$foreign_fallback.current_topic_id"/>-\->
+                        </foreign>-->
+                        <xsl:if test="position() = last()">
+                        <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="parent::*//*[last()]/*[1]/@fid"/>
+                            <xsl:with-param name="title">APU4_umowy</xsl:with-param>
+                            <xsl:with-param name="link__x3A__title">analiza APU4</xsl:with-param>
+                            <xsl:with-param name="system_cache__dita:element__x3A__surrounding">xref</xsl:with-param>
+                            <!--<xsl:with-param name="foreign_fallback" select="true()"/>-->
+                            <!--<xsl:with-param name="foreign_fallback.current_topic_id" select="$foreign_fallback.current_topic_id"/>-->
+                        </xsl:call-template>
+                        </xsl:if>
                     </stentry>
                     <stentry>
-                        <xsl:value-of select="*[1]/system_cache__dita:localname.translate(local-name())"/>
+                        <sup><xsl:value-of select="*[1]/system_cache__dita:localname.translate(local-name())"/></sup>
                     </stentry>
                     <stentry>
+                        <p>
                         <xref>
                             <xsl:copy-of select="system_cache__dita:files.context.title.keyref(*[1],'BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA')" copy-namespaces="no"/>
                             link
                         </xref>
+                        </p>
                         <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body"/>
                      <!--   <xsl:variable name="system_cache__dita:localname.translate">
                             <system_cache__dita:localname.translate>-->

+ 418 - 102
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl

@@ -61,19 +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="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>
@@ -97,12 +102,16 @@
         <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.uniq.current" required="yes"/>
         <xsl:param name="interested_row" required="yes"/>
         <xsl:param name="source"/>
-        <xsl:comment>#32 system_cache__dita:ANALIZA_UMOW_4UA</xsl:comment>
+        <xsl:comment>#32 system_cache__dita:ANALIZA_UMOW_4UA $title = <xsl:value-of select="$title"/></xsl:comment>
+        
         <topicref  platform="{$position}" audience="{$title}" props="name {local-name()} {$default_db__x3A__BI_audit_BENFORD:valueField} {$default_db__x3A__BI_audit_BENFORD:timeField}"><!-- group_name="{$group_name}" -->
                 <!--<xsl:copy-of select="@*"/>-->
                 <xsl:copy-of select="system_cache__dita:files.key.title.context.href(current(),'map',$title)" copy-namespaces="no"/>
-                <xsl:copy-of select="system_cache__dita:files.context.title.keys(current(),$title)" copy-namespaces="no"/> 
-                
+                <!--<xsl:copy-of select="system_cache__dita:files.context.title.keys(current(),$title)" copy-namespaces="no"/>--> 
+                <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:result-document href="{system_cache__dita:files.key.href.write.topic.title.context(current(),$title)}"> <!--XX  href="{$temp}/{$uuid}/{system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.DETECT.key(@fid,'','',$position)}.dita -->
                     
                     <!--                    Analiza spójności liczbowej dla ID kontr <xsl:value-of select="current()/ID"/>
@@ -110,7 +119,10 @@
                     
                     <topic id="{$uuid}topic_analiza_umow_4ua_{$group_name}_{$position}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                         xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
-                        <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.title" />
+                        
+                        <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.title" >
+                            <xsl:with-param name="title" select="$title"/>
+                        </xsl:call-template>
                         
                         
                         
@@ -147,19 +159,60 @@
                         <!--<xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs.nodeset" group-by="//@fid">
                             <row><xsl:value-of select="position()"/>; cnt=<xsl:value-of select="count(current-group())"/></row>
                         </xsl:for-each-group>-->
-                        <prolog>
-                            <metadata>
-                                <xsl:call-template name="system_cache__dita:indexterm">
-                                    <xsl:with-param name="system_cache__dita:element"/>
-                                    <xsl:with-param name="indexterm" /><!-- select="*[local-name()=$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.BI_audit_ENERGA_RUM_KONTRAHENCI.Pelna_nazwa_kontrahenta]/text()" -->
-                                    <xsl:with-param name="text"/>
-                                </xsl:call-template>
-                            </metadata>
-                        </prolog>
+                        
                         
                         <body>
+                            <p>
+                                <foreign>
+                                    <xsl:value-of select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.parent.attrs"/>
+                                </foreign>
+                                
+                                <dl>
+                                    <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 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>
+                                                <xsl:with-param name="system_cache__dita:element__x3A__surrounding">dd</xsl:with-param>
+                                                <xsl:with-param name="system_cache__dita:element__x3A__surrounding.title">dt</xsl:with-param>
+                                            </xsl:call-template>
+                                        </dlentry>
+                                        
+                                    </xsl:if>
+                                    
+                                    
+                                </dl>
+                                
+                                        
+                                
+                                
+                                 
+                                <xsl:choose>
+                                    <xsl:when test="$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: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.end.attrs"/>
+                                            <xsl:with-param name="link__x3A__title">do APU4 </xsl:with-param>
+                                            <xsl:with-param name="title" select="$title"/>
+                                            <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"/>
+                                            <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>
+                                        </xsl:call-template>
+                                    </xsl:when>
+                                </xsl:choose>
+                                
+                                
+                            </p>
                             <p> <!--<xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title"/>-->
-                                <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="current()"/> 
+                                <!--<xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="current()"/>--> 
                             </p>
                             
                             <draft-comment author="a.binder">#807-X $group_name = <xsl:value-of select="$group_name"/>;  count(curr_gr)=<xsl:value-of select="count(current-group())"/> ; </draft-comment>
@@ -168,7 +221,7 @@
                                 <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>-->
                                 <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset"/>-->
                                 <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs"></xsl:copy-of>-->
-                                <xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset"/>
+                                <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs.nodeset"/>-->
                                 
                                 
                                 
@@ -177,29 +230,50 @@
                             
                             
                             
-                            <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph">
-                                <xsl:with-param name="generate_id" 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="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.related">
-                                <xsl:with-param name="generate_id" 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>
-                            <codeblock>
+                                        <xsl:choose>
+                                            <xsl:when 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">
+                                                <xsl:comment>#181 bypassed by 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</xsl:comment>
+                                            </xsl:when>
+                                            <xsl:otherwise>
+                                                <p>
+                                                <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph">
+                                                    <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>
+                                                </p>
+                                            </xsl:otherwise>
+                                        </xsl:choose>
+                                 
+                                        <p>
+                                            <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.related">
+                                                <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>
+                                        </p>
+                                  
+                                    <p>
+                                    <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals">
+                                        <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>
+                                    </p>
+                              
+                                    <p>
+                                        <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals.values">
+                                            <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>
+                                    </p>
                                 
-                            </codeblock>
+                         
                             <!--<xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="."/>-->
                         </body>
                         
@@ -261,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 --><!-- 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()"/>-->
@@ -335,44 +416,53 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                <!--<xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
                     <xsl:with-param name="simpletable" select="$simpletable"/>
                     <xsl:with-param name="title"> (APU4-T) powiązania tabela </xsl:with-param>
-                </xsl:call-template>
+                </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" select="$title"/>
+                </xsl:apply-templates>
+                
                 <p> (APU4) powiązania wykres </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
                 <p>   <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
                     <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
-                    <xsl:with-param name="width" select="500"/>
+                    <xsl:with-param name="width" select="250"/>
                     <xsl:with-param name="path.prefix">../</xsl:with-param>
                 </xsl:apply-templates>
                 </p>
             </xsl:when>
             <xsl:otherwise>
-                <p props="214a">
-                </p>
+                <!--<p props="214a">
+                </p>-->
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
     
     
     <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.ilosc 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"/>
@@ -380,8 +470,8 @@
                             <!--<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>
@@ -393,8 +483,8 @@
                             <xsl:variable name="current-group.parent.count" select="count(current-group())"/>
                             <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()) div $current-group.parent.count"/></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>-->
+                                <!--<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()) div $current-group.parent.count"/></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>
                         
@@ -406,8 +496,8 @@
                             <!--<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 ]"/>-->
                             <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"  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" 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.{@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 ]"/>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -420,6 +510,34 @@
                                 <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 ]}"  >blue</stentry>-->
                                 <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >red</stentry>-->
+                                <!--<xsl:choose>
+                                    <xsl:when test="1=2"/>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=1">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F000FF</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=2">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F000AA</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=3">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F00066</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=4">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F00033</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=5">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F03300</stentry></xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=6">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F06600</stentry>
+                                    </xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=7">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F09900</stentry>
+                                    </xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=8">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F0CC00</stentry>
+                                    </xsl:when>
+                                    <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=9">
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#F0FF00</stentry>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >#<xsl:value-of select="9-number(@default_db__x3A__BI_audit_BENFORD:leadingNumber)"/>0<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>0<xsl:value-of select="@default_db__x3A__BI_audit_BENFORD:leadingNumber"/>F</stentry>
+                                    </xsl:otherwise>
+                                </xsl:choose>-->
                                 <xsl:choose>
                                     <xsl:when test="1=2"/>
                                     <xsl:when test="@default_db__x3A__BI_audit_BENFORD:leadingNumber=1">
@@ -465,8 +583,8 @@
                             
                             <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 ]}"  />
-                                <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  >2</stentry>-->
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -477,8 +595,8 @@
                             <!--<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}"  />-->
+                                <!--<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.title.unique"      current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}_{@default_db__x3A__BI_audit_BENFORD:leadingNumber}"  />
                             </xsl:for-each-group>
                         </xsl:for-each-group>
                     </strow>
@@ -488,8 +606,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 rozkładu</stentry>
-                                <!--<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>-->
+                                <!--<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="@*[ 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 rozkładu <!--<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>
@@ -503,53 +621,219 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                <!--<xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
                     <xsl:with-param name="simpletable" select="$simpletable"/>
                     <xsl:with-param name="title"> (APU4-DT) umowy obiektu tabela </xsl:with-param>
-                </xsl:call-template>
-                
-                <p> (APU4-DW) umowy obiektu wykres </p>
+                </xsl:call-template>-->
+                <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows" select="$simpletable">
+                    <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> (<xsl:value-of select="$graph.name"/>) umowy obiektu wykres </p>
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
-                <p>   <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
+                <p> 
+                    
+                  <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
                     <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
-                    <xsl:with-param name="width" select="500"/>
+                    <xsl:with-param name="width" select="250"/>
                     <xsl:with-param name="path.prefix">../</xsl:with-param>
                 </xsl:apply-templates>
                 </p>
             </xsl:when>
             <xsl:otherwise>
-                <p props="214a">
-                </p>
+                <!--<p props="214a">
+                </p>-->
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:ANALIZA_UMOW_4UA.graph.deals.values" >
+        <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"
+                    
+                    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"/>
+                            <!--<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>
+                    <strow props="graph.data">
+                        <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"/>
+                            <!--<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>-->
+                            <!--<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:variable name="current-group.parent.count" select="count(current-group())"/>
+                            <!--<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>
+                                <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:FieldType]/number())"/></stentry>
+                            <!--</xsl:for-each-group>-->
+                        </xsl:for-each-group>
+                        
+                    </strow>
+                    <strow props="graph.title">
+                        <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"/>
+                            <!--<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 ]"/>-->
+                            <!--<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="ilosc {@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">ilość U.<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="koszt {@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  audience="rozklad_{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">koszt U.<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>
+                    <strow props="graph.color.name">
+                        <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"/>
+                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">blue</stentry>-->
+                            <!--<stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">brown</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 ]}">blue</stentry>
+                                <stentry current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}">red</stentry>
+                                
+                                
+                            <!--</xsl:for-each-group>-->
+                        </xsl:for-each-group>
+                    </strow>
+                    <!--<strow props="graph.color.variable">
+                        <xsl:for-each-group select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset//*" group-by="@default_db__x3A__BI_audit_BENFORD:leadingNumber">
+                            <stentry current-grouping-key="{@default_db__x3A__BI_audit_BENFORD:leadingNumber}">blue</stentry>
+                            <stentry current-grouping-key="{@default_db__x3A__BI_audit_BENFORD:leadingNumber}">red</stentry>
+                        </xsl:for-each-group>
+                    </strow>-->
+                    <strow props="graph.yaxis">
+                        <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"/>
+                            <!--<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>-->
+                            
+                            <!--<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>
+                            <!--</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.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 ]}"/>-->
+                            <!--<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 ]}"  />
+                                <stentry props="graph.title.unique"      current-grouping-key="{@*[ name()=$default_db__x3A__BI_audit_BENFORD:FieldType ]}"  />
+                            <!--</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.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</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="$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>
+                </simpletable>
+            </SIMPLETABLE_WTITLE>
+        </xsl:variable>
+        <xsl:variable name="simpletable">
+            <xsl:call-template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable">
+                <xsl:with-param name="simpletable" select="$SIMPLETABLE_WTITLE"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$simpletable//stentry">
+                <!--<xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                    <xsl:with-param name="simpletable" select="$simpletable"/>
+                    <xsl:with-param name="title"> (APU4-DT) umowy obiektu tabela </xsl:with-param>
+                </xsl:call-template>-->
+                <!--<p>-->
+                <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__from_rows" select="$simpletable">
+                    <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>--> (<xsl:value-of select="$graph.name"/>) umowy koszty obiektu wykres <!--</p>-->
+                <foreign>
+                    <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
+                </foreign>
+                <!--<p>--> 
+                    <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
+                        <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
+                        <xsl:with-param name="width" select="250"/>
+                        <xsl:with-param name="path.prefix">../</xsl:with-param>
+                    </xsl:apply-templates>
+                <!--</p>-->
+            </xsl:when>
+            <xsl:otherwise>
+                <!--<p props="214a">
+                </p>-->
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
     
+    
     <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   "><!-- font15 -->
                     
+                    props="print__no graph.ylabel.Y 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 ]}" platform="{system_cache__dita:platform__x3A__escape($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 ]}" platform="{system_cache__dita:platform__x3A__escape($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 ]}" platform="{system_cache__dita:platform__x3A__escape($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>
@@ -558,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>
                         
@@ -571,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 ]}" platform="{system_cache__dita:platform__x3A__escape('default_db__x3A__BI_audit_BENFORD:leadingNumber')}" props="sum">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 ]}" platform="{system_cache__dita:platform__x3A__escape('default_db__x3A__BI_audit_BENFORD:leadingNumber')}" props="count">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 ]}" platform="{system_cache__dita:platform__x3A__escape('default_db__x3A__BI_audit_BENFORD:leadingNumber')}" props="sum">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>
@@ -628,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>
@@ -671,40 +955,72 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test="$simpletable//stentry">
-                <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                <!--<xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
                     <xsl:with-param name="simpletable" select="$simpletable"/>
                     <xsl:with-param name="title"> (APU4-DPT) umowy pośrednio powiązane z obiektem - tabela </xsl:with-param>
-                </xsl:call-template>
-                <p> (APU4-DPW) umowy pośrednio powiązane z obiektem </p>
+                </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" select="$title"/>
+                    <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
+                </xsl:apply-templates>
+                 (<xsl:value-of select="$graph.name"/>) umowy pośrednio powiązane z obiektem 
                 <foreign>
                     <xsl:copy-of select="$simpletable" copy-namespaces="no"/>
                 </foreign>
-                <p>   <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
+                  <xsl:apply-templates mode="system_cache__dita:graph__read" select="$simpletable">
                     <xsl:with-param name="fileindex" select="$simpletable/simpletable/@id"/>
-                    <xsl:with-param name="width" select="500"/>
+                    <xsl:with-param name="width" select="250"/>
                     <xsl:with-param name="path.prefix">../</xsl:with-param>
                 </xsl:apply-templates>
-                </p>
+                
+                <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">
-                </p>
+                <!--<p props="214a">
+                </p>-->
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
     
     
+    
+    
     <xsl:template name="system_cache__dita:ANALIZA_UMOW_4UA.title">
-        <title>APU4 kontekst <xsl:value-of select="system_cache__dita:localname.translate(name())"/> [il.<xsl:value-of select="count(current-group())"/>]
+        <xsl:param name="title"/>
+        <title><parmname><xsl:value-of select="replace($title,'_',' ')"/></parmname>
             <!--<xsl:apply-templates mode="system_cache__dita:ANALIZA_UMOW_4UA.title" select="."/>-->
+            <xsl:apply-templates mode="system_cache__dita:ANALIZA_UMOW_4UA.title" />
         </title>
+        <shortdesc>kontekst <xsl:value-of select="system_cache__dita:localname.translate(name())"/> [il.<xsl:value-of select="count(current-group())"/>] <parmname>ID</parmname> <cmdname><xsl:value-of select="get_wfs:id_from_fid(@fid)"/></cmdname> </shortdesc>
+        <prolog>
+            <metadata>
+                <xsl:call-template name="system_cache__dita:indexterm">
+                    <xsl:with-param name="system_cache__dita:element">keywords</xsl:with-param>
+                    <xsl:with-param name="indexterm" select="string-join(*[@default_db__x3A__BI_audit_BENFORD:NameField],' ')" /><!-- select="*[local-name()=$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.BI_audit_ENERGA_RUM_KONTRAHENCI.Pelna_nazwa_kontrahenta]/text()" -->
+                    <xsl:with-param name="text"/>
+                    <xsl:with-param name="system_cache__dita:indexterm" select="system_cache__dita:indexterm($title,'')"/>
+                </xsl:call-template>
+            </metadata>
+        </prolog>
     </xsl:template>
     
-    <xsl:template match="*" mode="system_cache__dita:ANALIZA_UMOW_4UA.title">
-        <xsl:value-of select="name()"/><xsl:value-of select="text()"/> <xsl:text>
-        </xsl:text><!--<xsl:apply-templates mode="#current"/>-->
+    <xsl:template match="*[@default_db__x3A__BI_audit_BENFORD:NameField and text()]" mode="system_cache__dita:ANALIZA_UMOW_4UA.title">
+        <!--<xsl:value-of select="name()"/>--><!--<xsl:value-of select="text()"/>--> <!--<xsl:text></xsl:text>--><!--<xsl:apply-templates mode="#current"/>-->
+        <ph>
+            <sub>Nazwa:</sub> <xsl:apply-templates mode="#current" select="*[@default_db__x3A__BI_audit_BENFORD:NameField and text()]"/>
+        </ph>
     </xsl:template>
     
-    <xsl:template match="text()|comment()" mode="system_cache__dita:ANALIZA_UMOW_4UA.title"/>
+    <xsl:template mode="system_cache__dita:ANALIZA_UMOW_4UA.title" match="*[@default_db__x3A__BI_audit_BENFORD:NameField]">
+        <ph> <xsl:value-of select="."/> </ph>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:ANALIZA_UMOW_4UA.title" match="@*"/>
+    
+    <xsl:template match="text()|comment()|*" mode="system_cache__dita:ANALIZA_UMOW_4UA.title"/>
     
 </xsl:stylesheet>

+ 255 - 0
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

@@ -0,0 +1,255 @@
+<?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:ogr="http://ogr.maptools.org/"
+    xmlns:Benford="https://pl.wikipedia.org/wiki/Rozkład_Benforda"
+    xmlns:default_db="https://biuro.biall-net.pl/wfs/default_db"
+    xmlns:p5="https://biuro.biall-net.pl/wfs"
+    xmlns:get_wfs="http://biuro.biall-net.pl/WPS_Functions/get_wfs/get_wfs.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_VALIDATE="https://biuro.biall-net.pl/wfs/default_db/BI_audit_VALIDATE"
+    xmlns:default_db__x3A__BI_audit_BENFORD="https://biuro.biall-net.pl/wfs/default_db/BI_audit_BENFORD"
+    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"><!-- system_cache__appinfo system_cache__dita ogr Benford default_db get_wfs p5 p5gnuplot -->
+    
+    
+   
+    
+    <xsl:output indent="yes"/>
+    <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="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"/>
+        <xsl:param name="pos" />
+        <xsl:param name="system_cache__dita:element__x3A__surrounding">ph</xsl:param>
+        <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,' ')[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>
+                            <xsl:when test="string-length($end_fid)&gt;0">
+                                <xsl:attribute name="keyref" select="concat($fid,'...',$end_fid)"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:choose>
+                                    <xsl:when test="$system_cache__dita:element__x3A__surrounding='xref'">
+                                        <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" >
+                                                <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>
+                                   
+                            
+                            </xsl:otherwise>
+                        </xsl:choose>
+                        <xsl:if test="string-length($link__x3A__title)&gt;0"><xsl:value-of select="$link__x3A__title"/></xsl:if>
+                    </xsl:element>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:comment>#56 string-length($fid) =0 </xsl:comment>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+        
+    </xsl:template>
+    
+    
+    <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="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"/>
+        <!-- <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 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.current_topic_id">
+                <foreign>
+                    <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>
+        </xsl:choose>
+        
+    </xsl:template>
+    
+    
+    
+    
+</xsl:stylesheet>

+ 7 - 1
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_context.path.xsl

@@ -22,6 +22,7 @@
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
     
+    <xsl:include href="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_context.path.keyrefs.xsl"/>
     
     
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.begin.attrs">
@@ -33,7 +34,7 @@
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs">
         <xsl:param name="system_cache__dita:interested_row" required="yes"/>
         <xsl:param name="context" required="yes"/>
-        <xsl:attribute name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs" select="root()//*[ position()=last() and preceding-sibling::*[*[@fid = current()/@fid]] ]/@fid"/>
+        <xsl:attribute name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs" select="root()//BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[ BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position()=1 and child::*[@fid=current()/@fid ]] ]/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position()=last()]/*[position()=1]/@fid"/><!-- root()//*[ position()=last() and preceding-sibling::*[*[@fid = current()/@fid]] ]/@fid -->
     </xsl:template>
     
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.row.attrs">
@@ -48,6 +49,11 @@
         <xsl:attribute name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs" select="root()//BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object/*[@fid=current()/@fid]/descendant::BI_audit_ENERGA_RUM_UMOWY/@fid"/>
     </xsl:template>
     
+    <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.parent.attrs">
+        <xsl:param name="system_cache__dita:interested_row" required="yes"/>
+        <xsl:param name="context" required="yes"/>
+        <xsl:attribute name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.parent.attrs" select="parent::*/@fid"/>
+    </xsl:template>
     
     <xsl:template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs">
         <xsl:param name="system_cache__dita:interested_row" required="yes"/>

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

@@ -27,6 +27,7 @@
         <xsl:param name="position" required="yes"/>
         <xsl:param name="context" required="yes"/>
         <xsl:param name="title" required="yes"/>
+        
         <!-- uwaga lapie BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object -->
         <xsl:message>#2599 MID REF $position_1 = <xsl:value-of select="$position_1"/>; $position=<xsl:value-of select="$position"/> ; @fid = <xsl:value-of select="@fid"/>; </xsl:message>
         <xsl:comment>#278b pracownik od <xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() =  1]/*[ position() = 1]/@fid"/></xsl:comment>

+ 9 - 0
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_operational_raport_note.xsl

@@ -30,6 +30,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  tunnel="yes" />
         <BI_audit_operational_raport_note_uniq>
             <xsl:for-each select="$sources/sources/source">
                 <xsl:variable name="source" select="."/>
@@ -52,6 +55,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  tunnel="yes" />
         <topichead navtitle="Wykryte powiązania do śledzonych obiektów w ramach Operacyjnej Bazy Danych (podział na źródła)" props="BI_audit_operational_raport_note_fixed">
             
             <xsl:variable name="BI_audit_operational_raport_note_fixed">
@@ -91,6 +97,9 @@
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"   />
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"  />
                 </xsl:call-template>
             </xsl:variable>
             

+ 15 - 6
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row.xsl

@@ -32,6 +32,7 @@
         <xsl:param name="limit_same_entry_side" select="'source'"/>
         <xsl:param name="limit" select="10"/>
         <xsl:param name="title" required="yes"/>
+        <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" required="yes" />
         <xsl:variable name="position_src" select="position()"/>
         
         <!--INFO: group-by="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() = 1]/*[ position() = 1]/@fid" -->
@@ -148,7 +149,10 @@
                                                     </xsl:otherwise>
                                                 </xsl:choose>
                                                 
-                                                <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.table" select="."/>
+                                                <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.table" select=".">
+                                                    <xsl:with-param name="foreign_fallback.current_topic_id"><xsl:value-of select="$uuid"/>topic_simpletable_cheat_pos_<xsl:value-of select="position()"/>_row_<xsl:value-of select="$group_name"/>__<xsl:value-of select="generate-id()"/></xsl:with-param>
+                                                    <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current"/>
+                                                </xsl:apply-templates>
                                                 
                                                 
                                                 
@@ -290,7 +294,6 @@
                                                     <xsl:for-each-group select="$test_if_prev_worker/prev" group-by="@pesel"><xsl:text> </xsl:text> <xsl:value-of select="."/></xsl:for-each-group>
                                                 </xsl:if>-->
                                                 
-                                                
                                                 <menucascade>
                                                     <uicontrol>Powiązanie</uicontrol>
                                                     <uicontrol><varname>[ <xsl:value-of select="system_cache__dita:localname.translate(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]/*[1]/local-name())"/> ] <xsl:text> </xsl:text></varname></uicontrol>
@@ -300,7 +303,7 @@
                                                         <xsl:when test="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]/*/source/text()">
                                                             <uicontrol><varname>źródło</varname></uicontrol>
                                                             <uicontrol><varname><xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]/*/source"/></varname></uicontrol>
-                                                                    
+                                                            
                                                         </xsl:when>
                                                     </xsl:choose>
                                                     <uicontrol><varname>dla</varname></uicontrol>
@@ -311,13 +314,18 @@
                                                         <xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]/*/nazwa"/><xsl:text> </xsl:text></uicontrol>
                                                     
                                                 </menucascade>
+                                                
+                                                
+                                            </title>
+                                            <shortdesc>
+                                                
                                                 <menucascade>
                                                     <uicontrol><varname>do</varname></uicontrol>
                                                     <uicontrol>  <xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = last()]/*[ position() = 1]/concat(Pelna_nazwa_kontrahenta,nazwa,nazwisko,' - ',Miejscowosc,imiona,imie,' ',NIP,' ',regon,' ',Nr_dzialki,firma,' ',Nr_KW,' ',Seller_person,pesel,miejscowosc)"/><xsl:text> </xsl:text>
                                                         <xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = last()]/*[ position() = 1]/Seller_person"/><xsl:text> </xsl:text> 
                                                     </uicontrol>
                                                 </menucascade>
-                                               
+                                                
                                                 <menucascade>
                                                     
                                                     <uicontrol><varname>dlugosc</varname></uicontrol>
@@ -325,8 +333,7 @@
                                                     <uicontrol><varname>przez</varname></uicontrol>
                                                     <uicontrol><xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = last()]/*[2]/system_cache__dita:localname.translate(relation_from)"/></uicontrol>
                                                 </menucascade>
-                                                
-                                            </title>
+                                            </shortdesc>
                                             
                                             <body>
                                                 <draft-comment author="a.binder">#1376a-1 $group_name=<xsl:value-of select="$group_name"/>; </draft-comment>
@@ -417,6 +424,8 @@
                                                     
                                                     <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.table" select=".">
                                                         <xsl:with-param name="title">Ścieżka śledzenia do </xsl:with-param>
+                                                        <xsl:with-param name="foreign_fallback.current_topic_id"><xsl:value-of select="$uuid"/>topiaac_simpletable_cheat_OTHER_pos_<xsl:value-of select="position()"/>_row_<xsl:value-of select="$group_name.id"/>_<xsl:value-of select="generate-id()"/></xsl:with-param>
+                                                        <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current"/>
                                                     </xsl:apply-templates>
                                                     
                                                     

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

@@ -31,6 +31,8 @@
         <xsl:param name="title" required="yes"/>
         <xsl:param name="context" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]"/> <!-- sometimes position=last() -->
         <xsl:param name="system_cache__dita:bocian-graph-2-html.read.group" select="'src'"/>
+        <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" required="yes"/>
+        <xsl:param name="system_cache__dita:subscript"  select="'sup'"/>
         <xsl:variable name="group_name.ref_prac" select="system_cache__appinfo:truncate_special_and_do_uppercase(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position() = 1]/*[ position() = 1] /concat(imiona,'_',nazwisko,'_',nip))"/>
         <xsl:variable name="refpos.ref_prac" select="concat(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = last()]/* [ position() = 1]/concat(name(),ID),'_', position())"/>
         <xsl:message>#3405 awaria <xsl:value-of select="@fid"/> ; for $current-grouping-key=<xsl:value-of select="$current-grouping-key"/>; $position = <xsl:value-of select="$position"/>; $title=<xsl:value-of select="$title"/>; position()="<xsl:value-of select="position()"/>"; row_obj_fisrt/*/@f="<xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/*[1]/@fid"/>"; row_obj_last/*/@f="<xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[last()]/*[1]/@fid"/>"; </xsl:message>
@@ -64,7 +66,9 @@
             <xsl:result-document href="{system_cache__dita:files.key.href.write.topic.title.context(.,$title)}"> <!-- system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.href.write(system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.DETECT.key(@fid,'',$current-grouping-key,$position)) --><!-- {$temp}/{$uuid}/{$group_name}_LIST.dita -->
                 <topic id="{$uuid}topic_simpletable_cheat_row_{replace($group_name,'/','')}_{ generate-id()}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
-                    <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.title" select="$context"/>
+                    <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.title" select="$context">
+                        <xsl:with-param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current"/>
+                    </xsl:apply-templates>
                     <!--<title>Powiązań dla <xsl:value-of select="count( current-group())"/> dla  
                                 <xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]/*/imiona"/><xsl:text> </xsl:text>
                                 <xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position() = 1]/*/nazwisko"/><xsl:text> </xsl:text>
@@ -74,7 +78,7 @@
                                 ;
                             </title>-->
                     
-                    <body><draft-comment author="a.binder">#2196 src/dst=<xsl:value-of select="$system_cache__dita:bocian-graph-2-html.read.group"/>; $context/fid=<xsl:value-of select="$context/@fid"/>; mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row" </draft-comment>
+                    <body><draft-comment author="a.binder">#2196  $system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current/@* = <xsl:value-of select="$system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current//@*"/>; EFO src/dst=<xsl:value-of select="$system_cache__dita:bocian-graph-2-html.read.group"/>; $context/fid=<xsl:value-of select="$context/@fid"/>; mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row" </draft-comment>
                         <p>
                             
                             <xsl:choose>
@@ -116,18 +120,18 @@
                                         <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>rejestr</stentry>
-                                    <stentry>ilosc</stentry>
+                                    <stentry><sup>rejestr</sup></stentry>
+                                    <stentry><sup>ilosc</sup></stentry>
                                     <!--<stentry>od</stentry>-->
-                                    <stentry>od</stentry>
-                                    <stentry>do</stentry>
+                                    <stentry><sup>od</sup></stentry>
+                                    <stentry><sup>do</sup></stentry>
                                 </sthead>
                                 <xsl:for-each-group select="current-group()" group-by="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[last()]/*[1]/local-name()">
                                     <strow>
-                                        <stentry><xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ last()]/*[1]/system_cache__dita:localname.translate(local-name())"/></stentry>
-                                        <stentry><xsl:value-of select="count(current-group())"/></stentry>
+                                        <stentry><sup><xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ last()]/*[1]/system_cache__dita:localname.translate(local-name())"/></sup></stentry>
+                                        <stentry><sup><xsl:value-of select="count(current-group())"/></sup></stentry>
                                         <!--<stentry><xsl:value-of select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[1]/*[1]/@fid"/></stentry>-->
                                         
                                         <stentry>
@@ -135,7 +139,9 @@
                                                 <xsl:copy-of select="system_cache__dita:files.context.title.keyref(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ 1]/*[1],$title)" copy-namespaces="no"/>
                                                 link
                                             </xref>
-                                            <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ 1]/*[1]"/>
+                                            <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ 1]/*[1]">
+                                                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+                                            </xsl:apply-templates>
                                         </stentry>
                                         <stentry>
                                             <!--<xsl:value-of select="system_cache__dita:localname.translate(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ last()]/*[1]/local-name())"/>-->
@@ -143,7 +149,9 @@
                                                 <xsl:copy-of select="system_cache__dita:files.dita_pair.keyref(BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ 1]/*[1]/@fid,BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ last()]/*[1]/@fid)" copy-namespaces="no"/>
                                                 link
                                             </xref>
-                                            <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ last()]/*[1]"/>
+                                            <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ last()]/*[1]">
+                                                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+                                            </xsl:apply-templates>
                                         </stentry>
                                     </strow>
                                     
@@ -168,7 +176,7 @@
     </xsl:template>
    
     <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object">
-        
+        <xsl:param name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed.current" required="yes" />
         <xsl:param name="group_name" required="yes"/>
         
         <xsl:param name="position"  required="yes"/>

+ 91 - 1
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

@@ -63,6 +63,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField" required="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField" required="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" required="yes"/>
         <interested_row>
             <xsl:for-each select="$context/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row">
                 
@@ -91,6 +94,9 @@
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" tunnel="yes" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" tunnel="yes"  select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" tunnel="yes"  select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" tunnel="yes" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" tunnel="yes" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" tunnel="yes" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
                             </xsl:apply-templates>
                         </xsl:element>
                     </xsl:when>
@@ -108,6 +114,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes" required="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes" required="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes" required="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField" tunnel="yes" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField" tunnel="yes" required="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" tunnel="yes" required="yes"/>
         <xsl:copy>
             <xsl:attribute name="generate-id" select="generate-id()"/>
         <xsl:attribute name="system_cache__dita:interested_row.path">
@@ -127,6 +136,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" tunnel="yes" />
         <xsl:copy>
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:generate.leadingNumber" select="."/>
@@ -135,17 +147,22 @@
     </xsl:template>
     
     
-    <xsl:template mode="system_cache__dita:interested_row.id" match="BI_audit_ENERGA_RUM_KONTRAHENCI[not(BI_audit_ENERGA_RUM_UMOWY)]">
+    <xsl:template mode="system_cache__dita:interested_row.id" match="BI_audit_ENERGA_RUM_KONTRAHENCI[not(BI_audit_ENERGA_RUM_UMOWY) and not(BI_audit_ENERGA_FAKTURY)]">
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:valueField"  tunnel="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField" tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" tunnel="yes" />
                 <xsl:copy>
                     <xsl:copy-of select="@*"/>
                     <xsl:attribute name="generate-id" select="generate-id()"/>
                     <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:generate.leadingNumber" select="root()//BI_audit_ENERGA_RUM_KONTRAHENCI[ @fid=current()/@fid and BI_audit_ENERGA_RUM_UMOWY]/*"/>
+                    <xsl:apply-templates mode="default_db__x3A__BI_audit_BENFORD:generate.leadingNumber" select="root()//BI_audit_ENERGA_RUM_KONTRAHENCI[ @fid=current()/@fid and BI_audit_ENERGA_FAKTURY]/*"/>
                     <xsl:apply-templates mode="#current"/>
                     <xsl:apply-templates mode="system_cache__dita:interested_row.id" select="root()//BI_audit_ENERGA_RUM_KONTRAHENCI[ @fid=current()/@fid and BI_audit_ENERGA_RUM_UMOWY]/*[not(local-name()='ID')]"/>
+                    <xsl:apply-templates mode="system_cache__dita:interested_row.id" select="root()//BI_audit_ENERGA_RUM_KONTRAHENCI[ @fid=current()/@fid and BI_audit_ENERGA_FAKTURY]/*[not(local-name()='ID')]"/>
                 </xsl:copy>
     </xsl:template>
     
@@ -155,6 +172,11 @@
         <xsl:copy-of select="."/>
     </xsl:template>
     
+    
+    
+    
+    
+    
     <xsl:template name="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed">
         <!-- to generate variable current-group with params to once hit ROW_OBJECT or ROW -->
         <xsl:param name="interested_row" required="yes"/>
@@ -168,6 +190,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField" required="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField" required="yes" />
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField" required="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField" required="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField" required="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" required="yes" />
         <system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.values.fixed>
             <xsl:for-each select="$sources/sources/source">
                 <xsl:variable name="source" select="."/>
@@ -175,6 +200,7 @@
                     <xsl:when test="$system_cache__dita:groupset.mode.BI_audit_ENERGA_RUM_KONTRAHENCI_UMOWY.path">
                         <xsl:message>#112 called $system_cache__dita:groupset.mode.BI_audit_ENERGA_RUM_KONTRAHENCI_UMOWY.path (analyzing unique rowset do generate raport)</xsl:message>
                         <xsl:for-each select="$interested_row//BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[position()=last() or position()=1]/*[1]" >
+                            <xsl:sort select="concat(*[1]/@default_db__x3A__BI_audit_BENFORD:PeselField,local-name())" order="descending"/>
                             <xsl:if test="(position() mod 100)=0"><xsl:message>#178 analyzing pos=<xsl:value-of select="position()"/></xsl:message></xsl:if>
                             <fixed debug="112">
                                 <xsl:attribute name="key" select="system_cache__dita:files.key.DETECT(@fid,'','','')"/> <!-- system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.BI_audit_KRS_person.key(nazwisko,imiona,pesel,'') XX11 -->
@@ -208,6 +234,12 @@
                                     <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>
+                                
+                                
                                 <xsl:call-template name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.related.childs.attrs">
                                     <xsl:with-param name="system_cache__dita:interested_row" select="$interested_row"/>
                                     <xsl:with-param name="context" select="."/>
@@ -241,6 +273,22 @@
                                         <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: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: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: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>
                                     </fixed>
                                 </xsl:for-each>
                             </xsl:otherwise>
@@ -260,6 +308,22 @@
                                 <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: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: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: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>
                             </fixed>
                         </xsl:for-each>
                     </xsl:when>
@@ -277,6 +341,22 @@
                                 <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: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: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: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>
                             </fixed>
                         </xsl:for-each>
                     </xsl:otherwise>
@@ -305,6 +385,11 @@
                                 <xsl:attribute name="generate-id" select="@generate-id"/>
                                 <xsl:copy-of select="@system_cache__dita:interested_row.path"/>
                                 <xsl:copy-of select="@system_cache__dita:interested_row.path.generate-id"/>
+                                <xsl:copy-of select="@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs"/>
+                                <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>
                             </fixed>
                         </xsl:for-each>
                     </xsl:when>
@@ -318,6 +403,11 @@
                                 <xsl:attribute name="generate-id" select="@generate-id"/>
                                 <xsl:copy-of select="@system_cache__dita:interested_row.path"/>
                                 <xsl:copy-of select="@system_cache__dita:interested_row.path.generate-id"/>
+                                <xsl:copy-of select="@default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.end.attrs"/>
+                                <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>
                             </fixed>
                         </xsl:for-each>
                     </xsl:otherwise>

+ 9 - 0
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.stats_all.xsl

@@ -27,6 +27,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  tunnel="yes" />
         <xsl:for-each-group select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[not(position()=1) and not(position()=last())]/*[1]" group-by="local-name()">
             <topicref href="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.stats_all.{local-name()}.dita" props="name__BaERKP.stats_all">
                 <xsl:result-document href="{$temp}/{$uuid}/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.stats_all.{local-name()}.dita">
@@ -43,6 +46,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  tunnel="yes" />
         <xsl:for-each-group select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[not(position()=1) and not(position()=last())]/*[1]" group-by="local-name()">
                     <xsl:apply-templates select="." mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.stats_all.local-name"/>
         </xsl:for-each-group>
@@ -53,6 +59,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  tunnel="yes" />
         <topic id="{$uuid}BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.stats_all.{local-name()}.dita" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
             <title>Statystyka powiązań dla obiektu <xsl:value-of select="local-name()"/>

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

@@ -124,6 +124,16 @@
             <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:NameField"/>
         </xsl:variable>
         
+        <xsl:variable name="default_db__x3A__BI_audit_BENFORD:AddressField">
+            <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:AddressField"/>
+        </xsl:variable>
+        <xsl:variable name="default_db__x3A__BI_audit_BENFORD:PeselField">
+            <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:PeselField"/>
+        </xsl:variable>
+        <xsl:variable name="default_db__x3A__BI_audit_BENFORD:TaxIdField">
+            <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
+        </xsl:variable>
+        
         
         
         <xsl:variable name="dita">
@@ -132,6 +142,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
             </xsl:apply-templates>
         </xsl:variable>
         
@@ -142,6 +155,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
             </xsl:apply-templates>
         </xsl:for-each>
         
@@ -151,6 +167,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
             </xsl:call-template>
         </xsl:variable>
         
@@ -162,6 +181,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
             </xsl:apply-templates>
         </xsl:for-each>
         
@@ -174,6 +196,9 @@
             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
         </xsl:apply-templates>
         
         <!-- GRAPHS BEGIN --><!-- GRAPHS BEGIN --><!-- GRAPHS BEGIN --><!-- GRAPHS BEGIN --><!-- GRAPHS BEGIN -->
@@ -212,6 +237,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
             </xsl:call-template>
         </xsl:variable>
         
@@ -227,6 +255,9 @@
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
                 </xsl:call-template>
             </xsl:variable>
             
@@ -250,6 +281,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" tunnel="yes"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField" tunnel="yes"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField" tunnel="yes"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" tunnel="yes"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" tunnel="yes"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" tunnel="yes"/>
             </xsl:call-template>
         </xsl:variable>
         
@@ -261,6 +295,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" />
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
             </xsl:apply-templates>
         </xsl:for-each>
         
@@ -284,6 +321,9 @@
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" />
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                                 <!--<xsl:with-param name="fileindex" select="current-grouping-key()"/>-->
                             </xsl:apply-templates>
                     </xsl:for-each-group>
@@ -301,6 +341,9 @@
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" />
+                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                 <!--<xsl:with-param name="fileindex" select="current-grouping-key()"/>-->
             </xsl:apply-templates>
         </xsl:for-each-group>
@@ -321,7 +364,8 @@
     
     
     <xsl:template mode="system_cache__dita:map.title" match="L_APPOITMENT_INFO[text()]">
-        <xsl:text> raport: </xsl:text><xsl:value-of select="."/>
+        <!--<xsl:text> raport: </xsl:text>-->
+        <xsl:text>"</xsl:text><xsl:value-of select="."/><xsl:text>"</xsl:text>
     </xsl:template>
     
     <xsl:template mode="system_cache__dita:map.title" match="@fid">
@@ -347,11 +391,25 @@
                     <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:NameField"/>
                 </xsl:variable>
                 
+                
+                <xsl:variable name="default_db__x3A__BI_audit_BENFORD:AddressField">
+                    <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:AddressField"/>
+                </xsl:variable>
+                <xsl:variable name="default_db__x3A__BI_audit_BENFORD:PeselField">
+                    <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:PeselField"/>
+                </xsl:variable>
+                <xsl:variable name="default_db__x3A__BI_audit_BENFORD:TaxIdField">
+                    <xsl:call-template name="default_db__x3A__BI_audit_BENFORD:TaxIdField"/>
+                </xsl:variable>
+                
                 <xsl:call-template name="system_cache__dita:map.title">
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:valueField" select="$default_db__x3A__BI_audit_BENFORD:valueField" />
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" />
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                 </xsl:call-template>
                 
                 <!-- osoby Akceptujacy_merytorycznie___nazwisko_i_imie -->
@@ -412,6 +470,9 @@
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" />
                     </xsl:call-template>
                 </xsl:variable>
                 
@@ -760,6 +821,9 @@
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"  />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"  />
                     </xsl:call-template>
                 </xsl:variable>
                 <topichead navtitle="Powiązania znalezione trasy (APT)" >
@@ -786,6 +850,9 @@
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" tunnel="yes"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField" tunnel="yes"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField" tunnel="yes"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" tunnel="yes"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" tunnel="yes" />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" tunnel="yes" />
                     </xsl:call-template>
                     
                 </topichead>
@@ -889,6 +956,9 @@
                             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField"     select="$default_db__x3A__BI_audit_BENFORD:groupField"/>
                             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField"   select="$default_db__x3A__BI_audit_BENFORD:timeField" />
                             <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"  />
+                            <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"  />
                         </xsl:call-template>
                     </xsl:variable>
                     
@@ -912,6 +982,9 @@
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" tunnel="yes"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField" tunnel="yes"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField" tunnel="yes"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" tunnel="yes"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField" tunnel="yes"  />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField" tunnel="yes" />
                     </xsl:call-template>
                     
                 </topichead>
@@ -1017,6 +1090,9 @@
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                     <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"   />
+                    <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"  />
                 </xsl:call-template>
                 
                 <topichead navtitle="Graf powiązań">
@@ -1027,6 +1103,9 @@
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"   />
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"  />
                             </xsl:apply-templates>
                         </xsl:result-document>
                     </topicref>
@@ -1040,6 +1119,9 @@
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                                 <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"   />
+                                <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"  />
                             </xsl:apply-templates>
                         </xsl:result-document>
                     </topicref>
@@ -1049,6 +1131,9 @@
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:groupField" select="$default_db__x3A__BI_audit_BENFORD:groupField" />
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:timeField" select="$default_db__x3A__BI_audit_BENFORD:timeField"/>
                         <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:NameField" select="$default_db__x3A__BI_audit_BENFORD:NameField"/>
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:AddressField" select="$default_db__x3A__BI_audit_BENFORD:AddressField" />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:PeselField" select="$default_db__x3A__BI_audit_BENFORD:PeselField"   />
+                        <xsl:with-param name="default_db__x3A__BI_audit_BENFORD:TaxIdField" select="$default_db__x3A__BI_audit_BENFORD:TaxIdField"  />
                     </xsl:call-template>
                     
                     
@@ -1092,6 +1177,9 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  tunnel="yes" />
         <!--<xsl:variable name="group_name" select="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.BI_audit_operational_raport_note.key($group_name,'','',$position)"/>-->
         <xsl:variable name="href" select="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.href($group_name)"/>
         <xsl:message>#2294 $group_name=<xsl:value-of select="$group_name"/>; $refpos=<xsl:value-of select="$refpos"/>; $position=<xsl:value-of select="$position"/>; mode="BI_audit_operational_raport_note"</xsl:message>

+ 381 - 52
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows.xsl

@@ -5,36 +5,94 @@
     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" />
+        <xsl:call-template name="system_cache__dita:graph__x3A__variables__x3A__init">
+            <xsl:with-param name="system_cache__dita:graph__x3A__variables__x3A__init__x3A__call" select="'p5gnuplot:simpletable__x3A__from_rows'"/>
+            <xsl:with-param name="title" select="$title"/>
+        </xsl:call-template>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__from_rows" match="*|text()|comment()"/>
+        
+    
+    
+    
+    <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="simpletable" required="yes"/>
         <xsl:param name="title"/>
-        
-        <xsl:variable name="graph.title" select="$simpletable//(strow|sthead)[ contains(@props,'graph.title') ]" />
+        <xsl:param name="xtics" required="yes"/>
+        <xsl:param name="ytics" required="yes"/>
+        <xsl:param name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml" required="yes"/>
+        <!--<xsl:variable name="graph.title" select="$simpletable//(strow|sthead)[ contains(@props,'graph.title') ]" />-->
         <!--<DEBUG.simpletable>
             <xsl:copy-of select="$simpletable//strow"/>
         </DEBUG.simpletable>-->
         
         
         
-        <xsl:variable name="graph.headers" select="$simpletable//(strow|sthead)[ contains(@props,'graph.headers') ]"/>
-        <xsl:variable name="graph.data" select="$simpletable//(strow|sthead)[ contains(@props,'graph.data')]"/>
+        <!--<xsl:variable name="graph.headers" select="$simpletable//(strow|sthead)[ contains(@props,'graph.headers') ]"/>-->
+        <!--<xsl:variable name="graph.data" select="$simpletable//(strow|sthead)[ contains(@props,'graph.data')]"/>-->
         
         
+        <foreign>
+            <!--<xsl:copy-of select="$xtics"/>-->
+            <!--<xsl:copy-of select="$ytics"/>-->
+            <xsl:copy-of select="$system_cache__dita:graph.dat.row__x3A__from__ytics.xml"/>
+            
+        </foreign>
         
-        
-        <xsl:choose>
+        <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml" select="$system_cache__dita:graph.dat.row__x3A__from__ytics.xml">
+            <xsl:with-param name="title" select="$title"/>
+        </xsl:apply-templates>
+        <!--<xsl:choose>
             <xsl:when test="$graph.title/* and $graph.data/* and $graph.headers/*">
                 <p><xsl:value-of select="$title"/></p>
                 <p>
                 
                         <xsl:variable name="xtics">
                                     <xtics>
-                                        <xsl:for-each-group select="$graph.headers//stentry" group-by="text()">
+                                        <xsl:for-each-group select="$graph.title//stentry" group-by="text()">
                                             <xsl:copy>
                                                 <xsl:copy-of select="@*"/>
                                                 <xsl:attribute name="pos" select="position()"/>
@@ -46,7 +104,7 @@
                         
                         <xsl:variable name="ytics">
                             <ytics>
-                                <xsl:for-each-group select="$graph.title//stentry" group-by="text()">
+                                <xsl:for-each-group select="$graph.headers//stentry" group-by="text()">
                                         <xsl:copy>
                                             <xsl:attribute name="pos" select="position()"/>
                                             <xsl:copy-of select="@*"/>
@@ -55,30 +113,58 @@
                                 </xsl:for-each-group>
                             </ytics>
                         </xsl:variable>
+                        
                     <xsl:variable name="count.xtics">
                         <xsl:choose>
                             <xsl:when test="count($xtics//stentry) &gt; 8"><xsl:value-of select="8"/></xsl:when>
                             <xsl:otherwise><xsl:value-of select="count($xtics//stentry)"/></xsl:otherwise>
                         </xsl:choose>
                     </xsl:variable>
-                        <!--<xsl:copy-of select="$xtics"/>-->
-                        <!--<xsl:copy-of select="$ytics"/>-->
+                    
+                    <xsl:variable name="count.ytics">
+                        <xsl:choose>
+                            <xsl:when test="count($ytics//stentry) &gt; 11"><xsl:value-of select="11"/></xsl:when>
+                            <xsl:otherwise><xsl:value-of select="count($ytics//stentry)"/></xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:variable>
+                    
+                    <xsl:variable name="data">
+                        <data>
+                            <xsl:for-each select="1 to $count.ytics">
+                                <xsl:variable name="count.ytics.current" select="current()"/>
+                                <xsl:for-each select="1 to $count.xtics">
+                                    <xsl:variable name="current-grouping-key" select="$xtics//stentry[@pos=current()]/@current-grouping-key"/>
+                                    <xsl:variable name="audience" select="$xtics//stentry[@pos=current()]/@audience"/>
+                                    <xsl:variable name="group" select="$xtics//stentry[@current-grouping-key=$current-grouping-key][1]/@group"/>
+                                    <data.row count.ytics.current="{$count.ytics.current}" current-grouping-key="{$current-grouping-key}">
+                                        <xsl:value-of select="$graph.data//stentry[@current-grouping-key=$current-grouping-key][$count.ytics.current]/number(text())"/>
+                                    </data.row>
+                                </xsl:for-each>
+                            </xsl:for-each>
+                        </data>
+                    </xsl:variable>
+                    
+                        <foreign>
+                        <xsl:copy-of select="$xtics"/>
+                        <xsl:copy-of select="$ytics"/>
+                        <xsl:copy-of select="$data"/>
+                        </foreign>
                         <simpletable props="nograph">
-                            <!--<strow props="xtics.1">
+                            <!-\-<strow props="xtics.1">
                                 <xsl:for-each select="$xtics//current-grouping-key">
                                     <stentry position="{position()}">
                                         <xsl:value-of select="text()"/>
                                     </stentry>
                                 </xsl:for-each>
-                            </strow>-->
-                            <!--<strow props="ytics.1">
+                            </strow>-\->
+                            <!-\-<strow props="ytics.1">
                                 <xsl:for-each select="$ytics//stentry">
                                     <stentry>
                                         <xsl:value-of select="text()"/>
                                     </stentry>
                                 </xsl:for-each>
-                            </strow>-->
-                            <strow props="pos___{position()} deb_81">
+                            </strow>-\->
+                            <strow props="pos___{position()} deb_81 count_ytics {count($ytics//stentry)}">
                                 <stentry >
                                     <xsl:text>parametr</xsl:text>
                                 </stentry>
@@ -90,68 +176,75 @@
                                     
                                     
                                     <stentry  audience="{$audience}">
-                                        <xsl:value-of select="$graph.headers//stentry[@current-grouping-key=$current-grouping-key][1]/system_cache__dita:graph.lingstring__x3A__break(text(),8,'-')"/>
+                                        <xsl:value-of select="$ytics//stentry[@current-grouping-key=$current-grouping-key][1]/text()"/>
                                     </stentry>
-                                        <!--<xsl:for-each select="$xtics//stentry">
+                                        <!-\-<xsl:for-each select="$xtics//stentry">
                                             <stentry>
                                                 <xsl:copy-of select="@*"/>
                                                 
                                             </stentry>
-                                        </xsl:for-each>-->
+                                        </xsl:for-each>-\->
                                     
                                 </xsl:for-each>
-                            </strow>
-                            
-                            <strow props="pos___{position()} deb_82">
                                 <stentry >
-                                    <xsl:value-of select="$ytics//stentry[1]/text()"/>
+                                    <xsl:text>suma</xsl:text>
                                 </stentry>
-                                <xsl:for-each select="1 to $count.xtics">
-                                    <xsl:variable name="current-grouping-key" select="$xtics//stentry[@pos=current()]/@current-grouping-key"/>
-                                    <xsl:variable name="audience" select="$xtics//stentry[@pos=current()]/@audience"/>
-                                    <xsl:variable name="group" select="$xtics//stentry[@current-grouping-key=$current-grouping-key][1]/@group"/>
-                                    
-                                    
-                                    <stentry  audience="{$audience}">
-                                        <xsl:value-of select="$graph.data//stentry[@current-grouping-key=$current-grouping-key][1]/substring(text(),1,8)"/>
-                                    </stentry>
-                                    <!--<xsl:for-each select="$xtics//stentry">
-                                            <stentry>
-                                                <xsl:copy-of select="@*"/>
-                                                
-                                            </stentry>
-                                        </xsl:for-each>-->
-                                    
-                                </xsl:for-each>
                             </strow>
                             
-                            <xsl:variable name="strow">
-                                <strow props="pos___{position()} deb_82">
+                            
+                            
+                            <xsl:for-each select="1 to $count.ytics">
+                                <xsl:variable name="count.ytics.current" select="current()"/>
+                                <xsl:variable name="count.ytics.current-grouping-key" select="$ytics//stentry[$count.ytics.current]/@current-grouping-key"/>
+                                <strow props="pos___{position()} deb_82 count.ytics {$count.ytics}">
                                     <stentry >
-                                        <xsl:value-of select="$ytics//stentry[2]/text()"/>
+                                        <xsl:value-of select="$ytics//stentry[$count.ytics.current]/text()"/>
                                     </stentry>
                                     <xsl:for-each select="1 to $count.xtics">
                                         <xsl:variable name="current-grouping-key" select="$xtics//stentry[@pos=current()]/@current-grouping-key"/>
                                         <xsl:variable name="audience" select="$xtics//stentry[@pos=current()]/@audience"/>
-                                        <xsl:variable name="group" select="$xtics//stentry[@current-grouping-key=$current-grouping-key][2]/@group"/>
+                                        <xsl:variable name="group" select="$xtics//stentry[@current-grouping-key=$current-grouping-key][1]/@group"/>
                                         
                                         
-                                        <stentry  audience="{$audience}">
-                                            <xsl:value-of select="$graph.data//stentry[@current-grouping-key=$current-grouping-key][2]/substring(text(),1,8)"/>
+                                        <stentry  audience="{$audience}" props="count.xtics {$count.xtics}">
+                                            <xsl:value-of select="$graph.data//stentry[@current-grouping-key=$current-grouping-key][$count.ytics.current]/substring(text(),1,8)"/>
                                         </stentry>
-                                        <!--<xsl:for-each select="$xtics//stentry">
+                                        <!-\-<xsl:for-each select="$xtics//stentry">
                                                 <stentry>
                                                     <xsl:copy-of select="@*"/>
                                                     
                                                 </stentry>
-                                            </xsl:for-each>-->
+                                            </xsl:for-each>-\->
                                         
                                     </xsl:for-each>
+                                    <stentry >
+                                        <xsl:value-of select="sum($data//stentry[@current-grouping-key=$count.ytics.current-grouping-key]/number(text()))"/>
+                                    </stentry>
                                 </strow>
-                            </xsl:variable>
-                            <xsl:if test="$strow//stentry[2]">
+                            </xsl:for-each>
+                            
+                            
+                            <strow props="pos___{position()} deb_85 count.ytics {$count.ytics}">
+                                <stentry >
+                                    Suma poziomo
+                                </stentry>
+                                <xsl:for-each select="1 to $count.xtics">
+                                    <xsl:variable name="current-grouping-key" select="$xtics//stentry[@pos=current()]/@current-grouping-key"/>
+                                    <xsl:variable name="audience" select="$xtics//stentry[@pos=current()]/@audience"/>
+                                    <xsl:variable name="group" select="$xtics//stentry[@current-grouping-key=$current-grouping-key][1]/@group"/>
+                                    <stentry  audience="{$audience}" props="count.xtics {$count.xtics}"/>
+                                </xsl:for-each>
+                                <stentry >
+                                    <xsl:value-of select="sum($data//stentry/number(text()))"/>
+                                </stentry>
+                            </strow>
+                            
+                            <!-\-<xsl:if test="$strow//stentry[2]">
                                 <xsl:copy-of select="$strow"/>
-                            </xsl:if>
+                            </xsl:if>-\->
+                            
+                            
+                            
                         </simpletable>
                     
                      
@@ -160,12 +253,248 @@
                 
                 
             </xsl:when>
-        </xsl:choose>
+        </xsl:choose>-->
+        
+    </xsl:template>
+    
+    
+    
+    <xsl:template name="p5gnuplot:simpletable__x3A__ytics.xml.id">
+        <xsl:param name="fileindex"/>
         
+        <xsl:choose>
+            <xsl:when test="string-length($fileindex)&gt;0">
+                <xsl:attribute name="id" select="concat($fileindex,'_guplot_simpletable')"/>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="system_cache__dita:graph.dat.row__x3A__from__ytics.xml">
+        <xsl:param name="title"/>
+        <xsl:param name="fileindex"/>
+        <xsl:param name="system_cache__dita:subscript"  select="'sup'"/>
+        <!--<p>-->
+            <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}" 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>
+            </strow>
+            <xsl:variable name="context" select="."/>
+            <xsl:for-each select="1 to $ytics.count">
+                <xsl:variable name="ytics.count.current" select="number(.)"/>
+                <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 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>
+                    </stentry>
+                    
+                    <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]">
+                                <stentry pos="{position()} test_100 regular row y= {$ytics.count.current} xtics.count.current = {$xtics.count.current}"/>
+                            </xsl:for-each>
+                        </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 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>
+                                    </stentry>
+                                </xsl:for-each>
+                            
+                            
+                        </xsl:for-each>
+                        <!--<xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml.ytics" select="$context/ytics.row[position()=xs:integer($xtics.count.current)]/(ytics.row.header|p5gnuplot:ytics.path.row)/(p5gnuplot:dat.sthead|p5gnuplot:dat.strow)[position()=xs:integer($ytics.count.current)]">
+                            <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript" />
+                        </xsl:apply-templates>-->
+                    </xsl:for-each>
+                    
+                </strow>
+            </xsl:for-each>
+            
+            
+             
+            
+        </simpletable>
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.xtics p5gnuplot:simpletable__x3A__ytics.xml.ytics " match="*|text()|comment()">
+        <!--<xsl:comment>#256 <xsl:value-of select="name(s)"/></xsl:comment>-->
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.xtics" match="ytics.row">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <xsl:comment>#250-284 bypassed <xsl:value-of select="name()"/></xsl:comment>
+        <xsl:apply-templates mode="#current">
+            <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.xtics" match="p5gnuplot:dat.sthead.ytics.row"><!--  -->
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <stentry>
+            <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml" select="@*">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        </stentry>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.xtics" match="ytics.row.header">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <stentry>
+            <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml" select="@*">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        </stentry>
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.ytics" match="ytics.row.header">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+            <xsl:apply-templates mode="#current">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.ytics" match="ytics.row">
+        <xsl:param name="system_cache__dita:subscript" />
+        <!--<stentry props="p287">-->
+            <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml" >
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        <!--</stentry>-->
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.ytics" match="p5gnuplot:ytics.path.row">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <stentry props="p283_repl">
+            <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml" select="@*">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        </stentry>
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.ytics" match="p5gnuplot:dat.sthead">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <stentry props="p296">
+            <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml" select="@*">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        </stentry>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.ytics" match="p5gnuplot:dat.strow">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <stentry props="p296">
+            <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml.value__x3A__expected" select="@*">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        </stentry>
+    </xsl:template>
+    
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="p5gnuplot:dat.strow.init">
+        <xsl:comment>#250 bypassed <xsl:value-of select="name()"/></xsl:comment>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="ytics.row">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <strow>
+            <xsl:apply-templates mode="#current" select="@*">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+            <xsl:apply-templates mode="#current">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        </strow>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="p5gnuplot:ytics.path.row">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <xsl:comment>#250-251 continue <xsl:value-of select="name()"/></xsl:comment>
+            <xsl:apply-templates mode="#current">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="p5gnuplot:dat.strow">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <stentry>
+            <xsl:apply-templates mode="p5gnuplot:simpletable__x3A__ytics.xml.value__x3A__expected" select="@*">
+                <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
+            </xsl:apply-templates>
+        </stentry>
     </xsl:template>
     
     
     
     
     
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="p5gnuplot:dat.sthead.color.column|p5gnuplot:dat.strow.color.row">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+       <xsl:message terminate="yes"> #274 unantended <xsl:value-of select="name()"/>; </xsl:message>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml p5gnuplot:simpletable__x3A__ytics.xml.value__x3A__expected" match="@*"/>
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="@p5gnuplot:text">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="string-length($system_cache__dita:subscript) &gt;0 ">
+                <xsl:element name="{$system_cache__dita:subscript}">
+                    <xsl:value-of select="replace(.,'\\n',' ')"/>
+                </xsl:element>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="."/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml" match="@p5gnuplot:text.join"/>
+    
+    <xsl:template mode="p5gnuplot:simpletable__x3A__ytics.xml.value__x3A__expected" match="@p5gnuplot:text">
+        <xsl:param name="system_cache__dita:subscript" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="string-length($system_cache__dita:subscript) &gt;0 ">
+                <xsl:element name="{$system_cache__dita:subscript}">
+                    <xsl:value-of select="system_cache__dita:big_values_format(.)"/>
+                </xsl:element>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="system_cache__dita:big_values_format(.)"/>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+    </xsl:template>
+    
+    
+    
 </xsl:stylesheet>

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

@@ -0,0 +1,146 @@
+<?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>
+                    
+                        
+                    
+                    </dd>  
+                    <dd>
+                        Opis wykresu
+                    </dd>
+                    <dd>
+                        <equation-inline>
+                            Osie Y
+                        </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 props="p5gnuplot__file.row.y">  <xsl:value-of select="@p5gnuplot:value"/></ph>
+    </xsl:template>
+    <xsl:template match="p5gnuplot:set.logscale.y1[not(preceding::p5gnuplot:set.logscale.y1)]" mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset">
+        <ph props="p5gnuplot__set.logscale.y1"><tt>oś Y1 logarytmiczna</tt></ph>
+    </xsl:template>
+    <xsl:template match="p5gnuplot:set.logscale.y2[not(preceding::p5gnuplot:set.logscale.y2)]" mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset">
+        <ph props="p5gnuplot__set.logscale.y2"><tt>oś Y2 logarytmiczna</tt></ph>
+    </xsl:template>
+    
+    <xsl:template match="p5gnuplot:current-grouping-key.xtics" mode="p5gnuplot:simpletable__x3A__from_rows.xsl.dita__x3A__detect__x3A__rowset">
+        <ph props="p5gnuplot.current-grouping-key.xtics">
+            <xsl:apply-templates mode="system_cache__dita:localname.translate" select="@*"/>
+        </ph>
+        <!--<tt><xsl:value-of select="."/></tt>-->
+    </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>

+ 112 - 499
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">
     
@@ -120,61 +121,8 @@
     
     <xsl:include href="graph_gnuplot.simpletable__x3A__from_rows.xsl"/>
     
-    <xsl:template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable">
-        <xsl:param name="simpletable" required="yes"/>
-        <xsl:apply-templates mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" select="$simpletable"/>
-    </xsl:template>
-    
-    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="*[not(descendant-or-self::simpletable)]">
-        <xsl:copy-of select="."/>
-    </xsl:template>
-    
-    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="SIMPLETABLE_WTITLE">
-        <xsl:apply-templates mode="#current"/><!-- just bypass -->
-    </xsl:template>
-    
-    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="*[descendant-or-self::simpletable and not(name()='SIMPLETABLE_WTITLE')]|simpletable">
-        <xsl:copy>
-            <xsl:copy-of select="@*"/>
-            <xsl:apply-templates mode="#current"/>
-        </xsl:copy>
-    </xsl:template>
-    
-    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="strow|sthead" priority="8">
-        <xsl:call-template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate">
-            <xsl:with-param name="strow" select="."/>
-        </xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="text()|comment()"/>
-    
-    <xsl:template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate">
-        <xsl:param name="strow" required="yes"/>
-        <xsl:for-each select="$strow">
-            <xsl:choose>
-                <xsl:when test="name()='strow' or name()='sthead'">
-                    <xsl:copy>
-                        <xsl:copy-of select="@*"/>
-                        <xsl:for-each select="*">
-                            <xsl:copy>
-                                <xsl:copy-of select="@*"/>
-                                <xsl:attribute name="col" select="position()"/>
-                                <xsl:copy-of select="text()"/>
-                            </xsl:copy>
-                        </xsl:for-each>
-                    </xsl:copy>
-                </xsl:when>
-                <xsl:when test="*/name()='strow' or */name()='sthead'">
-                    <xsl:call-template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate">
-                        <xsl:with-param name="strow" select="*"/>
-                    </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:message terminate="yes">#165 INCORRECT FORMAT OF EXPECTED $strow/n=<xsl:value-of select="name()"/> , */n=<xsl:value-of select="*/name()"/> system_cache__dita:graph.all.data.fit.fix__x3A__numerate</xsl:message>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-    </xsl:template>
+    <xsl:include href="graph_gnuplotdat.row__x3A__from__xtics__x3A__fix.xsl"/>
+    <xsl:include href="graph_gnuplotdat__x3A__init.xsl"/>
     
     <xsl:function name="system_cache__dita:graph.title.group">
         <xsl:param name="current-grouping-key"/>
@@ -325,194 +273,68 @@
         
     </xsl:function>
     
-    <xsl:template mode="system_cache__dita:graph__write_dita_preprocess" match="simpletable[not(contains(@props,'nograph'))]">
-        <xsl:param name="p5gnuplot:font__x3A__size" select="'9'"/>
-        <xsl:param name="title"/>
-        <xsl:param name="ylabel"/>
-        <xsl:param name="y2label"/>
-        <xsl:param name="histogram"/>
-        <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.lingstring__x3A__break.size">
-            <xsl:choose>
-                <xsl:when test="contains(@props,'graph.lingstring.break.size.25')"><xsl:value-of select="25"/></xsl:when>
-                <xsl:otherwise><xsl:value-of select="$system_cache__dita:graph.lingstring__x3A__break.size"/></xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="set.style.histogram">
-            <xsl:choose>
-                <xsl:when test="contains(@props,'graph.style.histogram') or string-length($histogram)&gt;0"><xsl:text>
-set style data histogram
-set style histogram cluster gap 1
-set style fill solid border -1
-unset xtics
-
-</xsl:text></xsl:when>
-            <xsl:otherwise>
-                <xsl:text>
-set xtics rotate  
-</xsl:text>
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="title">
-            <xsl:choose>
-                <xsl:when test="$title"><xsl:value-of select="$title"/><xsl:message>#133 set grapht title param to <xsl:value-of select="$title"/></xsl:message></xsl:when>
-                <xsl:when test="preceding-sibling::title"><xsl:value-of select="preceding-sibling::title"/></xsl:when>
-                <xsl:when test="preceding-sibling::*[contains(@props,'title')]"><xsl:value-of select="preceding-sibling::*[contains(@props,'title')]"/></xsl:when>
-                <!--<xsl:otherwise>wykres</xsl:otherwise>-->
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="ylabel">
-            <xsl:choose>
-                <xsl:when test="$ylabel"><xsl:value-of select="$ylabel"/></xsl:when>
-                <xsl:when test="contains(@props,'graph.ylabel')"><xsl:for-each select="tokenize(@props,' ')"><xsl:if test="contains(.,'graph.ylabel')"><xsl:value-of select="substring-after(.,'graph.ylabel.')"/></xsl:if></xsl:for-each></xsl:when>
-                <xsl:otherwise>"wart."</xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="y2label">
-            <xsl:choose>
-                <xsl:when test="$y2label"><xsl:value-of select="$y2label"/></xsl:when>
-                <xsl:when test="contains(@props,'graph.y2label')"><xsl:for-each select="tokenize(@props,' ')"><xsl:if test="contains(.,'graph.y2label')"><xsl:value-of select="substring-after(.,'graph.y2label.')"/></xsl:if></xsl:for-each></xsl:when>
-                <!--<xsl:otherwise>ilość.</xsl:otherwise>-->
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="p5gnuplot:font__x3A__size">
-            <xsl:choose>
-                <xsl:when test="contains(@props,'font30')"><xsl:value-of select="30"/><xsl:message>#54-A p5gnuplot:font__x3A__size 30</xsl:message></xsl:when>
-                <xsl:when test="contains(@props,'font15')"><xsl:value-of select="15"/><xsl:message>#54-B p5gnuplot:font__x3A__size 15</xsl:message></xsl:when>
-                <xsl:otherwise><xsl:value-of select="$p5gnuplot:font__x3A__size"/></xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="graph.nokey">
-            <xsl:choose>
-                <xsl:when test="$graph.nokey"><xsl:value-of select="$graph.nokey"/></xsl:when>
-                <xsl:when test="contains(@props,'graph.nokey')">graph.nokey</xsl:when>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="graph.unset.xtics">
-            <xsl:choose>
-                <xsl:when test="contains(@props,'graph.unset.xtics')"><xsl:text>
-unset xtics</xsl:text></xsl:when>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="p5gnuplot:logscale">
-            <xsl:choose>
-<xsl:when test="contains(@props,'logscale')"><xsl:text>set logscale y
-</xsl:text><xsl:message>#54-C p5gnuplot:logscale</xsl:message></xsl:when>
-                <xsl:otherwise/>
-            </xsl:choose>
-        </xsl:variable>
-        <!-- do stworzenia grafu na bazie tabeli simpletable w dita -->
-        <xsl:variable name="fileindex" select="@id"/>
-        <xsl:variable name="cols" select="count(strow[ position() = 1]/stentry)"/>
-        <xsl:variable name="graph.headers" select="(strow|sthead)[ contains(@props,'graph.headers') ]"/>
-        <xsl:variable name="graph.color.variable" select="(strow|sthead)[ contains(@props,'graph.color.variable') ]"/>
-        <xsl:variable name="graph.data" select="(strow|sthead)[ contains(@props,'graph.data')]"/><!-- position()=2 and -->
-        
-        <xsl:choose>
-            <xsl:when test="not($graph.data//stentry)"><xsl:message>#97 WARNING NOT EXPECTED $graph.data//stentry</xsl:message></xsl:when>
-        </xsl:choose>
-        <xsl:variable name="graph.title" >
-            <xsl:choose>
-                <xsl:when test="(strow|sthead)[ contains(@props,'graph.title')]">
-                    <graph.title>
-                        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.title')]"/>
-                    </graph.title>
-                </xsl:when>
-                <xsl:otherwise><xsl:message>#292 not found requested $graph.title : <xsl:value-of select="*/name()"/></xsl:message></xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="system_cache__dita:graph.title">
-            <xsl:call-template name="system_cache__dita:graph.title">
-                <xsl:with-param name="graph.title" select="$graph.title"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="graph.color.name" select="(strow|sthead)[ contains(@props,'graph.color.name')]"/>
-        <xsl:variable name="graph.yaxis" select="(strow|sthead)[ contains(@props,'graph.yaxis')]"/>
-        <xsl:variable name="graph.fill.style" select="(strow|sthead)[ contains(@props,'graph.fill.style')]"/>
-        <xsl:variable name="graph.newhistogram" select="(strow|sthead)[ contains(@props,'graph.newhistogram')]"/>
-        
-        <xsl:variable name="strow" select="(strow|sthead)[ position() &lt; 3]"/>
-        
-        <xsl:call-template name="system_cache__dita:graph.axis__x3A__validate">
-            <xsl:with-param name="graph.headers" select="$graph.headers"/>
-            <xsl:with-param name="graph.title" select="$graph.title"/>
-            <xsl:with-param name="graph.fill.style" select="$graph.fill.style"/>
-        </xsl:call-template>
+    
+    <xsl:template name="system_cache__dita:graph__write_dita_preprocess">
+        <xsl:param name="p5gnuplot:font__x3A__size" required="yes"/>
+        <!--<xsl:param name="title" required="yes"/>-->
+        <!--<xsl:param name="ylabel" required="yes"/>-->
+        <!--<xsl:param name="y2label" required="yes"/>-->
+        <!--<xsl:param name="histogram" required="yes"/>-->
+        <!--<xsl:param name="graph.nokey" required="yes"/>-->
+        <!--<xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" required="yes"/>-->
+        <!--<xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>-->
+        <xsl:param name="fileindex" required="yes"/>
+        <xsl:param name="system_cache__dita:graph.ytics_detect_row" required="yes"/>
+        <xsl:param name="system_cache__dita:graph.title" required="yes"/>
+        <xsl:param name="set.style.histogram" required="yes"/>
+        <xsl:param name="graph.nokey" required="yes"/>
+        <xsl:param name="graph.unset.xtics" required="yes"/>
+        <xsl:param name="ylabel" required="yes"/>
+        <xsl:param name="y2label" required="yes"/>
+        <xsl:param name="graph.headers" required="yes"/>
+        <xsl:param name="graph.data" required="yes"/>
+        <xsl:param name="xtics" required="yes"/>
+        <xsl:param name="graph.fill.style" required="yes"/>
+        <xsl:param name="newhistogram" required="yes"/>
+        <xsl:param name="graph.newhistogram" required="yes"/>
+        <xsl:param name="graph.color.name" required="yes"/>
+        <xsl:param name="title" required="yes"/>
+        <xsl:param name="ytics" required="yes"/>
         
+        <xsl:param name="cols" required="yes"/>
+        <xsl:param name="p5gnuplot:logscale.y1" required="yes"/>
+        <xsl:param name="p5gnuplot:logscale.y2" required="yes"/>
+        <xsl:param name="graph.title" required="yes"/>
+        <xsl:param name="graph.color.variable" required="yes"/>
+        <xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" required="yes"/>
+        <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>
         
-        <xsl:variable name="ytics">
-            <xsl:call-template name="system_cache__dita:graph.ytics">
-                <xsl:with-param name="system_cache__dita:graph.title" select="$system_cache__dita:graph.title"/>
-                <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>   
-                <xsl:with-param name="graph.yaxis" select="$graph.yaxis"/>
-                <xsl:with-param name="graph.data" select="$graph.data"/>
-                <!--<xsl:with-param name="xtics" select="$xtics"/>-->
-            </xsl:call-template>
-        </xsl:variable>
-        
-        <xsl:variable name="system_cache__dita:graph.ytics_detect_row">
-            <xsl:call-template name="system_cache__dita:graph.ytics_detect_row">
-                <xsl:with-param name="ytics" select="$ytics"/>
-                <!--<xsl:with-param name="xtics" select="$xtics"/>-->
-            </xsl:call-template>
-        </xsl:variable>
-        
-        <xsl:variable name="xtics">
-            <xsl:call-template name="system_cache__dita:graph.xtics">
-                <xsl:with-param name="system_cache__dita:graph.title" select="$system_cache__dita:graph.title"/>
-                <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram"/>
-                <xsl:with-param name="fileindex"  select="$fileindex"   />
-                <xsl:with-param name="graph.fill.style" select="$graph.fill.style"/>
-                <xsl:with-param name="graph.color.name" select="$graph.color.name"/>
-                <xsl:with-param name="graph.color.variable" select="$graph.color.variable" />
-                <xsl:with-param name="graph.yaxis" select="$graph.yaxis"/>
-                <xsl:with-param name="p5gnuplot:font__x3A__size" select="$p5gnuplot:font__x3A__size"/>
-                <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"/>
-                <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="graph.data" select="$graph.data"/>
-                <xsl:with-param name="graph.headers" select="$graph.headers"/>
-                <xsl:with-param name="graph.title" select="$graph.title"/>
-                <xsl:with-param name="ytics" select="$ytics"/>
-                <xsl:with-param name="system_cache__dita:graph.ytics_detect_row" select="$system_cache__dita:graph.ytics_detect_row" tunnel="yes"/>
-                <xsl:with-param name="simpletable.props" select="@props" tunnel="yes"/>
-            </xsl:call-template>
-        </xsl:variable>
-        
-        
-        
-        
-        
-        <xsl:variable name="stats">
-            <xsl:call-template name="system_cache__dita:graph.stats">
-                <xsl:with-param name="ytics" select="$ytics"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.debug.xml" >
+         <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="//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>
@@ -520,8 +342,8 @@ unset xtics</xsl:text></xsl:when>
         <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>
@@ -545,54 +367,9 @@ unset xtics</xsl:text></xsl:when>
                     <xsl:message>#69-xtics = <xsl:value-of select="$xtics//text()"/>; flatting dat.tables to histogram</xsl:message>
                     
                     
-                    <xsl:variable name="newhistogram">
-                        <xsl:call-template name="system_cache__dita:graph.newhistogram">
-                            <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram"/>
-                        </xsl:call-template>
-                    </xsl:variable>
+                    
                     <xsl:message>#69-AAA-xtics = <xsl:value-of select="$xtics//text()"/>; flatting dat.tables to histogram</xsl:message>
-                    <!--<xsl:variable name="xtics.cols">
-                        <xtics.cols>
-                            <xsl:for-each select="$graph.title//stentry">
-                                <xsl:variable name="graph.title.current" select="text()"/>
-                                <xsl:variable name="graph.title.position" select="position()"/>
-                                <xsl:variable name="current-grouping-key" select="@current-grouping-key"/>
-                                <xsl:for-each select="$xtics//text" >
-                                    <xsl:choose>
-                                        <xsl:when test="$graph.title.current = current() ">
-                                            <pos>
-                                                <xsl:attribute name="graph.xtic" select="$graph.title.current"/>
-                                                <xsl:attribute name="columnheader" select="$graph.title.current"/>
-                                                <xsl:attribute name="graph.title.position" select="$graph.title.position"/>
-                                                <xsl:attribute name="xtics.pos" select="position()"/>
-                                                <xsl:attribute name="row.pos.calc" select="ceiling($graph.title.position div count($xtics//text))"/>
-                                                <!-\-<xsl:attribute name="row.pos.calc.debug" >
-                                                    <xsl:for-each select="$graph.title//stentry"></xsl:for-each>
-                                                </xsl:attribute>-\->
-                                                <xsl:attribute name="debug.text" select="current()"/>
-                                                <xsl:attribute name="current-grouping-key" select="@current-grouping-key"/>
-                                                <xsl:attribute name="current-grouping-key.list" select="@current-grouping-key.list"/>
-                                                <!-\-<xsl:choose>
-                                                    <xsl:when test="$graph.color.name//stentry[position()=$graph.title.position]/text()">
-                                                        <xsl:attribute name="graph.color.name" select="$graph.color.name//stentry[position()=$graph.title.position]/text()"/>
-                                                    </xsl:when>
-                                                </xsl:choose>-\->
-                                                <!-\-<xsl:choose>
-                                                    <xsl:when test="not($graph.newhistogram//stentry)"/>
-                                                    <xsl:when test="( position() mod count($newhistogram//text))=1">
-                                                        <xsl:attribute name="newhistogram" select="ceiling(position() div count($newhistogram//text))"/>
-                                                    </xsl:when>
-                                                    <xsl:otherwise>
-                                                        <xsl:attribute name="newhistogram.rest" select="( position() mod count($newhistogram//text))"/>
-                                                    </xsl:otherwise>
-                                                </xsl:choose>-\->
-                                            </pos>
-                                        </xsl:when>
-                                    </xsl:choose>
-                                </xsl:for-each>
-                            </xsl:for-each>                                
-                        </xtics.cols>
-                    </xsl:variable>-->
+                    
                     <xsl:text>set terminal pngcairo font "arial,</xsl:text><xsl:value-of select="$p5gnuplot:font__x3A__size"/>" size 800,600<xsl:text> 
 
 </xsl:text>
@@ -606,8 +383,10 @@ unset xtics</xsl:text></xsl:when>
 </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
@@ -630,7 +409,7 @@ set grid  y y2
 set style textbox opaque
 set ytics auto
 set y2tics auto
-set logscale y2
+#set logscale y2
 
 set title "</xsl:text><xsl:value-of select="$title"/><xsl:text>"
 set ylabel </xsl:text>
@@ -646,7 +425,7 @@ set ylabel </xsl:text>
 set y2label "</xsl:text><xsl:value-of select="$y2label"/><xsl:text>"
 #set xtics rotate  
 </xsl:text>
-                    <xsl:value-of select="$p5gnuplot:logscale"/>
+                    <xsl:value-of select="$p5gnuplot:logscale.y1"/>
                     
                     <xsl:call-template name="system_cache__dita:graph.gnuplot__x3A__from_ytics">
                         <xsl:with-param name="ytics" select="$ytics"/>
@@ -659,30 +438,10 @@ set y2label "</xsl:text><xsl:value-of select="$y2label"/><xsl:text>"
                         <xsl:with-param name="newhistogram" select="$newhistogram"/>
                         <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram"/>
                         <xsl:with-param name="graph.color.name" select="$graph.color.name"/>
-                        
-                        <!--<xsl:with-param name="xtics.cols" select="$xtics.cols"/>-->
                     </xsl:call-template>
                    
                     
-                    <!--<DEB>
-                        <xsl:copy-of select="$stats"/>
-                        <xsl:copy-of select="$ytics"/>
-                        <xsl:copy-of select="$xtics"/>
-                        <!-\-<xsl:copy-of select="$xtics.cols"/>-\->
-                        <xsl:copy-of select="$graph.newhistogram"/>
-                        <xsl:for-each select="$graph.data">
-                            <xsl:copy>
-                                <xsl:copy-of select="@*"/>
-                                <xsl:for-each select="*">
-                                    <xsl:copy>
-                                        <xsl:copy-of select="@*"/>
-                                        <xsl:attribute name="pos" select="position()"/>
-                                        <xsl:copy-of select="text()"></xsl:copy-of>
-                                    </xsl:copy>
-                                </xsl:for-each>
-                            </xsl:copy>
-                        </xsl:for-each>
-                    </DEB>-->
+                    
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:text>set terminal pngcairo font "arial,</xsl:text><xsl:value-of select="$p5gnuplot:font__x3A__size"/>" size 800,600<xsl:text> 
@@ -694,7 +453,7 @@ set datafile missing "-"
 set title "</xsl:text><xsl:value-of select="$title"/><xsl:text>"
 set xtics rotate  
 </xsl:text>
-                    <xsl:value-of select="$p5gnuplot:logscale"/>
+                    <xsl:value-of select="$p5gnuplot:logscale.y1"/>
                     
                     <xsl:text>
 plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" using 0:2:3:xtic(1) with boxes  lc variable</xsl:text>
@@ -709,21 +468,10 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
                 </xsl:when>
                 <xsl:when test="string-length($set.style.histogram) &gt;0 ">
                     <xsl:message>#69-A graph $set.style.histogram cols <xsl:value-of select="$cols"/></xsl:message>
-                    <!--<xsl:variable name="system_cache__dita:graph.title">
-                        <xsl:call-template name="system_cache__dita:graph.title">
-                            <xsl:with-param name="graph.title" select="$graph.title"/>
-                        </xsl:call-template>
-                    </xsl:variable>-->
-                    
-                    <!--<xsl:variable name="ytics">
-                        <xsl:call-template name="system_cache__dita:graph.ytics">
-                            <xsl:with-param name="system_cache__dita:graph.title" select="$system_cache__dita:graph.title"/>
-                        </xsl:call-template>
-                    </xsl:variable>-->
                     
                     <xsl:message>#69-xtics = <xsl:value-of select="$xtics//text()"/>; flatting dat.tables to histogram</xsl:message>
-                    
-                    <xsl:call-template name="system_cache__dita:graph.dat.row__x3A__from__ytics">
+                    <xsl:apply-templates mode="p5gnuplot:graph.newhistogram__x3A__dat" select="$system_cache__dita:graph.dat.row__x3A__from__ytics.xml"/>
+                    <!--<xsl:call-template name="system_cache__dita:graph.dat.row__x3A__from__ytics">
                         <xsl:with-param name="ytics" select="$ytics"/>
                         <xsl:with-param name="ylabel" select="$ylabel"/>
                         <xsl:with-param name="graph.headers" select="$graph.headers"/>
@@ -732,159 +480,7 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
                         <xsl:with-param name="graph.title" select="$graph.title"/>
                         <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"/>
                         <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size"/>
-                    </xsl:call-template>
-                    <!--<xsl:variable name="xtics.cols">
-                        <xtics.cols>
-                            <xsl:for-each-group select="$graph.title//stentry" group-by="@group"  >
-                                
-                                    <xsl:variable name="graph.title.current" select="text()"/>
-                                    <xsl:variable name="current-grouping-key" select="@current-grouping-key"/>
-                                    <xsl:variable name="graph.title.position" select="position()"/>
-                                    <xsl:variable name="xtics.cols.current" select="."/>
-                                    <xsl:variable name="precedings" select="count(preceding-sibling::stentry)"/>
-                                    <xsl:variable name="current-group" select="current-group()"/>
-                                        <!-\-<DEB_CNT><xsl:value-of select="count(current-group())"/></DEB_CNT>-\->
-                                        <xsl:for-each select="$xtics//text"  >
-                                            <!-\-<xsl:choose>
-                                                <xsl:when test="$graph.title.current = current()" >-\-><!-\- and $current-grouping-key=current()/@current-grouping-key -\->
-                                                    <!-\-<pos>
-                                                        <xsl:attribute name="graph.xtic" select="$graph.title.current"/>
-                                                        <xsl:attribute name="columnheader" select="$graph.title.current"/>
-                                                        <xsl:attribute name="graph.title.position" select="$graph.title.position"/>
-                                                        <xsl:attribute name="current-grouping-key" select="@current-grouping-key"/>
-                                                        <xsl:attribute name="xtics.pos" select="position()"/>
-                                                        <xsl:attribute name="row.pos.calc" select="ceiling($graph.title.position div count($xtics//text))"/>
-                                                        <xsl:attribute name="row.pos.calc.debug" >
-                                                            <xsl:for-each select="$xtics//text[ text()=$graph.title.current]">
-                                                                <xsl:value-of select="position()"/>
-                                                            </xsl:for-each>
-                                                        </xsl:attribute>
-                                                        <xsl:attribute name="debug.text" select="current()"/>
-                                                        <xsl:attribute name="current-grouping-key.list" select="@current-grouping-key.list"/>
-                                                        <!-\\-<xtics.cols.current>
-                                                        <xsl:copy-of select="$xtics.cols.current"/>
-                                                    </xtics.cols.current>-\\->
-                                                        <!-\\-<xtics.current.deb>
-                                                        <xsl:copy-of select="."/>
-                                                    </xtics.current.deb>-\\->
-                                                        
-                                                    </pos>-\->
-                                                   
-                                                        <!-\-<xsl:for-each select="$current-group">
-                                                            <pos precedings="{$precedings}">
-                                                                <xsl:attribute name="graph.xtic" select="$graph.title.current"/>
-                                                                <xsl:attribute name="columnheader" select="$graph.title.current"/>
-                                                                <xsl:attribute name="graph.title.position" select="$graph.title.position"/>
-                                                                <xsl:attribute name="current-grouping-key" select="@current-grouping-key"/>
-                                                                <xsl:attribute name="xtics.pos" select="position()"/>
-                                                                <xsl:attribute name="row.pos.calc" select="ceiling($graph.title.position div count($xtics//text))"/>
-                                                                <xsl:attribute name="row.pos.calc.debug" >
-                                                                    <xsl:for-each select="$xtics//text[ text()=$graph.title.current]">
-                                                                        <xsl:value-of select="position()"/>
-                                                                    </xsl:for-each>
-                                                                </xsl:attribute>
-                                                                <xsl:attribute name="debug.text" select="current()"/>
-                                                                <xsl:attribute name="current-grouping-key.list" select="@current-grouping-key.list"/>
-                                                                <xsl:text>T </xsl:text><xsl:value-of select="position()"/>
-                                                            </pos>
-                                                        </xsl:for-each>-\->
-                                                    
-                                                <!-\-</xsl:when>
-                                            </xsl:choose>-\->
-                                    </xsl:for-each>
-                                
-                                
-                            </xsl:for-each-group>    
-                            <!-\-<xsl:for-each select="$xtics//text">
-                                <xsl:variable name="graph.title.current" select="text()"/>
-                                <xsl:variable name="xtics.pos.curr" select="@pos"/>
-                                <xsl:for-each select="$graph.title//stentry" >
-                                    
-                                    <xsl:variable name="graph.title.position" select="position()"/>
-                                    <xsl:choose>
-                                        <xsl:when test="$graph.title.current = current()">
-                                            <pos>
-                                                <xsl:attribute name="graph.xtic" select="$graph.title.current"/>
-                                                <xsl:attribute name="columnheader" select="$graph.title.current"/>
-                                                <xsl:attribute name="graph.title.position" select="$graph.title.position"/>
-                                                <xsl:attribute name="xtics.pos" select="position()"/>
-                                                <xsl:attribute name="row.pos.calc" select="$xtics.pos.curr"/>
-                                                <xsl:attribute name="debug.text" select="current()"/>
-                                            </pos>
-                                        </xsl:when>
-                                    </xsl:choose>
-                                </xsl:for-each>
-                            </xsl:for-each>-\->
-                        </xtics.cols>
-                    </xsl:variable>-->
-                    <!--
-                    <xsl:value-of select="$ylabel"/><xsl:text>&#09;</xsl:text>
-                    <xsl:for-each select="$xtics//text"><xsl:value-of select="position()"/>
-                        <xsl:value-of select="."/><xsl:text>&#09;</xsl:text>
-                    </xsl:for-each>
-                    <xsl:text>&#10;</xsl:text>
-                    -->
-                  
-                    <!-- ed -->
-                    <!--<xsl:for-each select="1 to xs:integer(max($xtics//text/number(@count)))">
-                        <xsl:variable name="xtics.pos" select="xs:integer(.)"/>
-                        <!-\-<TST xtics.pos="{$xtics.pos}">
-                            <xsl:value-of select="system_cache__dita:graph.data__x3A__from_xtics.cols.pos($xtics.pos,$xtics.cols)"/>
-                        </TST>-\->
-                        <!-\-<TEST2>
-                            <xsl:for-each select="$xtics.cols//pos[@row.pos.calc = $xtics.pos]"> - p <xsl:value-of select="position()"/>/@<xsl:value-of select="@graph.title.position"/>/v=<xsl:value-of select="$graph.data//stentry[position()= current()/@graph.title.position]"/></xsl:for-each><xsl:text>
-                                
-                            </xsl:text>
-                        </TEST2>-\->
-                        <!-\-<TESTall>
-                            <xsl:for-each select="$xtics//text"> - TA <xsl:value-of select="position()"/></xsl:for-each>
-                        </TESTall>-\->
-                        <xsl:choose>
-                            <xsl:when test="$xtics.cols//pos[@row.pos.calc = current()]">
-                                <xsl:variable name="row.pos.calc.deb" select="$xtics.cols//pos[@row.pos.calc = current()]/@row.pos.calc"/>
-                                <xsl:for-each select="$xtics.cols//pos[@row.pos.calc = current()]">
-                                    <xsl:variable name="row.pos.calc.2" select="$xtics.cols//pos[@row.pos.calc = current()/@row.pos.calc][2]"/>
-                                    <xsl:if test="position() = 1">
-                                        <xsl:choose>
-                                            <xsl:when test="$graph.headers//stentry[ position() = $row.pos.calc.2/number(@graph.title.position)]/contains(@props,'graph.xtic')">
-                                                <xsl:value-of select="$graph.headers//stentry[ position() = $row.pos.calc.2/number(@graph.title.position)]"/>
-                                            </xsl:when>
-                                            <xsl:otherwise>
-                                                <xsl:value-of select="$graph.headers//stentry[ position() = current()/number(@graph.title.position)]"/>
-                                            </xsl:otherwise>
-                                        </xsl:choose>
-                                        <xsl:text>&#09;</xsl:text></xsl:if>
-                                    <xsl:choose>
-                                        <xsl:when test="$graph.data//stentry[ position() = current()/number(@graph.title.position)]/text()">
-                                            <xsl:value-of select="$graph.data//stentry[ position() = current()/number(@graph.title.position)]"/><!-\-.<xsl:value-of select="position()"/>.<xsl:value-of select="$xtics.pos"/>.<xsl:value-of select="@graph.title.position"/>-\->
-                                        </xsl:when>
-                                        <xsl:otherwise>-</xsl:otherwise>
-                                    </xsl:choose>
-                                    <xsl:text>&#09;</xsl:text>
-                                </xsl:for-each>
-                            </xsl:when>
-                            <xsl:otherwise>-\-</xsl:otherwise>
-                        </xsl:choose>
-                        
-                        <xsl:text>&#10;</xsl:text>
-                    </xsl:for-each>-->
-                    <!--<DEB>
-                        <xsl:copy-of select="$ytics"/>
-                        <xsl:copy-of select="$xtics"/>
-                        <xsl:copy-of select="$graph.title"/>
-                        <xsl:for-each select="$graph.data">
-                            <xsl:copy>
-                                <xsl:copy-of select="@*"/>
-                                <xsl:for-each select="*">
-                                    <xsl:copy>
-                                        <xsl:copy-of select="@*"/>
-                                        <xsl:attribute name="pos" select="position()"/>
-                                        <xsl:copy-of select="text()"></xsl:copy-of>
-                                    </xsl:copy>
-                                </xsl:for-each>
-                            </xsl:copy>
-                        </xsl:for-each>
-                    </DEB>-->
+                    </xsl:call-template>-->
                     
                 </xsl:when>
                 <xsl:otherwise>
@@ -921,38 +517,43 @@ plot "</xsl:text><xsl:value-of select="$fileindex"/><xsl:text>.gnuplot.dat" usin
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:result-document>
-        <!--<xsl:result-document href="{$ditadir}/graph_to_image/{$fileindex}.gnuplot.copy.dat" omit-xml-declaration="yes">            
-            <xsl:choose>
-                <xsl:when test="string-length($set.style.histogram) &gt;0 and not($graph.title)">
-                    <xsl:message terminate="yes">#118 when $set.style.histogram - must be set prop="graph.title"</xsl:message>
-                </xsl:when>
-                <xsl:when test="string-length($set.style.histogram) &gt;0 ">
-                    <xsl:message>#69-A graph $set.style.histogram cols <xsl:value-of select="$cols"/></xsl:message>
-                    <xsl:variable name="graph.title">
-                        <xsl:call-template name="system_cache__dita:graph.title">
-                            <xsl:with-param name="graph.title" select="$graph.title"/>
-                        </xsl:call-template>
-                    </xsl:variable>
-                    
-                    <xsl:variable name="ytics">
-                        <xsl:call-template name="system_cache__dita:graph.ytics">
-                            <xsl:with-param name="graph.title" select="$graph.title"/>
-                        </xsl:call-template>
-                    </xsl:variable>
-                    
-                    <xsl:message>#69-xtics = <xsl:value-of select="$xtics//text()"/>; flatting dat.tables to histogram</xsl:message>
-                    
-                    <xsl:call-template name="system_cache__dita:graph.dat.row__x3A__from__ytics">
-                        <xsl:with-param name="ytics" select="$ytics"/>
-                        <xsl:with-param name="ylabel" select="$ylabel"/>
-                        <xsl:with-param name="graph.headers" select="$graph.headers"/>
-                        <xsl:with-param name="graph.data" select="$graph.data"/>
-                        <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
-                    </xsl:call-template>
-                </xsl:when>
+        
+            <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:choose>
-        </xsl:result-document>-->
+                <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>
+    
+    <xsl:template mode="system_cache__dita:graph__write_dita_preprocess" match="simpletable[not(contains(@props,'nograph'))]">
+        <xsl:param name="p5gnuplot:font__x3A__size" />
+        <xsl:param name="title"/>
+        <xsl:param name="ylabel"/>
+        <xsl:param name="y2label"/>
+        <xsl:param name="histogram"/>
+        <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:call-template name="system_cache__dita:graph__x3A__variables__x3A__init">
+            <xsl:with-param name="system_cache__dita:graph__x3A__variables__x3A__init__x3A__call" select="'system_cache__dita:graph__write_dita_preprocess'"/>
+            <xsl:with-param name="p5gnuplot:font__x3A__size" select="$p5gnuplot:font__x3A__size"/>
+            <xsl:with-param name="title" select="$title"/>
+            <xsl:with-param name="ylabel" select="$ylabel"/>
+            <xsl:with-param name="y2label" select="$y2label"/>
+            <xsl:with-param name="histogram" select="$histogram"/>
+            <xsl:with-param name="graph.nokey" select="$graph.nokey"/>
+            <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"/>
+            <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size"/>
+        </xsl:call-template>
+        
+        
         
     </xsl:template>
     
@@ -1045,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>
@@ -1053,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}">
+                <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="*">

+ 150 - 38
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.xsl

@@ -16,30 +16,11 @@
     <xsl:include href="graph_gnuplotdat.row__x3A__from__xtics__x3A__plot.xsl"/>
     <xsl:include href="graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl"/>
     <xsl:include href="graph_gnuplotdat.row__x3A__from__xtics__x3A__detect.xsl"/>
+    <xsl:include href="graph_gnuplotdat.row__x3A__from__xtics__x3A__dat.xsl"/>
     
     
     
     
-    <xsl:template name="system_cache__dita:graph.title">
-        <xsl:param name="graph.title" required="yes"/>
-        <graph.title>
-            <xsl:for-each select="$graph.title//strow" >
-                <xsl:copy>
-                    <xsl:copy-of select="@*"/>
-                    <xsl:attribute name="strow.pos" select="position()"/>
-                    <xsl:variable name="strow.pos" select="position()"/>
-                    <xsl:for-each select="stentry">
-                        <xsl:copy>
-                            <xsl:copy-of select="@*"/>
-                            <xsl:attribute name="stentry.pow" select="position()"/>
-                            <xsl:attribute name="count.stentry.pow.all" select="position() + $strow.pos"/>
-                            <xsl:copy-of select="text()"/>
-                        </xsl:copy>
-                    </xsl:for-each>
-                </xsl:copy>
-            </xsl:for-each>
-        </graph.title>
-    </xsl:template>
     
     <xsl:template name="system_cache__dita:graph.xtics">
         <xsl:param name="system_cache__dita:graph.title" required="yes"/>
@@ -48,23 +29,28 @@
         <xsl:param name="graph.fill.style" required="yes"/>
         <xsl:param name="graph.color.name" required="yes"/>
         <xsl:param name="graph.color.variable" required="yes"/>
-        <xsl:param name="graph.yaxis" required="yes"/>
+        <xsl:param name="graph.yaxis" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:font__x3A__size" required="yes"/>
         <xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" required="yes"/>
         <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>
-        <xsl:param name="graph.data" required="yes"/>
+        <xsl:param name="graph.data" required="yes" tunnel="yes"/>
         <xsl:param name="graph.headers" required="yes"/>
         <xsl:param name="graph.title" required="yes"/>
-        <xsl:param name="ytics" required="yes"/>
+        <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="system_cache__dita:graph.ytics_detect_row" required="yes" tunnel="yes"/>
         <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>
                     <xsl:for-each-group select="$graph.headers//stentry" group-by="text()">
                         <text pos="{position()}" count="{count(current-group())}" >
-                            <xsl:copy-of select="@stentry.pow"/>
+                            <!--<xsl:copy-of select="@stentry.pow"/>-->
                             <xsl:copy-of select="@audience"/>
+                            <xsl:copy-of select="@platform"/>
+                            <xsl:copy-of select="@props"/>
                             <xsl:copy-of select="@col"/>
                             <xsl:copy-of select="@current-grouping-key"/>
                             
@@ -73,7 +59,8 @@
                             <xsl:attribute name="current-grouping-col.list" select="current-group()/@col"/>
                             <xsl:copy-of select="parent::strow/@strow.pos"/>
                                 <xsl:for-each select="current-group()/@current-grouping-key">
-                                    <current-grouping-key pos="{position()}" col="{../@col}">
+                                    <current-grouping-key pos="{position()}" col="{../@col}" xtics="axis">
+                                        <xsl:copy-of select="../@platform"/>
                                         <xsl:value-of select="."/>
                                     </current-grouping-key>
                                 </xsl:for-each>
@@ -115,7 +102,10 @@
                                 </xsl:otherwise>
                             </xsl:choose>
                             <xsl:attribute name="debug.116">foreach group @group by [@audience=<xsl:value-of select="@audience"/>]</xsl:attribute>
-                            <xsl:for-each-group select="current-group()"  group-by="@audience">
+                            <!--<xsl:call-template name="p5gnuplot:xtics.axis.list__x3A__detect">
+                                <xsl:with-param name="xtics" select="$xtics"/>
+                            </xsl:call-template>-->
+                            <xsl:for-each-group select="current-group()"  group-by="@audience" >
                                 <audience audience="{current-grouping-key()}" current-grouping-key.list="{@current-grouping-key.list}">
                                     <xsl:attribute name="current-grouping-key.foreign" select="false()"/>
                                     <xsl:for-each select="$xtics//text[@audience = current()/@audience]" >
@@ -137,11 +127,13 @@
                                     <xsl:for-each select="tokenize(current-grouping-key(),' ')">
                                         <!--<xsl:text>[[[</xsl:text><xsl:value-of select="."/><xsl:text>]]]</xsl:text>-->
                                         <xsl:for-each-group select="$system_cache__dita:graph.title//stentry[contains(@audience,current())]" group-by="text()">
-                                            <current-grouping-key col="{@col}" audience="{@audience}" current-grouping-key="{@current-grouping-key}" system_cache__dita:graph.ytics_detect_row="{system_cache__dita:graph.ytics_detect_row($system_cache__dita:graph.ytics_detect_row,@col)}">
+                                            <current-grouping-key col="{@col}" audience="{@audience}" current-grouping-key="{@current-grouping-key}" system_cache__dita:graph.ytics_detect_row="{system_cache__dita:graph.ytics_detect_row($system_cache__dita:graph.ytics_detect_row,@col)}" xtics="row">
                                                 <xsl:attribute name="debug.149.cols" select="current-group()/@col"/>
                                                 <xsl:attribute name="xtics.pos__x3A__old_debug_to_off" select="$xtics//text[@col = current()/@col]/@pos"/>
                                                 <xsl:attribute name="group" select="$ytics/ytics/ytics.row/stentry[@col = current()/@col]/@group"/>
                                                 <xsl:attribute name="xtics.pos" select="system_cache__dita:graph.yaxis.pos($graph.title,$ytics,@current-grouping-key,@col)"/>
+                                                <!--X3<xsl:copy-of select="@props"/>-->
+                                                <!--X3<xsl:copy-of select="@platform"/>-->
                                                 <xsl:choose>
                                                     <!--<xsl:when test="$xtics//text[@col = current()/@col]"/>-->
                                                     
@@ -163,6 +155,15 @@
                                                     <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
                                                     <xsl:with-param name="col" select="current()/@col"/>
                                                 </xsl:call-template>
+                                                <xsl:for-each select="$xtics//text[@pos = $graph.newhistogram.position]">
+                                                    <p5gnuplot:current-grouping-key.xtics>
+                                                        <xsl:copy-of select="@platform"/>
+                                                    </p5gnuplot:current-grouping-key.xtics>
+                                                </xsl:for-each>
+                                                <xsl:call-template name="system_cache__dita:graph.col__x3A__if_not_empty">
+                                                    <xsl:with-param name="xtics.pos" select="current()/@col"/>
+                                                </xsl:call-template>
+                                                
                                                 <xsl:value-of select="@current-grouping-key"/>
                                             </current-grouping-key>
                                         </xsl:for-each-group>
@@ -175,6 +176,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" />
@@ -189,8 +216,13 @@
                 <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="$system_cache__dita:graph.separate.outputs.auto" tunnel="yes"/>
             </xsl:apply-templates>
-                
+            
+            
+            
         </xtics>
     </xsl:template>
     
@@ -214,6 +246,9 @@
         <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
         <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"/>
@@ -221,10 +256,23 @@
             <xsl:call-template name="p5gnuplot:set.key"/>
             <xsl:call-template name="p5gnuplot:set.bmargin"/>
             <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:attribute name="p5gnuplot:text.join"><xsl:text>
 </xsl:text></xsl:attribute>
-                <xsl:attribute name="p5gnuplot:text">plot</xsl:attribute>
+                <xsl:attribute name="p5gnuplot:text">plot</xsl:attribute>-->
                 <xsl:apply-templates mode="#current"/>
             </p5gnuplot:graph.newhistogram.child>
         </p5gnuplot:graph.newhistogram>
@@ -250,8 +298,11 @@
         <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
         <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=" ">
+        <p5gnuplot:plot p5gnuplot:text.join=" " debug="match graph.newhistogram">
             <xsl:variable name="current.current-grouping-key">
                 <current.current-grouping-key>
                     <xsl:for-each-group select="audience/current-grouping-key" group-by="@audience">
@@ -298,6 +349,32 @@
                 </xsl:for-each>
             </xsl:variable>
             <xsl:attribute name="test.following.current-grouping-key_x3A__different" select="$test.following.current-grouping-key_x3A__different"/>
+            
+            <xsl:choose>
+                <xsl:when test="preceding::graph.newhistogram"/>
+                <xsl:otherwise>
+                    <xsl:choose>
+                        <xsl:when test="$system_cache__dita:graph.separate.outputs.auto">
+                            <xsl:call-template name="p5gnuplot:set.logscale.y2"/>
+                            <xsl:call-template name="p5gnuplot:all_points_y2_value_undefined__x3A__detect"/>
+                            <!--<xsl:call-template name="p5gnuplot:set.graph.output">
+                                <xsl:with-param name="fileindex" select="$fileindex"/>
+                            </xsl:call-template>-->
+                            <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:choose>
+                    <p5gnuplot:plot.text >
+                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                    <xsl:attribute name="p5gnuplot:text">plot</xsl:attribute>
+                    </p5gnuplot:plot.text>
+                </xsl:otherwise>
+            </xsl:choose>
+            
+            
             <xsl:choose>
                 <!--<xsl:when test="1=1 and audience[@current-grouping-key.foreign='false'] and @pos='1'">
                     <xsl:variable name="newhistogram.text"><xsl:value-of select="@graph.newhistogram.text"/><xsl:text> </xsl:text><xsl:for-each select="following-sibling::graph.newhistogram"> oraz: <xsl:value-of select="@graph.newhistogram.text"/></xsl:for-each></xsl:variable>
@@ -315,13 +392,40 @@
                 <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:call-template name="p5gnuplot:all_points_y2_value_undefined__x3A__detect"/>-->
+                                </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"/>
@@ -335,7 +439,7 @@
         <xsl:param name="graph.color.name" required="yes" tunnel="yes"/>
         <xsl:param name="graph.color.variable" required="yes" tunnel="yes"/>
         <xsl:param name="xtics"  tunnel="yes"/>
-        <xsl:param name="graph.yaxis"  tunnel="yes"/>
+        <xsl:param name="graph.yaxis"  tunnel="yes" required="yes"/>
         <xsl:param name="p5gnuplot:font__x3A__size" required="yes" tunnel="yes"/>
         <xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" required="yes" tunnel="yes"/>
         <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes" tunnel="yes"/>
@@ -344,7 +448,10 @@
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
         <xsl:param name="xtics.data.column__x3A__offset" select="p5gnuplot:xtics.data.column__x3A__offset()" tunnel="yes" />
         <xsl:param name="simpletable.props" required="yes" tunnel="yes"/>
-        <p5gnuplot:newhistogram  p5gnuplot:text.join=" " debug="#281 matched: {name()}">
+        <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()}" audience="{@audience}" current-grouping-key.list="{@current-grouping-key.list}" >
             <!--<xsl:choose>
                 <xsl:when test="preceding::audience">-->
                     <!--<xsl:attribute name="p5gnuplot:text">"<xsl:value-of select="system_cache__dita:audience__x3A__unescape(@audience)"/>"</xsl:attribute>-->
@@ -360,7 +467,7 @@
         <xsl:param name="graph.color.name" required="yes" tunnel="yes"/>
         <xsl:param name="graph.color.variable" required="yes" tunnel="yes"/>
         <xsl:param name="xtics"  tunnel="yes"/>
-        <xsl:param name="graph.yaxis"  tunnel="yes"/>
+        <xsl:param name="graph.yaxis"  tunnel="yes" required="yes"/>
         <xsl:param name="p5gnuplot:graph.gnuplot.dat__x3A__suffix">.gnuplot.dat</xsl:param>
         <xsl:param name="xtics.data.column__x3A__offset" select="p5gnuplot:xtics.data.column__x3A__offset()" tunnel="yes" />
         <xsl:param name="p5gnuplot:font__x3A__size" required="yes" tunnel="yes"/>
@@ -368,11 +475,14 @@
         <xsl:param name="ytics" required="yes" tunnel="yes"/>
         <xsl:param name="graph.newhistogram" required="yes" tunnel="yes"/>
         <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>
             </xsl:if>-->
-            
+            <xsl:copy-of select="p5gnuplot:current-grouping-key.xtics"/>
             <p5gnuplot:file p5gnuplot:text.join=" , " p5gnuplot:text="&quot;{$fileindex}{$p5gnuplot:graph.gnuplot.dat__x3A__suffix}&quot;" debug="file is used; input @col={@col}; @xtics.pos={@xtics.pos}; @system_cache__dita:graph.ytics_detect_row={@system_cache__dita:graph.ytics_detect_row}; "/>
             
             
@@ -392,8 +502,10 @@
                     </p5gnuplot:file.row.y.color.column>
                 </xsl:when>
             </xsl:choose>
-            
-            <p5gnuplot:file.row.y  p5gnuplot:text="{number(@system_cache__dita:graph.ytics_detect_row)}" p5gnuplot:value="{@system_cache__dita:graph.ytics_detect_row}" debug="cond color columns"/><!-- $xtics.data.column__x3A__offset -->
+            <xsl:call-template name="p5gnuplot:file.row.y"/>
+            <xsl:call-template name="p5gnuplot:file.row.platform"/>
+            <xsl:call-template name="p5gnuplot:file.row.props"/>
+            <!--<p5gnuplot:file.row.y  p5gnuplot:text="{number(@system_cache__dita:graph.ytics_detect_row)}" p5gnuplot:value="{@system_cache__dita:graph.ytics_detect_row}" debug="cond color columns"/>--><!-- $xtics.data.column__x3A__offset -->
             <xsl:choose>
                 <xsl:when test="number(@graph.color.variable) &gt;0">
                     <p5gnuplot:file.row.y.color.column  p5gnuplot:text=":(column(-{system_cache__dita:graph.xtics.color.column($xtics)}))" debug="which row is used for color and unless todo graph.fill.style/text()  col={@col}">

+ 58 - 0
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__dat.xsl

@@ -0,0 +1,58 @@
+<?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"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    
+    
+    
+    <xsl:output indent="yes"/>
+    <xsl:strip-space elements="*"/>
+    
+    
+    
+    
+    <xsl:template mode="p5gnuplot:graph.newhistogram__x3A__dat" match="system_cache__dita:graph.dat.row__x3A__from__ytics.xml">
+        <xsl:apply-templates mode="p5gnuplot:graph.newhistogram__x3A__dat" select="@*"/>
+        <xsl:apply-templates mode="#current"/>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:graph.newhistogram__x3A__dat" match="ytics.row.header|p5gnuplot:dat.sthead|p5gnuplot:dat.strow.init|ytics.row|p5gnuplot:dat.sthead.ytics.row|p5gnuplot:dat.strow|p5gnuplot:ytics.path.row|p5gnuplot:dat.sthead.color.column|p5gnuplot:dat.strow.color.row">
+        <xsl:apply-templates mode="#current" select="@*"/>
+        <xsl:apply-templates mode="#current"/>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:graph.newhistogram__x3A__dat" match="text()|comment()"/>
+        
+    
+    
+    <xsl:template mode="p5gnuplot:graph.newhistogram__x3A__dat" match="*">
+        <xsl:message terminate="yes">#30 unantended name()=<xsl:value-of select="name()"/>; p5gnuplot:graph.newhistogram__x3A__dat</xsl:message>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:graph.newhistogram__x3A__dat" match="@*"/>
+    
+    
+    <xsl:template mode="p5gnuplot:graph.newhistogram__x3A__dat" match="@p5gnuplot:text">
+        <xsl:value-of select="."/>
+    </xsl:template>
+    
+    <xsl:template mode="p5gnuplot:graph.newhistogram__x3A__dat" match="@p5gnuplot:text.join">
+        <xsl:value-of select="."/>
+    </xsl:template>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+</xsl:stylesheet>

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

@@ -110,7 +110,41 @@
         </xsl:choose>
     </xsl:function>
     
+    <xsl:template name="system_cache__dita:graph.col__x3A__if_not_empty">
+        <xsl:param name="graph.data" required="yes" tunnel="yes"/>
+        <xsl:param name="ytics" required="yes" tunnel="yes"/>
+        <xsl:param name="xtics.pos" required="yes"/>
+        <xsl:param name="graph.yaxis" required="yes" tunnel="yes"/>
+        <!--<xsl:choose>
+            <xsl:when test="system_cache__dita:graph.col__x3A__if_not_empty($graph.data,$ytics,$xtics.pos)">-->
+        <system_cache__dita:graph.col__x3A__if_not_empty xtics.pos="{$xtics.pos}" system_cache__dita:graph.col__x3A__if_not_empty="{system_cache__dita:graph.col__x3A__if_not_empty($graph.data,$ytics,$xtics.pos)}">
+                    <xsl:call-template name="system_cache__dita:graph.yaxis">
+                        <xsl:with-param name="col" select="$xtics.pos"/>
+                        <xsl:with-param name="graph.yaxis" select="$graph.yaxis"/>
+                    </xsl:call-template>
+                </system_cache__dita:graph.col__x3A__if_not_empty>
+            <!--</xsl:when>
+        </xsl:choose>-->
+    </xsl:template>
     
+    <xsl:template name="p5gnuplot:all_points_y2_value_undefined__x3A__detect">
+        <p5gnuplot:all_points_y2_value_undefined__x3A__detect>
+            <xsl:choose>
+                <xsl:when test="descendant-or-self::system_cache__dita:graph.col__x3A__if_not_empty[@system_cache__dita:graph.col__x3A__if_not_empty='1' and @graph.yaxis='x1y2']"/>
+                <xsl:otherwise>
+                    <xsl:attribute name="debug">#135 forcing set y2axis to disable</xsl:attribute>
+                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                    <xsl:attribute name="p5gnuplot:text">unset logscale y2</xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+            
+            <!--<descendant>
+                <xsl:copy-of select="descendant-or-self::system_cache__dita:graph.col__x3A__if_not_empty"/>    
+            </descendant>-->
+            
+        </p5gnuplot:all_points_y2_value_undefined__x3A__detect>
+    </xsl:template>
     
     <xsl:function name="system_cache__dita:graph.col__x3A__if_not_empty">
         <xsl:param name="graph.data"/>
@@ -155,4 +189,208 @@
         </xsl:choose>
     </xsl:template>
     
+    
+    <xsl:template name="system_cache__dita:graph.title__x3A__detect">
+        <xsl:choose>
+            <xsl:when test="(strow|sthead)[ contains(@props,'graph.title')]">
+                <graph.title>
+                    <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.title')]"/>
+                </graph.title>
+            </xsl:when>
+            <xsl:otherwise><xsl:message>#292 not found requested $graph.title : <xsl:value-of select="*/name()"/></xsl:message></xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.color.name__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.color.name')]"/>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.yaxis__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.yaxis')]"/>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.fill.style__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.fill.style')]"/>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.newhistogram__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.newhistogram')]"/>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.strow__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ position() &lt; 3]"/>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.cols__x3A__detect">
+        <xsl:message>#195 OBSOLETE TODO system_cache__dita:cols__x3A__detect </xsl:message>
+        <xsl:copy-of select="count(strow[ position() = 1]/stentry)"/>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.fileindex__x3A__detect">
+        <xsl:value-of select="@id"/>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.headers__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.headers') ]"/>
+    </xsl:template>
+    
+    
+    
+    <xsl:template name="system_cache__dita:graph.color.variable__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.color.variable') ]"/>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.data__x3A__detect">
+        <xsl:copy-of select="(strow|sthead)[ contains(@props,'graph.data')]"/>
+    </xsl:template>
+    
+    <xsl:template name="p5gnuplot:logscale.y1__x3A__detect">
+        <xsl:choose>
+            <xsl:when test="contains(@props,'no.logscale.y1')"><!--<xsl:text>#set logscale y
+</xsl:text>--><xsl:message>#54-C-A p5gnuplot:logscale no.logscale</xsl:message></xsl:when>
+            <xsl:when test="contains(@props,'logscale.y1')"><xsl:text>set logscale y
+</xsl:text><xsl:message>#54-C p5gnuplot:logscale</xsl:message></xsl:when>
+            <xsl:otherwise/>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="p5gnuplot:logscale.y2__x3A__detect">
+        <xsl:choose>
+            <xsl:when test="contains(@props,'no.logscale.y2')"><!--<xsl:text>#set logscale y2
+</xsl:text>--><xsl:message>#54-C-A p5gnuplot:logscale no.logscale.y2</xsl:message></xsl:when>
+            <xsl:when test="contains(@props,'logscale.y2')"><xsl:text>set logscale y2
+</xsl:text><xsl:message>#54-C p5gnuplot:logscale.y2</xsl:message></xsl:when>
+            <xsl:otherwise/>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.unset.xtics__x3A__detect">
+        <xsl:choose>
+            <xsl:when test="contains(@props,'graph.unset.xtics')"><xsl:text>
+unset xtics</xsl:text></xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.nokey__x3A__detect">
+        <xsl:param name="graph.nokey"/>
+        <xsl:choose>
+            <xsl:when test="$graph.nokey"><xsl:value-of select="$graph.nokey"/></xsl:when>
+            <xsl:when test="contains(@props,'graph.nokey')">graph.nokey</xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    
+    
+    <xsl:template name="p5gnuplot:font__x3A__size__x3A__detect">
+        <xsl:param name="p5gnuplot:font__x3A__size" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="contains(@props,'font30')"><xsl:value-of select="30"/><xsl:message>#54-A p5gnuplot:font__x3A__size 30</xsl:message></xsl:when>
+            <xsl:when test="contains(@props,'font15')"><xsl:value-of select="15"/><xsl:message>#54-B p5gnuplot:font__x3A__size 15</xsl:message></xsl:when>
+            <xsl:otherwise><xsl:value-of select="$p5gnuplot:font__x3A__size"/></xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.ylabel__x3A__detect">
+        <xsl:param name="ylabel" />
+        <xsl:choose>
+            <xsl:when test="$ylabel"><xsl:value-of select="$ylabel"/></xsl:when>
+            <xsl:when test="contains(@props,'graph.ylabel')"><xsl:for-each select="tokenize(@props,' ')"><xsl:if test="contains(.,'graph.ylabel')"><xsl:value-of select="substring-after(.,'graph.ylabel.')"/></xsl:if></xsl:for-each></xsl:when>
+            <xsl:otherwise>"wart."</xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.y2label__x3A__detect">
+        <xsl:param name="y2label"/>
+        <xsl:choose>
+            <xsl:when test="$y2label"><xsl:value-of select="$y2label"/></xsl:when>
+            <xsl:when test="contains(@props,'graph.y2label')"><xsl:for-each select="tokenize(@props,' ')"><xsl:if test="contains(.,'graph.y2label')"><xsl:value-of select="substring-after(.,'graph.y2label.')"/></xsl:if></xsl:for-each></xsl:when>
+            <!--<xsl:otherwise>ilość.</xsl:otherwise>-->
+        </xsl:choose>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:title__x3A__detect">
+        <xsl:param name="title"/>
+        <xsl:choose>
+            <xsl:when test="$title"><xsl:value-of select="$title"/><xsl:message>#133 set grapht title param to <xsl:value-of select="$title"/></xsl:message></xsl:when>
+            <xsl:when test="preceding-sibling::title"><xsl:value-of select="preceding-sibling::title"/></xsl:when>
+            <xsl:when test="preceding-sibling::*[contains(@props,'title')]"><xsl:value-of select="preceding-sibling::*[contains(@props,'title')]"/></xsl:when>
+            <!--<xsl:otherwise>wykres</xsl:otherwise>-->
+        </xsl:choose>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.set.style.histogram__x3A__detect">
+        <xsl:param name="histogram"/>
+        <xsl:choose>
+            <xsl:when test="contains(@props,'graph.style.histogram') or string-length($histogram)&gt;0"><xsl:text>
+set style data histogram
+set style histogram cluster gap 1
+set style fill solid border -1
+unset xtics
+
+</xsl:text></xsl:when>
+            <xsl:otherwise>
+                <xsl:text>
+set xtics rotate  
+</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="system_cache__dita:graph.lingstring__x3A__break.size__x3A__detect">
+        <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="contains(@props,'graph.lingstring.break.size.25')"><xsl:value-of select="25"/></xsl:when>
+            <xsl:otherwise><xsl:value-of select="$system_cache__dita:graph.lingstring__x3A__break.size"/></xsl:otherwise>
+        </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:template name="p5gnuplot:xtics.axis.list__x3A__detect">
+        <xsl:param name="xtics" tunnel="yes" required="yes"/>
+        <p5gnuplot:xtics.axis.list__x3A__detect>
+            <xsl:for-each-group select="$xtics/xtics/text"></xsl:for-each-group>
+        </p5gnuplot:xtics.axis.list__x3A__detect>
+    </xsl:template>-->
+    
 </xsl:stylesheet>

+ 97 - 0
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__fix.xsl

@@ -0,0 +1,97 @@
+<?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"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    
+    
+    
+    <xsl:output indent="yes"/>
+    <xsl:strip-space elements="*"/>
+    
+    
+    <xsl:template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable">
+        <xsl:param name="simpletable" required="yes"/>
+        <xsl:apply-templates mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" select="$simpletable"/>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="*[not(descendant-or-self::simpletable)]">
+        <xsl:copy-of select="."/>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="SIMPLETABLE_WTITLE">
+        <xsl:apply-templates mode="#current"/><!-- just bypass -->
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="*[descendant-or-self::simpletable and not(name()='SIMPLETABLE_WTITLE')]|simpletable">
+        <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates mode="#current"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="strow|sthead" priority="8">
+        <xsl:call-template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate">
+            <xsl:with-param name="strow" select="."/>
+        </xsl:call-template>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:graph.all.data.fit.fix__x3A__numerate.simpletable" match="text()|comment()"/>
+    
+    <xsl:template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate">
+        <xsl:param name="strow" required="yes"/>
+        <xsl:for-each select="$strow">
+            <xsl:choose>
+                <xsl:when test="name()='strow' or name()='sthead'">
+                    <xsl:copy>
+                        <xsl:copy-of select="@*"/>
+                        <xsl:for-each select="*">
+                            <xsl:copy>
+                                <xsl:copy-of select="@*"/>
+                                <xsl:attribute name="col" select="position()"/>
+                                <xsl:copy-of select="text()"/>
+                            </xsl:copy>
+                        </xsl:for-each>
+                    </xsl:copy>
+                </xsl:when>
+                <xsl:when test="*/name()='strow' or */name()='sthead'">
+                    <xsl:call-template name="system_cache__dita:graph.all.data.fit.fix__x3A__numerate">
+                        <xsl:with-param name="strow" select="*"/>
+                    </xsl:call-template>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:message terminate="yes">#165 INCORRECT FORMAT OF EXPECTED $strow/n=<xsl:value-of select="name()"/> , */n=<xsl:value-of select="*/name()"/> system_cache__dita:graph.all.data.fit.fix__x3A__numerate</xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:template>
+    
+    
+    <xsl:template name="system_cache__dita:graph.title__x3A__fix">
+        <xsl:param name="graph.title" required="yes"/>
+        <graph.title>
+            <xsl:for-each select="$graph.title//strow" >
+                <xsl:copy>
+                    <xsl:copy-of select="@*"/>
+                    <xsl:attribute name="strow.pos" select="position()"/>
+                    <xsl:variable name="strow.pos" select="position()"/>
+                    <xsl:for-each select="stentry">
+                        <xsl:copy>
+                            <xsl:copy-of select="@*"/>
+                            <!--<xsl:attribute name="stentry.pow" select="position()"/>-->
+                            <!--<xsl:attribute name="count.stentry.pow.all" select="position() + $strow.pos"/>-->
+                            <xsl:copy-of select="text()"/>
+                        </xsl:copy>
+                    </xsl:for-each>
+                </xsl:copy>
+            </xsl:for-each>
+        </graph.title>
+    </xsl:template>
+    
+    
+    
+</xsl:stylesheet>

+ 102 - 1
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl

@@ -14,9 +14,23 @@
     <xsl:strip-space elements="*"/>
     
     
+    <xsl:template name="p5gnuplot:file.row.y">
+        <p5gnuplot:file.row.y  p5gnuplot:text="{number(@system_cache__dita:graph.ytics_detect_row)}"
+            p5gnuplot:value="{@system_cache__dita:graph.ytics_detect_row}" debug="cond color columns">
+        </p5gnuplot:file.row.y>
+    </xsl:template>
     
-
+    <xsl:template name="p5gnuplot:file.row.props">
+        <xsl:param name="xtics" required="yes" tunnel="yes"/>
+        <p5gnuplot:file.row.props>
+        </p5gnuplot:file.row.props>
+    </xsl:template>
     
+    <xsl:template name="p5gnuplot:file.row.platform">
+        <xsl:param name="xtics" required="yes" tunnel="yes"/>
+        <p5gnuplot:file.row.platform>
+        </p5gnuplot:file.row.platform>
+    </xsl:template>
     
 <xsl:template name="p5gnuplot:set.xtics.rotate">
 <xsl:param name="xtics" tunnel="yes"/>
@@ -111,6 +125,40 @@
 </p5gnuplot:set.bmargin>
 </xsl:template>
     
+<xsl:template name="p5gnuplot:set.logscale.y1">
+        <xsl:param name="p5gnuplot:logscale.y1" required="yes" tunnel="yes"/>
+    <p5gnuplot:set.logscale.y1>
+        <xsl:choose>
+            <xsl:when test="string-length($p5gnuplot:logscale.y1) &gt;0">
+                <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                <xsl:attribute name="p5gnuplot:text" select="$p5gnuplot:logscale.y1"/>
+                <xsl:attribute name="p5gnuplot:value" select="$p5gnuplot:logscale.y1"/>
+            </xsl:when>
+        </xsl:choose>
+    </p5gnuplot:set.logscale.y1>
+</xsl:template>
+    
+    <xsl:template name="p5gnuplot:set.logscale.y2">
+        <xsl:param name="p5gnuplot:logscale.y2" required="yes" tunnel="yes"/>
+        <p5gnuplot:set.logscale.y2>
+            <xsl:choose>
+                <xsl:when test="string-length($p5gnuplot:logscale.y2) &gt;0">
+                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                    <xsl:attribute name="p5gnuplot:text" select="$p5gnuplot:logscale.y2"/>
+                    <xsl:attribute name="p5gnuplot:value" select="$p5gnuplot:logscale.y2"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>
+</xsl:text></xsl:attribute>
+                    <xsl:attribute name="p5gnuplot:text">set logscale y2</xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+        </p5gnuplot:set.logscale.y2>
+    </xsl:template>
+    
+    
     <xsl:template name="p5gnuplot:set.yrange">
         <xsl:param name="ytics"  tunnel="yes" required="yes"/>
         <p5gnuplot:set.yrange>
@@ -144,4 +192,57 @@
     </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:all_points_y2_value_undefined__x3A__detect>
+                <xsl:copy-of select="descendant-or-self::system_cache__dita:graph.col__x3A__if_not_empty[@system_cache__dita:graph.col__x3A__if_not_empty='' and @graph.yaxis='x1y2']"/>
+            </p5gnuplot:all_points_y2_value_undefined__x3A__detect>-->
+            <xsl:call-template name="p5gnuplot:all_points_y2_value_undefined__x3A__detect"/>
+            <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>

+ 245 - 31
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.xsl

@@ -22,7 +22,7 @@
     <xsl:template name="system_cache__dita:graph.ytics">
         <xsl:param name="system_cache__dita:graph.title" required="yes"/>
         <xsl:param name="graph.color.variable" required="yes" />
-        <xsl:param name="graph.yaxis" required="yes"/>
+        <xsl:param name="graph.yaxis" required="yes" tunnel="yes"/>
         <xsl:param name="graph.data" required="yes"/>
         <!--<xsl:param name="xtics" required="yes"/>-->
         <ytics>
@@ -35,6 +35,8 @@
                                     <xsl:copy-of select="@group"/>
                                     <xsl:copy-of select="@col"/>
                                     <xsl:copy-of select="@audience"/>
+                                    <xsl:copy-of select="@props"/>
+                                    <xsl:copy-of select="@platform"/>
                                     <xsl:attribute name="xtics.pos" select="p5gnuplot:xtics.data.column__x3A__offset(position())"/>
                                     <xsl:attribute name="system_cache__dita:graph.yaxis.value" select="system_cache__dita:graph.yaxis.value($graph.yaxis,@col)"/>
                                     <xsl:attribute name="system_cache__dita:graph.data.col__x3A__value" select="$graph.data//stentry[@col=current()/@col]/text()"/>
@@ -90,12 +92,93 @@
     </xsl:template>
     
     
+    <xsl:template name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml">
+        <xsl:param name="ytics" required="yes"/>
+        <xsl:param name="ylabel" required="yes"/>
+        <xsl:param name="graph.headers" required="yes"/>
+        <xsl:param name="graph.data" required="yes"/>
+        <xsl:param name="graph.color.variable" required="yes"/>
+        <xsl:param name="graph.title" required="yes"/>
+        <xsl:param name="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size" required="yes"/>
+        <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>
+        <system_cache__dita:graph.dat.row__x3A__from__ytics.xml>
+        <xsl:variable name="graph.data.rows" select="max($graph.data//stentry/number(@col))"/>
+        <!--<xsl:comment>#22 graph.data.rows=<xsl:value-of select="$graph.data.rows"/>;</xsl:comment>-->
+        <ytics.row position="1">
+            <ytics.row.header>
+                <xsl:attribute name="p5gnuplot:text" select="$ylabel"/>
+                <xsl:attribute name="p5gnuplot:value" select="$ylabel"/>
+                <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                <xsl:for-each-group select="$ytics/ytics[1]/ytics.row/stentry" group-by="text()">
+                    
+                    <!--<xsl:sort select="stentry/number(@col)" order="ascending" data-type="number"/>-->
+                    <xsl:choose>
+                        <xsl:when test="position()=1 or 1=1">
+                            <p5gnuplot:dat.sthead  p5gnuplot:text="{system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(system_cache__dita:graph.yaxis.name($graph.title,@col)),$system_cache__dita:graph.lingstring__x3A__break.size)}" p5gnuplot:value="{system_cache__dita:graph.yaxis.name($graph.title,@col)}">
+                                <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                            </p5gnuplot:dat.sthead>
+                        </xsl:when>
+                    </xsl:choose>
+                    <xsl:if test="position() = last() and $graph.color.variable/*">
+                        <p5gnuplot:dat.sthead.color.column   p5gnuplot:value="{system_cache__dita:graph.yaxis.name($graph.title,@col)}">
+                            <xsl:attribute name="p5gnuplot:text"><xsl:text>"color"</xsl:text></xsl:attribute>
+                            <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                        </p5gnuplot:dat.sthead.color.column>
+                    </xsl:if>
+                    
+                </xsl:for-each-group>
+            </ytics.row.header>
+        </ytics.row>
+        <xsl:for-each-group select="$ytics/ytics[1]/ytics.row" group-by="@current-grouping-key">
+            <p5gnuplot:dat.strow.init>
+                <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#10;</xsl:text></xsl:attribute>
+            </p5gnuplot:dat.strow.init>
+            <ytics.row position="{position()+1}">
+            <!--<xsl:sort select="stentry/number(@col)" order="ascending" data-type="number"/>-->
+                <xsl:for-each select="stentry">
+                    
+                    <xsl:if test="not(@col)"><xsl:message terminate="no">#111 ERORR no @col attrs aviable for <xsl:value-of select="."/>; @id:<xsl:value-of select="ancestor::simpletable/@id"/>;</xsl:message></xsl:if>
+                    <xsl:if test="position() = 1">
+                        <!--<xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(current-grouping-key())"/><xsl:text>&#09;</xsl:text>-->
+                        <p5gnuplot:dat.sthead.ytics.row>
+                            <xsl:attribute name="p5gnuplot:text" select="system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(system_cache__dita:graph.xaxis($graph.headers,@col),$p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size),$system_cache__dita:graph.lingstring__x3A__break.size)"/>
+                            <xsl:attribute name="p5gnuplot:value" select="system_cache__dita:graph.xaxis($graph.headers,@col)"/>
+                            <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                        </p5gnuplot:dat.sthead.ytics.row>
+                    </xsl:if>
+                </xsl:for-each>
+            <xsl:variable name="ytics.path.row">
+                <ytics.path.row current-grouping-key="{current-grouping-key()}">
+                    <xsl:for-each select="current-group()//stentry">
+                        <xsl:copy>
+                            <xsl:copy-of select="@col"/>
+                            <xsl:copy-of select="text()"/>
+                        </xsl:copy>
+                    </xsl:for-each>
+                </ytics.path.row>
+            </xsl:variable>
+            <!--<xsl:text></xsl:text><xsl:value-of select="position()"/>-->
+            <!--<xsl:copy-of select="$ytics.path.row"></xsl:copy-of>-->
+                <xsl:call-template name="system_cache__dita:graph.dat.row__x3A__from__ytics.path.row.xml">
+                    <xsl:with-param name="graph.data" select="$graph.data"/>
+                    <xsl:with-param name="ytics.path.row" select="$ytics.path.row"/>
+                    <xsl:with-param name="current-grouping-key" select="current-grouping-key()"/>
+                    <xsl:with-param name="ytics" select="$ytics"/>
+                    <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
+                    <xsl:with-param name="ytics.row.position" select="position()"/>
+                    <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size"/>
+                </xsl:call-template>
+            </ytics.row>
+        </xsl:for-each-group>
+        <!--<xsl:text>&#10;EOL</xsl:text>-->
+        <!--<xsl:text>EOF system_cache__dita:graph.dat.row__x3A__from__ytics </xsl:text><xsl:value-of select="position()"/><xsl:text>.</xsl:text>-->
+        </system_cache__dita:graph.dat.row__x3A__from__ytics.xml>
+    </xsl:template>
     
     
     
     
-    
-    <xsl:template name="system_cache__dita:graph.dat.row__x3A__from__ytics">
+    <!--<xsl:template name="system_cache__dita:graph.dat.row__x3A__from__ytics">
         <xsl:param name="ytics" required="yes"/>
         <xsl:param name="ylabel" required="yes"/>
         <xsl:param name="graph.headers" required="yes"/>
@@ -106,20 +189,20 @@
         <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>
             <xsl:value-of select="$ylabel"/><xsl:text>&#09;</xsl:text>
         <xsl:variable name="graph.data.rows" select="max($graph.data//stentry/number(@col))"/>
-        <!--<xsl:comment>#22 graph.data.rows=<xsl:value-of select="$graph.data.rows"/>;</xsl:comment>-->
+        <!-\-<xsl:comment>#22 graph.data.rows=<xsl:value-of select="$graph.data.rows"/>;</xsl:comment>-\->
         <xsl:for-each-group select="$ytics/ytics[1]/ytics.row/stentry" group-by="text()">
-            <!--<xsl:sort select="stentry/number(@col)" order="ascending" data-type="number"/>-->
+            <!-\-<xsl:sort select="stentry/number(@col)" order="ascending" data-type="number"/>-\->
             <xsl:choose>
                 <xsl:when test="position()=1 or 1=1">
-                    <!--<xsl:text>ROW</xsl:text>-->
-                    <!--<xsl:for-each select="stentry">-->
-                    <!--<xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(system_cache__dita:graph.ytics.header($ytics,@col))"/>-->
+                    <!-\-<xsl:text>ROW</xsl:text>-\->
+                    <!-\-<xsl:for-each select="stentry">-\->
+                    <!-\-<xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(system_cache__dita:graph.ytics.header($ytics,@col))"/>-\->
                     <xsl:value-of select="system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(system_cache__dita:graph.yaxis.name($graph.title,@col)),$system_cache__dita:graph.lingstring__x3A__break.size)"/><xsl:text>&#09;</xsl:text>
-                    <!--<xsl:choose>
+                    <!-\-<xsl:choose>
                         <xsl:when test="contains(text(),'&quot;')"><xsl:value-of select="text()"/><xsl:text>&#09;</xsl:text></xsl:when>
                         <xsl:otherwise><xsl:text>"</xsl:text><xsl:value-of select="text()"/><xsl:text>"&#09;</xsl:text></xsl:otherwise>
-                    </xsl:choose>-->
-                    <!--</xsl:for-each>-->
+                    </xsl:choose>-\->
+                    <!-\-</xsl:for-each>-\->
                 </xsl:when>
             </xsl:choose>
             <xsl:if test="position() = last() and $graph.color.variable/*"><xsl:text>"color"&#09;</xsl:text></xsl:if>
@@ -127,11 +210,11 @@
         
         <xsl:for-each-group select="$ytics/ytics[1]/ytics.row" group-by="@current-grouping-key">
             <xsl:text>&#10;</xsl:text>
-            <!--<xsl:sort select="stentry/number(@col)" order="ascending" data-type="number"/>-->
+            <!-\-<xsl:sort select="stentry/number(@col)" order="ascending" data-type="number"/>-\->
             <xsl:for-each select="stentry">
                 <xsl:if test="not(@col)"><xsl:message terminate="no">#111 ERORR no @col attrs aviable for <xsl:value-of select="."/>; @id:<xsl:value-of select="ancestor::simpletable/@id"/>;</xsl:message></xsl:if>
                 <xsl:if test="position() = 1">
-                    <!--<xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(current-grouping-key())"/><xsl:text>&#09;</xsl:text>-->
+                    <!-\-<xsl:value-of select="p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(current-grouping-key())"/><xsl:text>&#09;</xsl:text>-\->
                     <xsl:value-of select="system_cache__dita:graph.lingstring__x3A__break(p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names(system_cache__dita:graph.xaxis($graph.headers,@col),$p5gnuplot:system_cache__dita__x3A__fix__x3A__axis__x3A__names.size),$system_cache__dita:graph.lingstring__x3A__break.size)"/><xsl:text>&#09;</xsl:text>
                 </xsl:if>
             </xsl:for-each>
@@ -145,8 +228,8 @@
                     </xsl:for-each>
                 </ytics.path.row>
             </xsl:variable>
-            <!--<xsl:text></xsl:text><xsl:value-of select="position()"/>-->
-            <!--<xsl:copy-of select="$ytics.path.row"></xsl:copy-of>-->
+            <!-\-<xsl:text></xsl:text><xsl:value-of select="position()"/>-\->
+            <!-\-<xsl:copy-of select="$ytics.path.row"></xsl:copy-of>-\->
             <xsl:call-template name="system_cache__dita:graph.dat.row__x3A__from__ytics.path.row">
                 <xsl:with-param name="graph.data" select="$graph.data"/>
                 <xsl:with-param name="ytics.path.row" select="$ytics.path.row"/>
@@ -157,9 +240,9 @@
                 <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size"/>
             </xsl:call-template>
         </xsl:for-each-group>
-        <!--<xsl:text>&#10;EOL</xsl:text>-->
-        <!--<xsl:text>EOF system_cache__dita:graph.dat.row__x3A__from__ytics </xsl:text><xsl:value-of select="position()"/><xsl:text>.</xsl:text>-->
-    </xsl:template>
+        <!-\-<xsl:text>&#10;EOL</xsl:text>-\->
+        <!-\-<xsl:text>EOF system_cache__dita:graph.dat.row__x3A__from__ytics </xsl:text><xsl:value-of select="position()"/><xsl:text>.</xsl:text>-\->
+    </xsl:template>-->
     
     
     <xsl:template name="system_cache__dita:graph.newhistogram">
@@ -174,7 +257,110 @@
         </newhistogram>
     </xsl:template>
     
-    <xsl:template name="system_cache__dita:graph.dat.row__x3A__from__ytics.path.row">
+    <!--<xsl:template name="system_cache__dita:graph.dat.row__x3A__from__ytics.path.row">
+        <xsl:param name="ytics.path.row" required="yes"/>
+        <xsl:param name="graph.data" required="yes"/>
+        <xsl:param name="ytics" required="yes"/>
+        <xsl:param name="current-grouping-key" required="yes"/>
+        <xsl:param name="graph.color.variable" required="yes"/>
+        <xsl:param name="ytics.row.position" required="yes"/>
+        <xsl:param name="system_cache__dita:graph.lingstring__x3A__break.size" required="yes"/>
+        <!-\-<xsl:for-each select="$ytics.path.row//stentry">
+            <!-\\-<xsl:variable name="row.pos" select="position()"/>-\\->
+            <!-\\-<xsl:variable name="row.current" select="."/>-\\->
+        </xsl:for-each>-\->
+        <!-\-<xsl:variable name="current-grouping-key" select="$ytics.path.row/parent::*/@current-grouping-key"/>-\->
+        <xsl:variable name="test_offset">
+            <test_offset>
+                <xsl:for-each-group select="$ytics/ytics[1]/ytics.row/stentry" group-by="text()">
+                    <xsl:for-each select="current-group()">
+                        <xsl:copy >
+                            <xsl:attribute name="pos" select="position()"/>
+                            <xsl:copy-of select="@col"/>
+                            <xsl:call-template name="system_cache__dita:graph.ytics.color">
+                                <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
+                                <xsl:with-param name="col" select="$ytics.row.position"/>
+                            </xsl:call-template>
+                            <!-\-<xsl:copy-of select="@graph.color.variable"/>-\->
+                            <xsl:copy-of select="text()"/>
+                        </xsl:copy>
+                    </xsl:for-each>
+                </xsl:for-each-group>
+            </test_offset>
+        </xsl:variable>
+        <xsl:variable name="test_offset">
+            <test_offset debug="matryca_all">
+                <xsl:for-each-group select="$test_offset//stentry" group-by="text()">
+                    <xsl:copy>
+                        <xsl:copy-of select="@*"/>
+                        <xsl:attribute name="row.placed" select="position()"/>
+                        <xsl:copy-of select="text()"/>
+                    </xsl:copy>
+                </xsl:for-each-group>
+            </test_offset>
+        </xsl:variable>
+        <xsl:variable name="ytics.path.row.current">
+            <ytics.path.row.current debug="sorted to fix">
+                <xsl:for-each select="$ytics.path.row//stentry">
+                    <xsl:copy>
+                        <xsl:copy-of select="@*"/>
+                        <xsl:attribute name="row.placed" select="position()"/>
+                        <xsl:copy-of select="text()"/>
+                    </xsl:copy>
+                </xsl:for-each>
+            </ytics.path.row.current>
+        </xsl:variable>
+        <!-\-<xsl:if test="$row.pos=1">-\->
+            <!-\-<xsl:copy-of select="$ytics.path.row"/>-\->
+            <!-\-<xsl:copy-of select="$test_offset"/>-\->
+            <!-\-<xsl:copy-of select="$ytics.path.row.current"/>-\->
+        <!-\-</xsl:if>-\->
+        <!-\-<MERGING cnt_src="{count($test_offset//stentry)}" cnt_dst="{count($ytics.path.row.current//stentry)}">-\->
+            <xsl:for-each select="$test_offset//stentry">
+                <xsl:variable name="test_y" select="text()"/>
+                <!-\-<xsl:if test="position() = 1"><xsl:text>&#09;</xsl:text>
+                    <xsl:text></xsl:text><xsl:value-of select="$current-grouping-key"/><xsl:text>&#09;</xsl:text>
+                </xsl:if>-\->
+                <xsl:choose>
+                    <xsl:when test="$ytics.path.row.current//stentry[ text() = $test_y][2]">
+                        <xsl:message terminate="yes">#222-234 incorrect - not unique graph.title vals - found cnt(<xsl:value-of select="count($ytics.path.row.current//stentry[ text() = $test_y])"/>) [[<xsl:value-of select="$ytics.path.row.current//stentry[ text() = $test_y]"/>]] </xsl:message>
+                    </xsl:when>
+                    <xsl:when test="$ytics.path.row.current//stentry[ text() = $test_y]/text()">
+                        <xsl:variable name="target.value.column"  select="$ytics//stentry[ text() = $test_y and @current-grouping-key = $current-grouping-key]/@col"/>
+                        <xsl:variable name="target.value.column.rev"  select="$ytics.path.row//stentry[ text() = $test_y]/@col"/>
+                        <xsl:choose>
+                            <xsl:when test="string-length($current-grouping-key)=0 and string-length($target.value.column.rev) &gt;0">
+                                <xsl:message>#222-210 not used $current-grouping-key; $target.value.column=<xsl:value-of select="$target.value.column"/>; $target.value.column.rev=<xsl:value-of select="$target.value.column.rev"/>; resolved=[<xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev ]/text()"/>]</xsl:message>
+                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev ]/text()"/><xsl:text>&#09;</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="$graph.data//stentry[@col=$target.value.column]/text()">
+                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@col=$target.value.column and @current-grouping-key=$current-grouping-key]/text()"/><xsl:text>&#09;</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="$graph.data//stentry[@col=$target.value.column.rev]/text()">
+                                <xsl:message>#222-215 (pos(<xsl:value-of select="position()"/>)) resolved $target.value.column.rev = <xsl:value-of select="$target.value.column.rev"/>; ($target.value.column = <xsl:value-of select="$target.value.column"/>; ) dla $test_y=<xsl:value-of select="$test_y"/>; - resolving target=[<xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev and @current-grouping-key=$current-grouping-key]/text()"/>] ; @current-grouping-key=[<xsl:value-of select="$current-grouping-key"/>]</xsl:message>
+                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev and @current-grouping-key=$current-grouping-key]/text()"/><xsl:text>&#09;</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="string-length($target.value.column)=0">
+                                <xsl:message terminate="no">#222-208 error resolving target.value.column for text="<xsl:value-of select="$test_y"/>" ; $target.value.column.rev=<xsl:value-of select="$target.value.column.rev"/></xsl:message>
+                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@current-grouping-key=$current-grouping-key]/text()"/><xsl:text>&#09;</xsl:text>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:message>#222-otherwise error</xsl:message>
+                            </xsl:otherwise>
+                            <!-\- TODO COLUMNS -\->
+                        </xsl:choose>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:text>0</xsl:text><xsl:text>&#09;</xsl:text>
+                    </xsl:otherwise>
+                </xsl:choose>
+                <xsl:if test="position() = last() and $graph.color.variable/*"><xsl:value-of select="@graph.color.variable"/><xsl:text>&#09;</xsl:text></xsl:if>
+            </xsl:for-each>
+        <!-\-</MERGING>-\->
+    </xsl:template>-->
+    
+    
+    <xsl:template name="system_cache__dita:graph.dat.row__x3A__from__ytics.path.row.xml">
         <xsl:param name="ytics.path.row" required="yes"/>
         <xsl:param name="graph.data" required="yes"/>
         <xsl:param name="ytics" required="yes"/>
@@ -228,16 +414,18 @@
             </ytics.path.row.current>
         </xsl:variable>
         <!--<xsl:if test="$row.pos=1">-->
-            <!--<xsl:copy-of select="$ytics.path.row"/>-->
-            <!--<xsl:copy-of select="$test_offset"/>-->
-            <!--<xsl:copy-of select="$ytics.path.row.current"/>-->
+        <!--<xsl:copy-of select="$ytics.path.row"/>-->
+        <!--<xsl:copy-of select="$test_offset"/>-->
+        <!--<xsl:copy-of select="$ytics.path.row.current"/>-->
         <!--</xsl:if>-->
         <!--<MERGING cnt_src="{count($test_offset//stentry)}" cnt_dst="{count($ytics.path.row.current//stentry)}">-->
+        <p5gnuplot:ytics.path.row>
             <xsl:for-each select="$test_offset//stentry">
+                
                 <xsl:variable name="test_y" select="text()"/>
                 <!--<xsl:if test="position() = 1"><xsl:text>&#09;</xsl:text>
-                    <xsl:text></xsl:text><xsl:value-of select="$current-grouping-key"/><xsl:text>&#09;</xsl:text>
-                </xsl:if>-->
+                        <xsl:text></xsl:text><xsl:value-of select="$current-grouping-key"/><xsl:text>&#09;</xsl:text>
+                    </xsl:if>-->
                 <xsl:choose>
                     <xsl:when test="$ytics.path.row.current//stentry[ text() = $test_y][2]">
                         <xsl:message terminate="yes">#222-234 incorrect - not unique graph.title vals - found cnt(<xsl:value-of select="count($ytics.path.row.current//stentry[ text() = $test_y])"/>) [[<xsl:value-of select="$ytics.path.row.current//stentry[ text() = $test_y]"/>]] </xsl:message>
@@ -248,18 +436,34 @@
                         <xsl:choose>
                             <xsl:when test="string-length($current-grouping-key)=0 and string-length($target.value.column.rev) &gt;0">
                                 <xsl:message>#222-210 not used $current-grouping-key; $target.value.column=<xsl:value-of select="$target.value.column"/>; $target.value.column.rev=<xsl:value-of select="$target.value.column.rev"/>; resolved=[<xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev ]/text()"/>]</xsl:message>
-                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev ]/text()"/><xsl:text>&#09;</xsl:text>
+                                <p5gnuplot:dat.strow debug="#222-210 not used $current-grouping-key">
+                                    <xsl:attribute name="p5gnuplot:text" select="$graph.data//stentry[@col=$target.value.column.rev ]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:value"  select="$graph.data//stentry[@col=$target.value.column.rev ]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                                </p5gnuplot:dat.strow>
                             </xsl:when>
                             <xsl:when test="$graph.data//stentry[@col=$target.value.column]/text()">
-                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@col=$target.value.column and @current-grouping-key=$current-grouping-key]/text()"/><xsl:text>&#09;</xsl:text>
+                                <p5gnuplot:dat.strow debug="#222-433 ">
+                                    <xsl:attribute name="p5gnuplot:text" select="$graph.data//stentry[@col=$target.value.column and @current-grouping-key=$current-grouping-key]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:value"  select="$graph.data//stentry[@col=$target.value.column and @current-grouping-key=$current-grouping-key]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                                </p5gnuplot:dat.strow>
                             </xsl:when>
                             <xsl:when test="$graph.data//stentry[@col=$target.value.column.rev]/text()">
                                 <xsl:message>#222-215 (pos(<xsl:value-of select="position()"/>)) resolved $target.value.column.rev = <xsl:value-of select="$target.value.column.rev"/>; ($target.value.column = <xsl:value-of select="$target.value.column"/>; ) dla $test_y=<xsl:value-of select="$test_y"/>; - resolving target=[<xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev and @current-grouping-key=$current-grouping-key]/text()"/>] ; @current-grouping-key=[<xsl:value-of select="$current-grouping-key"/>]</xsl:message>
-                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@col=$target.value.column.rev and @current-grouping-key=$current-grouping-key]/text()"/><xsl:text>&#09;</xsl:text>
+                                <p5gnuplot:dat.strow debug="#222-433-215 ">
+                                    <xsl:attribute name="p5gnuplot:text" select="$graph.data//stentry[@col=$target.value.column.rev and @current-grouping-key=$current-grouping-key]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:value"  select="$graph.data//stentry[@col=$target.value.column.rev and @current-grouping-key=$current-grouping-key]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                                </p5gnuplot:dat.strow>
                             </xsl:when>
                             <xsl:when test="string-length($target.value.column)=0">
                                 <xsl:message terminate="no">#222-208 error resolving target.value.column for text="<xsl:value-of select="$test_y"/>" ; $target.value.column.rev=<xsl:value-of select="$target.value.column.rev"/></xsl:message>
-                                <xsl:text></xsl:text><xsl:value-of select="$graph.data//stentry[@current-grouping-key=$current-grouping-key]/text()"/><xsl:text>&#09;</xsl:text>
+                                <p5gnuplot:dat.strow debug="#222-433-208 ">
+                                    <xsl:attribute name="p5gnuplot:text" select="$graph.data//stentry[@current-grouping-key=$current-grouping-key]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:value"  select="$graph.data//stentry[@current-grouping-key=$current-grouping-key]/text()"/>
+                                    <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                                </p5gnuplot:dat.strow>
                             </xsl:when>
                             <xsl:otherwise>
                                 <xsl:message>#222-otherwise error</xsl:message>
@@ -268,15 +472,25 @@
                         </xsl:choose>
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:text>0</xsl:text><xsl:text>&#09;</xsl:text>
+                        <p5gnuplot:dat.strow debug="#222-433-466 otherwise ">
+                            <xsl:attribute name="p5gnuplot:text" select="0"/>
+                            <xsl:attribute name="p5gnuplot:value"  select="0"/>
+                            <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                        </p5gnuplot:dat.strow>
                     </xsl:otherwise>
                 </xsl:choose>
-                <xsl:if test="position() = last() and $graph.color.variable/*"><xsl:value-of select="@graph.color.variable"/><xsl:text>&#09;</xsl:text></xsl:if>
+                <xsl:if test="position() = last() and $graph.color.variable/*">
+                    <p5gnuplot:dat.strow.color.row debug="#222-433-475">
+                        <xsl:attribute name="p5gnuplot:text" select="@graph.color.variable"/>
+                        <xsl:attribute name="p5gnuplot:value"  select="@graph.color.variable"/>
+                        <xsl:attribute name="p5gnuplot:text.join"><xsl:text>&#09;</xsl:text></xsl:attribute>
+                    </p5gnuplot:dat.strow.color.row>
+                </xsl:if>
             </xsl:for-each>
+        </p5gnuplot:ytics.path.row>
         <!--</MERGING>-->
     </xsl:template>
     
-    
     <xsl:template name="system_cache__dita:graph.gnuplot__x3A__from_ytics">
         <xsl:param name="ytics" required="yes"/>
         <xsl:param name="ylabel" required="yes"/>

+ 1 - 1
SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.yaxis.xsl

@@ -15,7 +15,7 @@
     
     
     <xsl:template name="system_cache__dita:graph.yaxis">
-        <xsl:param name="graph.yaxis" required="yes"/>
+        <xsl:param name="graph.yaxis" required="yes" />
         <xsl:param name="col" required="yes"/>
         <xsl:choose>
             <xsl:when test="$graph.yaxis//stentry[@col=$col]/text()">

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

@@ -0,0 +1,256 @@
+<?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"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    
+    
+    
+    <xsl:output indent="yes"/>
+    <xsl:strip-space elements="*"/>
+    
+    
+    
+
+    <xsl:template name="system_cache__dita:graph__x3A__variables__x3A__init">
+        <xsl:param name="system_cache__dita:graph__x3A__variables__x3A__init__x3A__call" required="yes"/>
+        <xsl:param name="p5gnuplot:font__x3A__size" select="'9'"/>
+        <xsl:param name="title"/>
+        <xsl:param name="ylabel"/>
+        <xsl:param name="y2label"/>
+        <xsl:param name="histogram"/>
+        <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"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="set.style.histogram">
+            <xsl:call-template name="system_cache__dita:graph.set.style.histogram__x3A__detect">
+                <xsl:with-param name="histogram" select="$histogram"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="title">
+            <xsl:call-template name="system_cache__dita:title__x3A__detect">
+                <xsl:with-param name="title" select="$title"/>
+            </xsl:call-template>
+        </xsl:variable>
+        
+        <xsl:variable name="ylabel">
+            <xsl:call-template name="system_cache__dita:graph.ylabel__x3A__detect">
+                <xsl:with-param name="ylabel" select="$ylabel"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="y2label">
+            <xsl:call-template name="system_cache__dita:graph.y2label__x3A__detect">
+                <xsl:with-param name="y2label" select="$y2label"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="p5gnuplot:font__x3A__size">
+            <xsl:call-template name="p5gnuplot:font__x3A__size__x3A__detect">
+                <xsl:with-param name="p5gnuplot:font__x3A__size" select="$p5gnuplot:font__x3A__size"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="graph.nokey">
+            <xsl:call-template name="system_cache__dita:graph.nokey__x3A__detect">
+                <xsl:with-param name="graph.nokey" select="$graph.nokey"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="graph.unset.xtics">
+            <xsl:call-template name="system_cache__dita:graph.unset.xtics__x3A__detect"/>
+        </xsl:variable>
+        <xsl:variable name="p5gnuplot:logscale.y1">
+            <xsl:call-template name="p5gnuplot:logscale.y1__x3A__detect"/>
+        </xsl:variable>
+        <xsl:variable name="p5gnuplot:logscale.y2">
+            <xsl:call-template name="p5gnuplot:logscale.y2__x3A__detect"/>
+        </xsl:variable>
+        <!-- do stworzenia grafu na bazie tabeli simpletable w dita -->
+        <xsl:variable name="fileindex" >
+            <xsl:call-template name="system_cache__dita:graph.fileindex__x3A__detect"/>
+        </xsl:variable>
+        <xsl:variable name="cols" >
+            <xsl:call-template name="system_cache__dita:graph.cols__x3A__detect"/>
+        </xsl:variable>
+        <xsl:variable name="graph.headers" >
+            <xsl:call-template name="system_cache__dita:graph.headers__x3A__detect"/>
+        </xsl:variable>
+        
+        <xsl:variable name="graph.color.variable" >
+            <xsl:call-template name="system_cache__dita:graph.color.variable__x3A__detect"/>
+        </xsl:variable>
+        <xsl:variable name="graph.data" >
+            <xsl:call-template name="system_cache__dita:graph.data__x3A__detect"/>
+        </xsl:variable><!-- position()=2 and -->
+        
+        <xsl:choose>
+            <xsl:when test="not($graph.data//stentry)"><xsl:message>#97 WARNING NOT EXPECTED $graph.data//stentry</xsl:message></xsl:when>
+        </xsl:choose>
+        <xsl:variable name="graph.title" >
+            <xsl:call-template name="system_cache__dita:graph.title__x3A__detect"/>
+        </xsl:variable>
+        <xsl:variable name="system_cache__dita:graph.title">
+            <xsl:call-template name="system_cache__dita:graph.title__x3A__fix">
+                <xsl:with-param name="graph.title" select="$graph.title"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="graph.color.name">
+            <xsl:call-template name="system_cache__dita:graph.color.name__x3A__detect"/>
+        </xsl:variable>
+        
+        <xsl:variable name="graph.yaxis">
+            <xsl:call-template name="system_cache__dita:graph.yaxis__x3A__detect"/>
+        </xsl:variable>
+        
+        
+        <xsl:variable name="graph.fill.style" >
+            <xsl:call-template name="system_cache__dita:graph.fill.style__x3A__detect"/>
+        </xsl:variable>
+        
+        <xsl:variable name="graph.newhistogram" >
+            <xsl:call-template name="system_cache__dita:graph.newhistogram__x3A__detect"/>
+        </xsl:variable>
+        <xsl:variable name="newhistogram">
+            <xsl:call-template name="system_cache__dita:graph.newhistogram">
+                <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="strow" >
+            <xsl:call-template name="system_cache__dita:graph.strow__x3A__detect"/>
+        </xsl:variable>
+        
+        <xsl:call-template name="system_cache__dita:graph.axis__x3A__validate">
+            <xsl:with-param name="graph.headers" select="$graph.headers"/>
+            <xsl:with-param name="graph.title" select="$graph.title"/>
+            <xsl:with-param name="graph.fill.style" select="$graph.fill.style"/>
+        </xsl:call-template>
+        
+        <!--<xsl:apply-templates mode="system_cache__dita:graph__write" select=".">
+            <xsl:with-param name="fileindex" select="$fileindex"/>
+        </xsl:apply-templates>-->
+        
+        <xsl:variable name="ytics">
+            <xsl:call-template name="system_cache__dita:graph.ytics">
+                <xsl:with-param name="system_cache__dita:graph.title" select="$system_cache__dita:graph.title"/>
+                <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>   
+                <xsl:with-param name="graph.yaxis" select="$graph.yaxis" tunnel="yes"/>
+                <xsl:with-param name="graph.data" select="$graph.data"/>
+                <!--<xsl:with-param name="xtics" select="$xtics"/>-->
+            </xsl:call-template>
+        </xsl:variable>
+        
+        <xsl:variable name="system_cache__dita:graph.ytics_detect_row">
+            <xsl:call-template name="system_cache__dita:graph.ytics_detect_row">
+                <xsl:with-param name="ytics" select="$ytics"/>
+                <!--<xsl:with-param name="xtics" select="$xtics"/>-->
+            </xsl:call-template>
+        </xsl:variable>
+        
+        <xsl:variable name="xtics">
+            <xsl:call-template name="system_cache__dita:graph.xtics">
+                <xsl:with-param name="system_cache__dita:graph.title" select="$system_cache__dita:graph.title"/>
+                <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram"/>
+                <xsl:with-param name="fileindex"  select="$fileindex"   />
+                <xsl:with-param name="graph.fill.style" select="$graph.fill.style"/>
+                <xsl:with-param name="graph.color.name" select="$graph.color.name"/>
+                <xsl:with-param name="graph.color.variable" select="$graph.color.variable" />
+                <xsl:with-param name="graph.yaxis" select="$graph.yaxis" tunnel="yes"/>
+                <xsl:with-param name="p5gnuplot:font__x3A__size" select="$p5gnuplot:font__x3A__size"/>
+                <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"/>
+                <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="graph.data" select="$graph.data" tunnel="yes"/>
+                <xsl:with-param name="graph.headers" select="$graph.headers"/>
+                <xsl:with-param name="graph.title" select="$graph.title"/>
+                <xsl:with-param name="ytics" select="$ytics" tunnel="yes"/>
+                <xsl:with-param name="system_cache__dita:graph.ytics_detect_row" select="$system_cache__dita:graph.ytics_detect_row" tunnel="yes"/>
+                <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>
+        
+        <xsl:variable name="stats">
+            <xsl:call-template name="system_cache__dita:graph.stats">
+                <xsl:with-param name="ytics" select="$ytics"/>
+            </xsl:call-template>
+        </xsl:variable>
+        
+        <xsl:variable name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml">
+            <xsl:call-template name="system_cache__dita:graph.dat.row__x3A__from__ytics.xml">
+                <xsl:with-param name="ytics" select="$ytics"/>
+                <xsl:with-param name="ylabel" select="$ylabel"/>
+                <xsl:with-param name="graph.headers" select="$graph.headers"/>
+                <xsl:with-param name="graph.data" select="$graph.data"/>
+                <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
+                <xsl:with-param name="graph.title" select="$graph.title"/>
+                <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"/>
+                <xsl:with-param name="system_cache__dita:graph.lingstring__x3A__break.size" select="$system_cache__dita:graph.lingstring__x3A__break.size"/>
+                
+            </xsl:call-template>
+        </xsl:variable>
+        
+        <xsl:choose>
+            <xsl:when test="$system_cache__dita:graph__x3A__variables__x3A__init__x3A__call='system_cache__dita:graph__write_dita_preprocess'">
+                <xsl:call-template name="system_cache__dita:graph__write_dita_preprocess">
+                    <xsl:with-param name="fileindex" select="$fileindex"/>
+                    <xsl:with-param name="system_cache__dita:graph.ytics_detect_row" select="$system_cache__dita:graph.ytics_detect_row"/>
+                    <xsl:with-param name="system_cache__dita:graph.title" select="$system_cache__dita:graph.title"/>
+                    <xsl:with-param name="set.style.histogram" select="$set.style.histogram"/>
+                    <xsl:with-param name="p5gnuplot:font__x3A__size" select="$p5gnuplot:font__x3A__size"/>
+                    <xsl:with-param name="graph.nokey" select="$graph.nokey"/>
+                    <xsl:with-param name="graph.unset.xtics" select="$graph.unset.xtics"/>
+                    <xsl:with-param name="y2label" select="$y2label"/>
+                    <xsl:with-param name="ylabel" select="$ylabel"/>
+                    <xsl:with-param name="graph.headers" select="$graph.headers"/>
+                    <xsl:with-param name="graph.data" select="$graph.data"/>
+                    <xsl:with-param name="xtics" select="$xtics"/>
+                    <xsl:with-param name="graph.fill.style" select="$graph.fill.style"/>
+                    <xsl:with-param name="newhistogram" select="$newhistogram"/>
+                    <xsl:with-param name="graph.newhistogram" select="$graph.newhistogram"/>
+                    <xsl:with-param name="graph.color.name" select="$graph.color.name"/>
+                    <xsl:with-param name="title" select="$title"/>
+                    <xsl:with-param name="ytics" select="$ytics"/>
+                    <xsl:with-param name="cols" select="$cols"/>
+                    <xsl:with-param name="p5gnuplot:logscale.y1" select="$p5gnuplot:logscale.y1"/>
+                    <xsl:with-param name="p5gnuplot:logscale.y2" select="$p5gnuplot:logscale.y2"/>
+                    <xsl:with-param name="graph.title" select="$graph.title"/>
+                    <xsl:with-param name="graph.color.variable" select="$graph.color.variable"/>
+                    <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"/>
+                    <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'">
+                <xsl:call-template name="p5gnuplot:simpletable__x3A__from_rows">
+                    <xsl:with-param name="title" select="$title"/>
+                    <xsl:with-param name="ytics" select="$ytics"/>
+                    <xsl:with-param name="xtics" select="$xtics"/>
+                    <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:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">#180 unknown init <xsl:value-of select="$system_cache__dita:graph__x3A__variables__x3A__init__x3A__call"/></xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+        
+    </xsl:template>
+
+
+    
+    
+</xsl:stylesheet>

+ 6 - 3
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita.map.title__x3A__to_merge/tree_to_dita__x3A__map.title.xsl

@@ -16,7 +16,10 @@
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:groupField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:timeField"  tunnel="yes"/>
         <xsl:param name="default_db__x3A__BI_audit_BENFORD:NameField"  tunnel="yes"/>
-        <title>raport  <xsl:text>
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:AddressField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:PeselField"  tunnel="yes" />
+        <xsl:param name="default_db__x3A__BI_audit_BENFORD:TaxIdField"  tunnel="yes" />
+        <title>Raport <xsl:text>
             
         </xsl:text>
             
@@ -29,8 +32,8 @@
               
           </xsl:text>
             <xsl:text>
-             przetwarzanie powiązań BOCIAN 
-            rev B2018-09-31.A.3 (procesy5/rip)
+             Przetwarzanie powiązań BOCIAN 
+             rev B2018-09-31.A.3 (procesy5/rip)
             </xsl:text>
             
         </title>

+ 8 - 2
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__to_merge/tree_to_dita__x3A__indexterm.xsl

@@ -36,6 +36,12 @@
         </xsl:call-template>
     </xsl:function>
     
+    
+    <xsl:function name="system_cache__dita:indexterm__x3A__fix_string">
+        <xsl:param name="indexterm.string"/>
+        <xsl:value-of select="replace(replace($indexterm.string,'„','&quot;'),'”','&quot;')"/>
+    </xsl:function>
+    
     <xsl:template name="system_cache__dita:indexterm">
         <xsl:param name="indexterm"/>
         <xsl:param name="system_cache__dita:audience"/>
@@ -50,11 +56,11 @@
             <xsl:when test="string-length($indexterm)&gt;0">
                 <xsl:choose>
                     <xsl:when test="string-length($system_cache__dita:element)=0">
-                        <indexterm><xsl:value-of select="$indexterm"/><xsl:if test="$system_cache__dita:localname"><xsl:text> </xsl:text><xsl:value-of select="normalize-space($system_cache__dita:localname)"/></xsl:if><xsl:copy-of select="$system_cache__dita:indexterm" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see-also" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see" copy-namespaces="no"/></indexterm>
+                        <indexterm><xsl:value-of select="system_cache__dita:indexterm__x3A__fix_string($indexterm)"/><xsl:if test="$system_cache__dita:localname"><xsl:text> </xsl:text><xsl:value-of select="normalize-space($system_cache__dita:localname)"/></xsl:if><xsl:copy-of select="$system_cache__dita:indexterm" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see-also" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see" copy-namespaces="no"/></indexterm>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:element name="{$system_cache__dita:element}" inherit-namespaces="no">
-                            <indexterm><xsl:value-of select="$indexterm"/><xsl:if test="$system_cache__dita:localname"><xsl:text> </xsl:text><xsl:value-of select="normalize-space($system_cache__dita:localname)"/></xsl:if><xsl:copy-of select="$system_cache__dita:indexterm" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see-also" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see" copy-namespaces="no"/></indexterm><xsl:value-of select="$text"/>
+                            <indexterm><xsl:value-of select="system_cache__dita:indexterm__x3A__fix_string($indexterm)"/><xsl:if test="$system_cache__dita:localname"><xsl:text> </xsl:text><xsl:value-of select="normalize-space($system_cache__dita:localname)"/></xsl:if><xsl:copy-of select="$system_cache__dita:indexterm" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see-also" copy-namespaces="no"/><xsl:copy-of select="$system_cache__dita:indexterm.index-see" copy-namespaces="no"/></indexterm><xsl:value-of select="$text"/>
                         </xsl:element>
                     </xsl:otherwise>
                 </xsl:choose>

+ 2 - 2
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__to_merge/tree_to_dita__x3A__parts__x3A__map.title.xsl

@@ -17,7 +17,7 @@
     <xsl:template name="system_cache__dita:parts__x3A__map.title">
         <xsl:choose>
             <xsl:when test="count(system_cache__dita:parts) &gt; 1 ">
-                <xsl:apply-templates mode="system_cache__dita:parts__x3A__map.title" select="@*"/><xsl:text> ( łącznie </xsl:text> <xsl:value-of select="count(system_cache__dita:parts)"/><xsl:text> części ) </xsl:text>
+                <xsl:apply-templates mode="system_cache__dita:parts__x3A__map.title" select="@*"/><xsl:text> (łącznie </xsl:text> <xsl:value-of select="count(system_cache__dita:parts)"/><xsl:text> części) </xsl:text>
             </xsl:when>
             <xsl:when test="system_cache__dita:parts">
                 <xsl:apply-templates mode="system_cache__dita:parts__x3A__map.title" select="@*"/>
@@ -30,7 +30,7 @@
     
     
     <xsl:template mode="system_cache__dita:parts__x3A__map.title" match="@system_cache__dita:part">
-        <xsl:text> , część nr: </xsl:text><xsl:value-of select="."/><xsl:text> 
+        <xsl:text>, część nr </xsl:text><xsl:value-of select="."/><xsl:text> 
         </xsl:text>
     </xsl:template>
     

+ 30 - 0
SE/schema/default_db_xml_cache.public/default_db/system_cache__dita__x3A__to_merge/tree_to_dita__x3A__platform.xsl

@@ -0,0 +1,30 @@
+<?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"
+    exclude-result-prefixes="xs"
+    xmlns:get_wfs="http://biuro.biall-net.pl/WPS_Functions/get_wfs/get_wfs.xsd"
+    xmlns:system_cache__dita="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:p5="https://biuro.biall-net.pl/wfs"
+    version="2.0">
+    
+    
+    <xsl:output indent="yes"/>
+    <xsl:strip-space elements="*"/>
+    
+    
+    
+    
+    
+    <xsl:function name="system_cache__dita:platform__x3A__escape">
+        <xsl:param name="text"/>
+        <xsl:value-of select="replace(replace($text,' ','_x32_'),':','_x3A_')"/>
+    </xsl:function>
+    
+    <xsl:function name="system_cache__dita:platform__x3A__unescape">
+        <xsl:param name="text"/>
+        <xsl:value-of select="replace(replace($text,'_x32_',' '),'_x3A_',':')"/>
+    </xsl:function>
+    
+    
+</xsl:stylesheet>

+ 9 - 0
SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.files.xsl

@@ -168,6 +168,15 @@
         <xsl:attribute name="keys" select="$key_to_merge"/>
     </xsl:function>
     
+    
+    
+    <xsl:function name="system_cache__dita:files.fid.title.keyref">
+        <xsl:param name="fid"/>
+        <xsl:param name="title"/>
+        <xsl:variable name="key_to_merge" select="system_cache__dita:files.key.DETECT.OTHER($fid,'','','')"/>
+        <xsl:attribute name="keyref" select="$key_to_merge"/>
+    </xsl:function>
+    
     <xsl:function name="system_cache__dita:files.context.title.keyref">
         <xsl:param name="context"/>
         <xsl:param name="title"/>

+ 28 - 0
SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.localname.translate.xsl

@@ -6,6 +6,7 @@
     xmlns:system_cache__dita="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:default_db__x3A__BI_audit_BENFORD="https://biuro.biall-net.pl/wfs/default_db/BI_audit_BENFORD"
     version="2.0">
     
     
@@ -107,4 +108,31 @@
         </xsl:choose>
     </xsl:function>
     
+    
+    
+    
+    <xsl:template mode="system_cache__dita:localname.translate" match="@default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter|@platform[contains(system_cache__dita:platform__x3A__unescape(.),'default_db__x3A__BI_audit_BENFORD:leadingTimeYear-quarter')]|@platform[contains(.,'default_db__x3A__BI_audit_BENFORD_x3A_leadingTimeYear-quarter')]" >
+        <xsl:text>rok|kwartał</xsl:text>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:localname.translate" match="@default_db__x3A__BI_audit_BENFORD:leadingNumber|@platform[contains(system_cache__dita:platform__x3A__unescape(.),'default_db__x3A__BI_audit_BENFORD:leadingNumber')]|@platform[contains(.,'default_db__x3A__BI_audit_BENFORD_x3A_leadingNumber')]" >
+        <xsl:text>liczba Benford</xsl:text>
+    </xsl:template>
+    
+    
+    <xsl:template mode="system_cache__dita:localname.translate" match="@props[contains(.,'sum')]" >
+        <xsl:text>suma</xsl:text>
+    </xsl:template>
+    
+    <xsl:template mode="system_cache__dita:localname.translate" match="@props[contains(.,'count')]" >
+        <xsl:text>ilość</xsl:text>
+    </xsl:template>
+    
+    
+    
+    
+    <xsl:template mode="system_cache__dita:localname.translate" match="@*"/>
+    
+    
+    
 </xsl:stylesheet>

+ 2 - 0
SE/schema/default_db_xml_cache.public/default_db/tree_to_dita__x3A__to_merge.xsl

@@ -23,6 +23,8 @@
     <xsl:include href="system_cache__dita.map.title__x3A__to_merge/tree_to_dita__x3A__map.title.xsl"/>
     <xsl:include href="system_cache__dita__x3A__to_merge/tree_to_dita__x3A__parts.xsl"/>
     <xsl:include href="system_cache__dita__x3A__to_merge/tree_to_dita__x3A__audience.xsl"/>
+    <xsl:include href="system_cache__dita__x3A__to_merge/tree_to_dita__x3A__platform.xsl"/>
+    
     <xsl:include href="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.stats_all.xsl"/>
     <xsl:include href="system_cache__dita__x3A__to_merge/tree_to_dita__x3A__indexterm.xsl"/>
     <xsl:include href="system_cache__dita__x3A__to_merge/tree_to_dita__x3A__transform_by_values_map.xsl"/>

+ 30 - 13
SE/se-lib/Route/UrlAction/BiAuditGenerate.php

@@ -2825,7 +2825,7 @@ SQL;
 		foreach ($tables as $table => $tableConf) {
 			DB::getPDO()->query("update `{$table}` set `{$tableConf['fieldsTeryt']['nrDomu']}` = null where trim(`{$tableConf['fieldsTeryt']['nrDomu']}`) = ''");
 			DB::getPDO()->query("update `{$table}` set `{$tableConf['fieldsTeryt']['nrLokalu']}` = null where trim(`{$tableConf['fieldsTeryt']['nrLokalu']}`) = ''");
-			$where = ($full && ($forceAll || (!$tableConf['base']))) ? "" : "where `TERYT_SYM` is null and `cached` = 0";
+			$where = ($full && ($forceAll || (!$tableConf['base']))) ? "" : "where `cached` = 0";
 			$query = "select * from `{$table}` {$where}";
 			$refTable = BiAuditRefTables::getRefTable($table, 'TERYT_adresy', true);
 
@@ -2846,7 +2846,7 @@ SQL;
 			while ($adres = $adresy->fetch()) {
 				DB::getPDO()->query("delete from `{$refTable}` where `PRIMARY_KEY` = '{$adres['ID']}'");
 
-				if (!($forceAll and $adres['TERYT_SYM'])) {
+				if ($full || (!$adres['TERYT_SYM'])) {
 					$search = [];
 					foreach ($tableConf['fields'] as $field => $param) if (!empty($adres[$param])) $search[$field] = $adres[$param];
 					try {
@@ -3084,7 +3084,7 @@ SQL;
 					if ($refTable = BiAuditRefTables::getRefTable($refTableFrom, $refTableTo, false)) {
 						$queries[] = "delete from `{$refTable}` where `TRANSACTION_ID` = '-1'";
 						$queries[] = "optimize table `{$refTable}`";
-						$queries[] = "insert into `{$refTable}` (`PRIMARY_KEY`, `REMOTE_PRIMARY_KEY`, `TRANSACTION_ID`, `A_STATUS`) select `all1`.`REMOTE_ID`, `all2`.`REMOTE_ID`, '-1', 'NORMAL' from `BI_audit_ALL` as `all1` join `BI_audit_ALL_ref` as `ref` on `all1`.`ID` = `ref`.`ID1` join `BI_audit_ALL` as `all2` on `ref`.`ID2` = `all2`.`ID` left join `${refTable}` as `ref2` on `all1`.`REMOTE_ID` = `ref2`.`PRIMARY_KEY` and `all2`.`REMOTE_ID` = `ref2`.`REMOTE_PRIMARY_KEY` where `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref2`.`PRIMARY_KEY` is null";
+						$queries[] = "insert into `{$refTable}` (`PRIMARY_KEY`, `REMOTE_PRIMARY_KEY`, `REMOTE_TYPENAME`, `TRANSACTION_ID`, `A_STATUS`) select `all1`.`REMOTE_ID`, `all2`.`REMOTE_ID`, `ref`.`PARAMS`, '-1', 'NORMAL' from `BI_audit_ALL` as `all1` join `BI_audit_ALL_ref` as `ref` on `all1`.`ID` = `ref`.`ID1` join `BI_audit_ALL` as `all2` on `ref`.`ID2` = `all2`.`ID` left join `${refTable}` as `ref2` on `all1`.`REMOTE_ID` = `ref2`.`PRIMARY_KEY` and `all2`.`REMOTE_ID` = `ref2`.`REMOTE_PRIMARY_KEY` where `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref2`.`PRIMARY_KEY` is null";
 					}
 				}
 			}
@@ -3121,12 +3121,12 @@ SQL;
 			if ($onlyBase && (!$tableConf['base'])) continue;
 			foreach ($refTableConf['refTablesTo'] as $refTableTo) {
 				$refTable = BiAuditRefTables::getRefTable($refTableFrom, $refTableTo, true);
-				$queries[] = "insert into `BI_audit_ALL_ref` (`ID1`, `ID2`, `RELATION_ID`, `BASE`) select `all1`.`ID`, `all2`.`ID`, `rel`.`ID`, {$refTableConf['base']} from `BI_audit_ALL` as `all1` join `{$refTable}` as `ref` on `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL` as `all2` on `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref`.`REMOTE_PRIMARY_KEY` = `all2`.`REMOTE_ID` join `BI_audit_ALL_ref_RELATIONS` `rel` on `all1`.`REMOTE_TABLE` = `rel`.`RELATION`";
+				$queries[] = "insert into `BI_audit_ALL_ref` (`ID1`, `ID2`, `PARAMS`, `RELATION_ID`, `BASE`) select `all1`.`ID`, `all2`.`ID`, `ref`.`REMOTE_TYPENAME`, `rel`.`ID`, {$refTableConf['base']} from `BI_audit_ALL` as `all1` join `{$refTable}` as `ref` on `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL` as `all2` on `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref`.`REMOTE_PRIMARY_KEY` = `all2`.`REMOTE_ID` join `BI_audit_ALL_ref_RELATIONS` `rel` on `all1`.`REMOTE_TABLE` = `rel`.`RELATION`";
 				if (!in_array($refTableFrom, $sourceTables)) {
-					$queries[] = "insert into `BI_audit_ALL_ref` (`ID1`, `ID2`, `RELATION_ID`, `BASE`) select `all2`.`ID`, `all1`.`ID`, `rel`.`ID`, {$refTableConf['base']} from `BI_audit_ALL` as `all1` join `{$refTable}` as `ref` on `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL` as `all2` on `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref`.`REMOTE_PRIMARY_KEY` = `all2`.`REMOTE_ID` join `BI_audit_ALL_ref_RELATIONS` `rel` on `all2`.`REMOTE_TABLE` = `rel`.`RELATION`";
+					$queries[] = "insert into `BI_audit_ALL_ref` (`ID1`, `ID2`, `PARAMS`, `RELATION_ID`, `BASE`) select `all2`.`ID`, `all1`.`ID`, `ref`.`REMOTE_TYPENAME`, `rel`.`ID`, {$refTableConf['base']} from `BI_audit_ALL` as `all1` join `{$refTable}` as `ref` on `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL` as `all2` on `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref`.`REMOTE_PRIMARY_KEY` = `all2`.`REMOTE_ID` join `BI_audit_ALL_ref_RELATIONS` `rel` on `all2`.`REMOTE_TABLE` = `rel`.`RELATION`";
 				}
 				if ($backRefTable = BiAuditRefTables::getRefTable($refTableTo, $refTableFrom, false)) {
-					$queries[] = "insert into `{$backRefTable}` (`PRIMARY_KEY`, `REMOTE_PRIMARY_KEY`, `TRANSACTION_ID`, `A_STATUS`) select `REMOTE_PRIMARY_KEY`, `PRIMARY_KEY`, '-1', 'NORMAL' from `{$refTable}` where `A_STATUS` = 'WAITING'";
+					$queries[] = "insert into `{$backRefTable}` (`PRIMARY_KEY`, `REMOTE_PRIMARY_KEY`, `REMOTE_TYPENAME`, `TRANSACTION_ID`, `A_STATUS`) select `REMOTE_PRIMARY_KEY`, `PRIMARY_KEY`, `REMOTE_TYPENAME`, '-1', 'NORMAL' from `{$refTable}` where `A_STATUS` = 'WAITING'";
 				}
 				$queries[] = "update `BI_audit_ALL` as `all1` join `{$refTable}` as `ref` on `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL` as `all2` on `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref`.`REMOTE_PRIMARY_KEY` = `all2`.`REMOTE_ID` set `ref`.`A_STATUS` = 'NORMAL'";
 			}
@@ -3651,12 +3651,12 @@ class BiAuditPowiazania {
 			$result = $resultSrc;
 			$this->endNodes = array_map('reset', $resultDest);
 			$this->reverseSearch = false;
-			$this->query = "select ref.ID2 as ID, RELATION_ID from BI_audit_ALL_ref ref where ref.ID1";
+			$this->query = "select ref.ID2 as ID, ref.RELATION_ID, ref.PARAMS from BI_audit_ALL_ref ref where ref.ID1";
 		} else {
 			$result = $resultDest;
 			$this->endNodes = array_map('reset', $resultSrc);
 			$this->reverseSearch = true;
-			$this->query = "select ref.ID1 as ID, RELATION_ID from BI_audit_ALL_ref ref where ref.ID2";
+			$this->query = "select ref.ID1 as ID, ref.RELATION_ID, ref.PARAMS from BI_audit_ALL_ref ref where ref.ID2";
 			self::saveToLog("Docelowych obiektów jest mniej, niż początkowych - włączono mechanizm odwrotnego przeszukiwania");
 		}
 
@@ -3737,7 +3737,7 @@ class BiAuditPowiazania {
 		return 10;
 	}
 
-	public function findPowiazania($ID, $weight = 0, $progress = 0, $steps = 1, $relation = "") {
+	public function findPowiazania($ID, $weight = 0, $progress = 0, $steps = 1, $relation = "", $relationDateRange = "") {
 		$this->step++;
 
 		if ($this->maxDepth > $this->minDepth) {
@@ -3768,7 +3768,7 @@ class BiAuditPowiazania {
 
 		if (isset($this->path[$ID])) return false;
 
-		$this->path[$ID] = $relation;
+		$this->path[$ID] = [$relation, $relationDateRange];
 		if (!$relation) $relation = 0;
 
 		if (in_array($ID, $this->endNodes)) {
@@ -3796,7 +3796,7 @@ class BiAuditPowiazania {
 		$count = count($nodes);
 		$weight += self::weightCalc($count);
 		if ($weight <= $this->maxDepth) {
-			foreach ($nodes as $i => $node) $this->findPowiazania($node['ID'], $weight, ($progress + ($i / ($count * $steps))), ($count * $steps), $node['RELATION_ID']);
+			foreach ($nodes as $i => $node) $this->findPowiazania($node['ID'], $weight, ($progress + ($i / ($count * $steps))), ($count * $steps), $node['RELATION_ID'], $node['PARAMS']);
 		}
 
 		array_pop($this->path);
@@ -3956,6 +3956,10 @@ class BiAuditPowiazania {
 		foreach ($results as $key => $result) {
 			if ($this->fidRow) $item_results = ['@attributes' => ['fid' => "{$xmlRow}.{$this->fidRow[$key]['fid']}"]];
 			foreach ($result as $ID => $rel) {
+				if (is_array($rel)) {
+					$relDateRange = $rel[1];
+					$rel =$rel[0];
+				} else $relDateRange = '';
 				$query = "select REMOTE_TABLE, REMOTE_ID from BI_audit_ALL where ID = '{$ID}'";
 				$row = DB::getPDO()->fetchFirst($query);
 				$query = "select * from `{$row['REMOTE_TABLE']}` where ID = '{$row['REMOTE_ID']}'";
@@ -3995,7 +3999,16 @@ class BiAuditPowiazania {
 					}
 				}
 
-				if ($rel) $item_result['relation_from'] = $this->relationName($rel);
+				if ($rel) {
+					$item_result['relation_from'] = $this->relationName($rel);
+					if ($relDateRange) $item_result['relation_dateRange'] = $relDateRange;
+					// TODO
+//					<relation_dateRangeElements>
+//						<relation_dateRange from="2010-01-01" to="2011-01-01"/>
+//						<relation_dateRange from="2012-01-01" to="2013-01-01"/>
+//						<relation_dateRange from="2014-01-01" [?to=""?]/>
+//					</relation_dateRangeElements>
+				}
 				$item_results[$xmlObject][] = $item_result;
 
 				if ($row['REMOTE_TABLE'] == "BI_audit_ENERGA_RUM_KONTRAHENCI" && (!in_array($row['REMOTE_ID'], $kontrahenci))) {
@@ -4076,9 +4089,13 @@ class BiAuditPowiazania {
 			$fidObj = [];
 			DB::getPDO()->insert($refPowiazaniaToPowiazaniaRow, ['PRIMARY_KEY' => $this->ID, 'REMOTE_PRIMARY_KEY' => $IdPowiazaniaRow]);
 			foreach ($result as $ID => $rel) {
+				if (is_array($rel)) {
+					$relDateRange = $rel[1];
+					$rel = $rel[0];
+				} else $relDateRange = '';
 				$query = "select REMOTE_TABLE, REMOTE_ID from BI_audit_ALL where ID = '{$ID}'";
 				$object = DB::getPDO()->fetchFirst($query);
-				$idPowiazaniaRowObject = DB::getPDO()->insert('BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object', ['relation_from' => $this->relationName($rel)]);
+				$idPowiazaniaRowObject = DB::getPDO()->insert('BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object', ['relation_from' => $this->relationName($rel), 'dateRange' => $dateRange]);
 				DB::getPDO()->insert($refPowiazaniaRowToPowiazaniaRowObject, ['PRIMARY_KEY' => $IdPowiazaniaRow, 'REMOTE_PRIMARY_KEY' => $idPowiazaniaRowObject]);
 				$ref = BiAuditRefTables::getRefTable('BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object', $object['REMOTE_TABLE'], true);
 				DB::getPDO()->insert($ref, ['PRIMARY_KEY' => $idPowiazaniaRowObject, 'REMOTE_PRIMARY_KEY' => $object['REMOTE_ID']]);

+ 99 - 3
se.oxygen.xpr

@@ -11,14 +11,29 @@
                     </entry>
                     <entry>
                         <String>keys.context</String>
-                        <String>file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-136_000006/relations-136_000006.ditamap</String>
+                        <String>file:/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/relations-136_000006_/relations-136_000006_.ditamap</String>
                     </entry>
                     <entry>
                         <String>scenario.associations</String>
                         <scenarioAssociation-array>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>../../procesy5-dita-templates-druki/6872-bocian-energa-oferta-system-req.git/raport.powiazan/bocian_raport_powi_za.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>
+                                        <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-164_000001/relations-164_000001.ditamap</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -48,7 +63,37 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/BI_audit_BENFORD_24/BI_audit_BENFORD_24.ditamap</String>
+                                    <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>
+                                </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>../../procesy5-dita-templates-druki/6872-bocian-energa-oferta-system-req.git/raport.powiazan/bocian_raport_powi_za.ditamap</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -76,6 +121,21 @@
                                     </list>
                                 </field>
                             </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/default_db/CRM_PROCES_tree/BI_audit_BENFORD_24/BI_audit_BENFORD_24.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-array>
                     </entry>
                     <entry>
@@ -145,6 +205,36 @@
                                 </field>
                                 <field name="ditaParams">
                                     <list>
+                                        <ditaParameter>
+                                            <field name="name">
+                                                <String>fix.external.refs.com.oxygenxml</String>
+                                            </field>
+                                            <field name="description">
+                                                <null/>
+                                            </field>
+                                            <field name="value">
+                                                <String>true</String>
+                                            </field>
+                                            <field name="defaultValue">
+                                                <String>false</String>
+                                            </field>
+                                            <field name="type">
+                                                <Integer>4</Integer>
+                                            </field>
+                                            <field name="possibleValues">
+                                                <String-array>
+                                                    <String>true</String>
+                                                    <String>false</String>
+                                                    <null/>
+                                                </String-array>
+                                            </field>
+                                            <field name="possibleValuesDescriptions">
+                                                <String-array>
+                                                    <String></String>
+                                                    <String></String>
+                                                </String-array>
+                                            </field>
+                                        </ditaParameter>
                                         <ditaParameter>
                                             <field name="name">
                                                 <String>xep.failOnError</String>
@@ -570,15 +660,21 @@
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/com.sophos.tocjs/xsl/frameset.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/get_wfs_recurse_xsl.xsl"/>
             <file name="SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows__x3A__analyze.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.header.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__dat.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__detect.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__fix.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__plot.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__xtics__x3A__set.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.color.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.xaxis.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat.row__x3A__from__ytics.yaxis.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplotdat__x3A__init.xsl"/>
             <file name="SE/schema/WPS_Functions/graph_tree_TODO_PROJ6806/graph_tree_yed.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess_template.xsl"/>