popr do ADMIN_USERS todo blad z count

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xml

@@ -533,12 +533,20 @@
     </target>
     
     
-    <target name="build_recurse_ant_xsl_xpath_filter.xsl_check" description="if it is set ">
+    <target name="build_recurse_ant_xsl_xpath_filter.xsl_check" description="if it is set $xpath_query ">
+        <!--<exec  executable="bash" dir="." outputproperty="typeName_tested_name"> 
+            <arg value="-c"/>
+            <arg value="echo ${typeName_tested} |sed 's/.*://'"/><!-\- tu wchodzi -DtypeName=p5_default_db:CRM_PROCES  -\->
+        </exec>-->
+        <!--<echo> #537 debug  $typeName_tested_name: ${typeName_tested_name}</echo>-->
         <condition taskname="build_recurse_ant_xsl_xpath_filter.xsl" property="xpath_query_set">
-            <or>
-                <equals arg1="${xpath_query}" arg2=""/>
-                <equals arg1="${xpath_query}" arg2="$${xpath_query}"/>
-            </or>
+            <!--<and>-->
+                <or>
+                    <equals arg1="${xpath_query}" arg2=""/>
+                    <equals arg1="${xpath_query}" arg2="$${xpath_query}"/>
+                </or>
+                <!--<available file="${simpleSchema_dir}/${namespace_prefix_p5_tr_map}/${typeName_tested_name}.xml"/>--> 
+            <!--</and>-->
         </condition>
         <antcall target="build_recurse_ant_xsl_xpath_filter.xsl_fail"/> <!-- if failed run or not if not -->
     </target>
@@ -568,6 +576,7 @@
             </factory>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <param name="xpath_query" expression="${xpath_query}"/>
+            <param name="typeName" expression="${typeName}"/>
             <param name="default_db_xml_cache.public" expression="${default_db_xml_cache.public}"/>
         </xslt>
     </target>

SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -79,7 +79,7 @@
     <xsl:param name="process_locks"/>
     <xsl:param name="get_wfs" required="yes"/>
     <xsl:param name="debug_xsl_out_filename" required="yes" />  
-    <xsl:param name="debug" select="1"/>
+    <xsl:param name="debug" select="6"/>
     <!--<xsl:variable name="temp_current">
         <xsl:choose>
             <xsl:when test="$temp='temp'">

SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

@@ -542,7 +542,9 @@
             <!--<xsl:copy-of select="@*"/>-->
             <!--<xsl:apply-templates select="@*"/>-->
             <xsl:message>#94 ustalam $feature_pos_child=<xsl:value-of select="position()"/>; dla <xsl:value-of select="name()"/></xsl:message>
-            <xsl:comment>#94 ustalam $feature_pos_child=<xsl:value-of select="position()"/>; dla <xsl:value-of select="name()"/></xsl:comment>
+            <xsl:comment>#94 ustalam @xml_id:<xsl:value-of select="@xml_id"/>; $feature_pos_child=<xsl:value-of select="position()"/>; dla <xsl:value-of select="name()"/>; ../name() <xsl:value-of select="../name()"/>
+                count RelatedFeature prev:<xsl:value-of select="count(parent::node()[name='RelatedFeature' ])"/> <!--  and position()&lt; current()/position() -->
+            </xsl:comment>
             <xsl:apply-templates mode="RelatedFeatureChild" select=".">
                 <xsl:with-param name="loop_xpath" select="$loop_xpath"/>
                 <xsl:with-param name="feature_pos_child" select="position()"/>

SE/schema/default_db_xml_cache.public/build_recurse_ant_xsl_xpath_filter.xsl

@@ -16,7 +16,15 @@
    <xsl:param name="namespace_prefix_p5_tr_map" select="'default_db'"/>
 
 
-   <xsl:variable name="simpleSchema" select="doc( concat($simpleSchema_dir,'/',$namespace_prefix_p5_tr_map,'/', system_cache__appinfo:clean_object_prefix($typeName),'.xml' ))"/>
+   <!--<xsl:variable name="simpleSchema" select="doc( concat($simpleSchema_dir,'/',$namespace_prefix_p5_tr_map,'/', system_cache__appinfo:clean_object_prefix($typeName),'.xml' ))"/>-->
+   
+   <xsl:variable name="simpleSchema" >
+      <xsl:choose>
+         <xsl:when test=" doc-available(concat($simpleSchema_dir,'/',$namespace_prefix_p5_tr_map,'/', system_cache__appinfo:clean_object_prefix($typeName),'.xml' ))">
+            <xsl:copy-of select="doc( concat($simpleSchema_dir,'/',$namespace_prefix_p5_tr_map,'/', system_cache__appinfo:clean_object_prefix($typeName),'.xml' ))"></xsl:copy-of>
+         </xsl:when>
+      </xsl:choose>
+   </xsl:variable>
 
 
    <xsl:template match="xsl:stylesheet">