a.binder 8 年之前
父节点
当前提交
d35b7f4fa3

+ 3 - 4
SE/schema/default_db_xml_cache.public/build_ant_universal_by_xsl_match.xsl

@@ -29,11 +29,11 @@
     <xsl:param name="parallel" select="false()"/> <!-- if true will run in parallel using java parallel -->
     <xsl:param name="threadCount" select="10"/>
     <xsl:param name="ant-launcher.jar" required="yes"/>
-    <!--<xsl:param name="external_schema_table.path" required="yes"/>-->
-    
-    
     <xsl:param name="debug_level_param"/>
 
+<!--<xsl:param name="external_schema_table.path" required="yes"/>-->        
+    
+
     <xsl:template mode="build_element_complexType.xml build_tr_map.xml" match="system_cache__appinfo:element_complexType"> <!-- for type generate in main build.xml mode -->
                 <project basedir="{$basedir}" name="{$antfile_prefix}" default="{$antfile_prefix}"
                     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd">
@@ -92,7 +92,6 @@
             </param>
             <param name="debug_level_param" expression="{$debug_level_param}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-
         </xslt>
             <delete>
                 <xsl:attribute name="file" select="concat('${',with-param/@select,with-param/@name,'}')"/>

+ 5 - 4
SE/schema/default_db_xml_cache.public/build_object_install_se_ant_object.xsl

@@ -35,7 +35,6 @@
    
     <xsl:template match="system_cache__appinfo:get_all_xsd_external_schema" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external"/>
         
-   
     <xsl:template match="system_cache__appinfo:get_all_xsd[ schema/( 
         @targetNamespace='http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/graph_relation_elements.xsd' or
         @targetNamespace='http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd' or
@@ -65,14 +64,16 @@
             <xsl:attribute name="found" select="$system_cache__appinfo:vrtfNamespaces//node()[local-name()='ns'][@uri=$targetNamespace][1]/@prefix" />
             <!-\-<xsl:copy-of select="$vrtfNamespaces"/>-\->
         </prefix>-->
-        <xsl:variable name="current.schema" select="."/><xsl:variable name="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external">
+        <xsl:variable name="current.schema" select="."/>
+        <xsl:variable name="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external">
             <xsl:apply-templates mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external">
                 <xsl:with-param name="prefix" select="$prefix"/>
                 <xsl:with-param name="targetNamespace" select="@targetNamespace"/>
                 <xsl:with-param name="prefix_root" select="$prefix"/>
                 <xsl:with-param name="targetNamespace_root" select="@targetNamespace"/>
-                <xsl:with-param name="system_cache__appinfo:document-uri-orig"></xsl:with-param>
-            <xsl:with-param name="current.schema" select="$current.schema"/></xsl:apply-templates>
+                <xsl:with-param name="system_cache__appinfo:document-uri-orig"/>
+            <xsl:with-param name="current.schema" select="$current.schema"/>
+            </xsl:apply-templates>
         </xsl:variable>
         
         

+ 87 - 2
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

@@ -292,8 +292,31 @@
                 
                 
                 
+<!-- ! Wyłączone tymczasowo 2017-10-19 <topichead navtitle="Powiązania do kontrahentów z którymi zawarto umowy (podział na źródła)(z wariantu porównawczego)">
+                    <xsl:for-each select="$sources/sources/source">
+                        <xsl:variable name="source" select="."/>
+                        <topichead navtitle="żródło: {.} - Powiązania do kontrahentów z którymi zawarto umowy">
+                            <xsl:for-each-group select="$resulset/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI and  object[position() = 1]/*/source= $source]" group-by="object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI/concat(ID,Pelna_nazwa_kontrahenta)">
+                                <xsl:variable name="group_name" select="object[position() = last() ]/* [ position() = 1]/system_cache__appinfo:truncate_special_and_do_uppercase(concat(ID,Pelna_nazwa_kontrahenta,position()))"/>
+                                
+                                <!-\-<topichead navtitle="{object[position() = last()]/*/concat(Pelna_nazwa_kontrahenta,' ',Miejscowosc,' ',NIP)} powiązań ({ count( current-group())}) ">-\->
+                                <xsl:variable name="BI_audit_ENERGA_RUM_KONTRAHENCI.ID" select=" object[ position() = last()]/ BI_audit_ENERGA_RUM_KONTRAHENCI/ID"/>
+                                <xsl:choose>
+                                    <xsl:when test="//BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_old/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/object[ position() = last()]/BI_audit_ENERGA_RUM_KONTRAHENCI/ID=$BI_audit_ENERGA_RUM_KONTRAHENCI.ID">
+                                        <xsl:apply-templates mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_do" select="current-group()[position() = 1]">
+                                            <xsl:with-param name="group_name" select="$group_name"/>
+                                            <xsl:with-param name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" select="$BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA"/>
+                                        </xsl:apply-templates> 
+                                    </xsl:when>
+                                </xsl:choose>
+                                <!-\-</topichead>-\->
+                            </xsl:for-each-group>
+                        </topichead>
+                    </xsl:for-each>
+                </topichead>-->                
+                                
                 
-                <!--@107-11-14 to be fixed? <topichead navtitle="Powiązania do kontrahentów z którymi zawarto umowy">
+<!--@107-11-14 to be fixed? <topichead navtitle="Powiązania do kontrahentów z którymi zawarto umowy">
                     
                     <xsl:for-each-group select="$interested_row/interested_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI ]" group-by="object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI/concat(ID,Pelna_nazwa_kontrahenta)">
                                 <xsl:variable name="group_name" select="object[position() = last() ]/* [ position() = 1]/system_cache__appinfo:truncate_special_and_do_uppercase(concat(ID,Pelna_nazwa_kontrahenta,position()))"/>
@@ -448,7 +471,7 @@
                 
                 
                                 
-                                <xsl:choose>
+<xsl:choose>
                                     <xsl:when test="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_old">
                         <topichead navtitle="Powiązania dla wariantu porównawczego raportów (dostępne, nie użyte)"/>
                     </xsl:when>
@@ -456,6 +479,68 @@
                                 </xsl:choose>
                                 
                             
+<!--<topichead navtitle="Powiązania do wybranych podmiotów/kontrahentów (dla wariantu porównawczego)">
+                    <xsl:for-each select="$sources/sources/source">
+                        <xsl:variable name="source" select="."/>
+                        <topichead navtitle="żródło: {.} -(podział na spółki własne)  Powiązania wybranych podmiotów/kontrahentów">
+                            
+                            <xsl:for-each-group select="$resulset/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_UMOWY" group-by="Spolka_glowna">
+                                <xsl:variable name="spolka_glowna" select="Spolka_glowna[1]"/>
+                                
+                                
+                                <xsl:variable name="if_topic">
+                                    <xsl:message>#268 if topic for <xsl:value-of select="$spolka_glowna"/>;</xsl:message>
+                                    <xsl:for-each-group select="$interested_row/interested_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI and  object[position() = 1]/*/source= $source]" group-by="object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI/concat(ID,Pelna_nazwa_kontrahenta)">
+                                        <xsl:variable name="group_name" select="object[position() = last() ]/* [ position() = 1]/system_cache__appinfo:truncate_special_and_do_uppercase(concat(ID,Pelna_nazwa_kontrahenta,position()))"/>
+                                        <xsl:variable name="kontrahent_id" select="object[position() = last() ]/BI_audit_ENERGA_RUM_KONTRAHENCI/ID"/>
+                                        <xsl:variable name="current_group" select="current-group()"/>
+                                        <!-\-<xsl:variable name="zrodlo" select="."/>-\->
+                                        <xsl:message>#346 kontr podzial go <xsl:value-of select="position()"/> / id: <xsl:value-of select="$kontrahent_id"/> / <xsl:value-of select="$spolka_glowna"/></xsl:message>
+                                        <xsl:variable name="BI_audit_ENERGA_RUM_KONTRAHENCI.ID" select=" object[ position() = last()]/ BI_audit_ENERGA_RUM_KONTRAHENCI/ID"/>
+                                        <!-\-<topichead navtitle="{object[position() = last()]/*/concat(Pelna_nazwa_kontrahenta,' ',Miejscowosc,' ',NIP)} powiązań ({ count( current-group())}) ">-\->
+                                        
+                                        <xsl:for-each select="$resulset/BI_audit_ENERGA_RUM_KONTRAHENCI[ID=$kontrahent_id and BI_audit_ENERGA_RUM_UMOWY/Spolka_glowna=$spolka_glowna]">
+                                            <xsl:if test="$interested_row/interested_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/object[ position() = last()]/BI_audit_ENERGA_RUM_KONTRAHENCI[ID = $kontrahent_id]">
+                                                <topicref href="{$group_name}_DO/1.dita"/>
+                                            </xsl:if>
+                                            
+                                        </xsl:for-each>
+                                    </xsl:for-each-group>
+                                </xsl:variable>
+                                
+                                <xsl:choose>
+                                    <xsl:when test="$if_topic/*">
+                                        <topichead navtitle="żródło: {$source} spółka gł:{$spolka_glowna} ">
+                                            <xsl:message>#267 podzial spolka glowna: <xsl:value-of select="$spolka_glowna"/></xsl:message>
+                                            <xsl:for-each-group select="$interested_row/interested_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row[object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI and  object[position() = 1]/*/source= $source]" group-by="object[position() =  last()]/BI_audit_ENERGA_RUM_KONTRAHENCI/concat(ID,Pelna_nazwa_kontrahenta)">
+                                                <xsl:variable name="group_name" select="object[position() = last() ]/* [ position() = 1]/system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.BI_audit_ENERGA_RUM_KONTRAHENCI.key(ID)"/>
+                                                <xsl:variable name="kontrahent_id" select="object[position() = last() ]/* [ position() = 1]/ID"/>
+                                                <xsl:variable name="current_group" select="current-group()"/>
+                                                <!-\-<xsl:variable name="zrodlo" select="."/>-\->
+                                                
+                                                <xsl:variable name="BI_audit_ENERGA_RUM_KONTRAHENCI.ID" select=" object[ position() = last()]/ BI_audit_ENERGA_RUM_KONTRAHENCI/ID"/>
+                                                <!-\-<topichead navtitle="{object[position() = last()]/*/concat(Pelna_nazwa_kontrahenta,' ',Miejscowosc,' ',NIP)} powiązań ({ count( current-group())}) ">-\->
+                                                
+
+                                                <xsl:for-each select="$resulset/BI_audit_ENERGA_RUM_KONTRAHENCI[ID=$kontrahent_id and BI_audit_ENERGA_RUM_UMOWY/Spolka_glowna=$spolka_glowna]">
+                                                    <xsl:message> #270 $kontrahent =<xsl:value-of select="$group_name"/></xsl:message>
+                                                    <xsl:if test="$interested_row/interested_row/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row/object[ position() = last()]/BI_audit_ENERGA_RUM_KONTRAHENCI[ID = $kontrahent_id]">
+                                                        <topicref href="{$group_name}/{$group_name}.dita"/>
+                                                    </xsl:if>
+                                                </xsl:for-each>
+                                                
+                                                <!-\-</topichead>-\->
+                                            </xsl:for-each-group>
+
+                                        </topichead>
+                                    </xsl:when>
+                                </xsl:choose>
+                                
+                            </xsl:for-each-group>
+
+                        </topichead>
+                    </xsl:for-each>
+                </topichead>-->                
                 
                 <topichead navtitle="Powiązania do kontrahentów z KRS ogólnie (podział na źródła)">
                     

+ 52 - 22
SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.xsl

@@ -136,10 +136,8 @@
     <xsl:include href="BI_audit_ENERGA_RUM_KONTRAHENCI_and_BI_audit_ENERGA_RUM_UMOWY_errors/BI_audit_ENERGA_RUM_KONTRAHENCI_and_BI_audit_ENERGA_RUM_UMOWY_errors_tree_to_dita.xsl"/>
     <xsl:include href="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.xsl"/>
     <xsl:include href="EXAMPLE/EXAMPLE_tree_to_dita.xsl"/>
-    
-    
-    
     <xsl:include href="Benford.xsl"/>
+        
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
     
@@ -147,7 +145,9 @@
     <xsl:param name="uuid" required="yes"/>
     
     <xsl:param name="system_cache__dita:pdf_a4_string_width" select="80"/> <!-- parameter for automate table width - how many letters fits in pdf output -->
-    <xsl:param name="system_cache__dita:simpletable.col.size" select="4"/><xsl:variable name="ditadir" select="concat($temp,'/',$uuid)"/>
+    <xsl:param name="system_cache__dita:simpletable.col.size" select="4"/> <!-- parameter for automate table width - how much space takes every column -->
+    
+    <xsl:variable name="ditadir" select="concat($temp,'/',$uuid)"/>
     
     <xsl:template mode="preprocess" match="RelatedFeatureRoot">
         <preprocess_dita>
@@ -191,10 +191,25 @@
     <xsl:template match="map" mode="ditamap_root">
         <xsl:element name="{name()}">
             <xsl:copy-of select="@*"/>
-        <xsl:copy-of select="title"/><xsl:apply-templates mode="ditamap_root.embedded_map" />
-        <xsl:message>#196 in mode="ditamap_root" digging! </xsl:message></xsl:element>
+        <xsl:copy-of select="title"/>
+            <xsl:apply-templates mode="ditamap_root.embedded_map" />
+        <xsl:message>#196 in mode="ditamap_root" digging! </xsl:message>
+            <!--<debug197><xsl:copy-of select="."/></debug197>-->
+            <!--<xsl:variable name="Benford:ditamap_root.embedded_map">
+                <xsl:apply-templates mode="Benford:ditamap_root.embedded_map" />
+            </xsl:variable>
+            <xsl:if test="$Benford:ditamap_root.embedded_map/*">
+                <topichead navtitle="Wykryto brak poprawności rozkładu Benforda">
+                    <xsl:apply-templates mode="ditamap_root.embedded_map" select="$Benford:ditamap_root.embedded_map" />
+                </topichead>
+            </xsl:if>-->
+        </xsl:element>
     </xsl:template>
     
+    <!--<xsl:template match="title" mode="ditamap_root.embedded_map">
+        <xsl:copy-of select="."/>
+    </xsl:template>-->
+    
     <xsl:template match="topichead|xref" mode="ditamap_root.embedded_map">
         <xsl:element name="{name()}">
             <xsl:copy-of select="@*"/>
@@ -202,28 +217,37 @@
         </xsl:element>
     </xsl:template>
     
-    <xsl:template mode="ditamap_root.embedded_map" match="@*"><xsl:copy-of select="."/></xsl:template><xsl:template match="topic" mode="ditamap_root.embedded_map">
+    <xsl:template mode="ditamap_root.embedded_map" match="@*"><xsl:copy-of select="."/></xsl:template>
+    
+    
+    <xsl:template match="topic" mode="ditamap_root.embedded_map">
         <topicref href="{@id}.dita">
             <xsl:variable name="ditamap_root.embedded_map.body">
                 <xsl:apply-templates mode="ditamap_root.embedded_map.body"/>
-            </xsl:variable><xsl:result-document href="{$temp}/{$uuid}/{@id}.dita">
+            </xsl:variable>
+            <xsl:result-document href="{$temp}/{$uuid}/{@id}.dita">
                 <xsl:element name="{name()}">
                     <xsl:apply-templates mode="ditamap_root.embedded_map" select="@*"/>
                     <!--<xsl:copy-of select="@*"/>-->
                     <xsl:apply-templates mode="Benford:ditamap_root.embedded_map.body.topic.cleanup" select="$ditamap_root.embedded_map.body"/>
                 </xsl:element>
             </xsl:result-document>
-            <xsl:apply-templates mode="Benford:ditamap_root.embedded_map.body.topicref.topic" select="$ditamap_root.embedded_map.body"/><xsl:apply-templates mode="ditamap_root.embedded_map" />
+            <xsl:apply-templates mode="Benford:ditamap_root.embedded_map.body.topicref.topic" select="$ditamap_root.embedded_map.body"/>
+            <xsl:apply-templates mode="ditamap_root.embedded_map" />
         </topicref>
     </xsl:template>
     
-    
     <xsl:template mode="ditamap_root.embedded_map.body" match="@*">
         <xsl:copy-of select="."/>
     </xsl:template>
     
-    <xsl:template mode="ditamap_root.embedded_map.body" match="@system_cache__dita:width_cols"/><xsl:template match="*" mode="ditamap_root.embedded_map.body">
+    <xsl:template mode="ditamap_root.embedded_map.body" match="@system_cache__dita:width_cols"/>
+        
+        
+    
+    <xsl:template match="*" mode="ditamap_root.embedded_map.body">
         <xsl:element name="{name()}">
+            <!--<xsl:copy-of select="@*"/>-->
             <xsl:apply-templates select="@*" mode="ditamap_root.embedded_map.body"/>
             <xsl:apply-templates mode="ditamap_root.embedded_map.body"/>
         </xsl:element>
@@ -233,15 +257,12 @@
         <xsl:value-of select="."/>
     </xsl:template>
     
-    <xsl:template match="simpletable[ contains(@id,'GRAPH_')]" mode="ditamap_root.embedded_map.body">
-        
+    <xsl:template match="simpletable[ contains(@id,'GRAPH_')]" mode="ditamap_root.embedded_map.body">        
         <xsl:copy-of select="."/>
-
         <xsl:apply-templates mode="system_cache__dita:graph__read" select=".">
             <xsl:with-param name="fileindex" select="@id"/>
             <xsl:with-param name="width" select="700"/>
         </xsl:apply-templates>
-        
     </xsl:template>
     
     
@@ -294,7 +315,10 @@
             <xsl:with-param name="topic.id" select="../../../@id"/>
         </xsl:apply-templates>
         <!--<xsl:copy-of select="$table_cut"/>-->
-    </xsl:template><xsl:template match="*" mode="preprocess_root.embedded_map.simpletable">
+    </xsl:template>
+    
+    
+    <xsl:template match="*" mode="preprocess_root.embedded_map.simpletable">
         <xsl:element name="{name()}">
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates mode="preprocess_root.embedded_map.simpletable"/>
@@ -320,6 +344,9 @@
                 <xsl:with-param name="fileindex" select="@id"/>
             </xsl:apply-templates>
         </xsl:for-each>
+                
+
+        
         <!--<debug>
             <xsl:copy-of select="//simpletable[ contains(@id,'GRAPH_')]"></xsl:copy-of>
         </debug>-->
@@ -341,8 +368,7 @@
         
     
     
-  
-    
+<!-- TODO 2017-10-20 to implement -->  
     <xsl:template mode="table_cut" match="simpletable">
         <xsl:param name="width_cols"  select="6"/>
         <xsl:param name="header_cols" select="1"/>
@@ -639,11 +665,13 @@
         <xsl:variable name="system_cache__dita:width_cols.auto" select="round(count($simpletable/sthead/stentry) div $system_cache__dita:width_cols.auto.div )"/>
         <xsl:message>#506 system_cache__dita:width_cols.auto $sum_width=<xsl:value-of select="$sum_width"/> $screens_div_sum = <xsl:value-of select="$screens_div_sum"/> ; $system_cache__dita:width_cols.auto.cols=<xsl:value-of select="$system_cache__dita:width_cols.auto.cols"/>; $system_cache__dita:width_cols.auto.div=<xsl:value-of select="$system_cache__dita:width_cols.auto.div"/>; <xsl:value-of select="$system_cache__dita:width_cols.auto"/> </xsl:message>
         <xsl:value-of select="$system_cache__dita:width_cols.auto"/>
-    </xsl:template><xsl:template match="*|text()|comment()" mode="ditamap_root.embedded_map"/>
-    
+    </xsl:template>
     
+    <xsl:template match="*|text()|comment()" mode="ditamap_root.embedded_map"/>
     
-<xsl:template mode="system_cache__dita:xref.topic.result-document" match="@*"><xsl:copy-of select="."/></xsl:template>
+    <xsl:template mode="system_cache__dita:xref.topic.result-document" match="@*">
+        <xsl:copy-of select="."/>
+    </xsl:template>
     
     <xsl:template match="*" mode="system_cache__dita:xref.topic.result-document">
         <topicref href="{@id}.dita">
@@ -746,4 +774,6 @@
         <xsl:param name="Benford:subject"/>
         <!--<xref href="#topic_ghxf_rum_os_d1e1/simpgletablesss_inaaz_fwf_d1e1_1" format="dita">asd</xref>-->
         <xsl:value-of select="concat($Benford:subject,'_',$Benford:year)"/>
-    </xsl:function></xsl:stylesheet>
+    </xsl:function>
+    
+</xsl:stylesheet>

+ 2 - 0
SE/schema/default_db_xml_cache.public/get_all_xsd.xsl

@@ -475,6 +475,7 @@
     <!-- EOF external schema templates -->
     
     
+
     <xsl:template name="system_cache__appinfo:get_all_xsd.verify_unique_id">
         <system_cache__appinfo:get_all_xsd.verify_unique_id>
             <xsl:variable name="system_cache__appinfo:get_all_xsd" select="doc($procesy5_system_schema)"/>
@@ -494,6 +495,7 @@
         </system_cache__appinfo:get_all_xsd.verify_unique_id>
     </xsl:template>
     
+
     <xsl:template name="system_cache__appinfo:get_all_xsd">
         <xsl:param name="path2collection" select="$procesy5_system_schema_collection_dir"/> 
         <xsl:param name="get_system_schemas"/>

+ 7 - 1
SE/schema/default_db_xml_cache.public/main_build_recurse_ant.dita_with_id.xsl

@@ -171,6 +171,7 @@
         <xsl:variable name="build_complexType" select="doc(concat($build_complexType_dir,'/',$prefixed_object_info/system_cache__appinfo:prefixed_object_info/@prefix,'/',$prefixed_object_info/system_cache__appinfo:prefixed_object_info/@element,'.xml'))"/>
         <xsl:variable name="detect_resource_type" select=" system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type_from_cache(@system_cache__appinfo:ref)"/>
         <xsl:comment>#138 from <xsl:value-of select="@system_cache__appinfo:ref"/>; I get prefixed_object_info/@element <xsl:value-of select="$prefixed_object_info/system_cache__appinfo:prefixed_object_info/@element"/>; </xsl:comment>
+
         <xsl:choose>
             <xsl:when test="@flat_relation_cache_xpath and @flat_relation_cache_name">
                 <xsl:element name="RelatedFeature">
@@ -228,7 +229,9 @@
                 <xsl:message>#228 @flat_relation_cache_xpath and @flat_relation_cache_name not set for @id<xsl:value-of select="@id"/></xsl:message>
                 <xsl:comment>#228 @flat_relation_cache_xpath and @flat_relation_cache_name not set for @id<xsl:value-of select="@id"/></xsl:comment>
             </xsl:otherwise>
-        </xsl:choose></xsl:template>
+        </xsl:choose> 
+            
+    </xsl:template>
     
     <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_477[@system_cache__appinfo:loop_name]">
         <!--<xsl:param name="build_complexType" required="yes"/>-->
@@ -306,6 +309,9 @@
                 <xsl:attribute name="xpath_value" select="concat('../',@flat_relation_cache_name)"/>
             </xsl:when>
             <xsl:otherwise>
+                <!-- <xsl:attribute name="xpath" select="'ID'"/>
+                <xsl:attribute name="xpath_value" select="'ID'"/>-->
+                <!--<xsl:attribute name="debug" select="'#99 this is fake TODO'"/>-->
                 <xsl:message terminate="yes">#99 for @system_cache__appinfo:id=<xsl:value-of select="@system_cache__appinfo:id"/>; @system_cache__appinfo:ref=<xsl:value-of select="@system_cache__appinfo:ref"/> is empty definition for @flat_relation_cache_xpath or @flat_relation_cache_name </xsl:message>
             </xsl:otherwise>
         </xsl:choose>

+ 5 - 4
SE/schema/default_db_xml_cache.public/system_cache__appinfo/external_schema_targetNamespace.xsl

@@ -9,8 +9,7 @@
     
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
-    
-    
+      
     <xsl:param name="default_db_targetNamespace_detect_string" select="'default_db/table/'"/>
     
     <xsl:function name="system_cache__appinfo:object_install_se_ant_object.detect_external_targetNamespace">
@@ -58,9 +57,11 @@
                 <xsl:message>#56 TO MOVE TO CONFIG not adding .xsd because of default</xsl:message>
                 <xsl:value-of select="$targetNamespace"/>
             </xsl:when>
-            <xsl:otherwise><xsl:value-of select="concat($targetNamespace,'.xsd')"/>
+            <xsl:otherwise>
+                <xsl:value-of select="concat($targetNamespace,'.xsd')"/>
     </xsl:otherwise>
-        </xsl:choose></xsl:function>
+        </xsl:choose>
+    </xsl:function>
     
     <xsl:function name="system_cache__appinfo:object_install_se_ant_object.save_to_ant-object-path">
         <xsl:param name="system_cache__appinfo:document-uri-orig"/> <!-- for use in schema -->