poprawka druku DITA pdf

SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -80,6 +80,8 @@
     <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="recurse_ant_basedir.recurse_cache" />
+    <xsl:param name="build_recurse_ant_cache_control.xsl" />
     <xsl:param name="typeNameRoot" required="yes"/><!-- to cache purpose - to allow child elements cache created to be named from this typeNameRoot -->
     <xsl:param name="input_obj_fid_forced"/><!-- to force by build_root.xml (loop) -->
     <!--<xsl:variable name="temp_current">
@@ -525,6 +527,9 @@
                                 <xsl:with-param name="loop_path_recurs_xpath" select="$loop_path_recurs_xpath"/>
                                 <xsl:with-param name="feature_pos_parent" select="$feature_pos_parent"/>
                                 <xsl:with-param name="feature_pos" select="$feature_pos"/>
+                                <xsl:with-param name="input_obj_fid" select="$input_obj_fid"/>
+                                <!-- debug only below CACHE -->
+                                    <xsl:with-param name="typeName_dita" select="$typeName_dita"/>
                                 <!--<xsl:with-param name="loop_path_recurs" select="$loop_path_recurs"/>-->
                                 <!--<xsl:with-param name="loop_path_recurs" select="$loop_path_recurs"/>-->
                             </xsl:apply-templates>
@@ -1019,6 +1024,9 @@
         <xsl:param name="loop_path_recurs_xpath" required="yes"/>
         <xsl:param name="feature_pos_parent" required="yes"/>
         <xsl:param name="feature_pos" required="yes"/>
+        <xsl:param name="input_obj_fid" />
+        <xsl:param name="typeName_dita"/> <!-- debug cache only  -->
+        <xsl:param name="xpath_value_dita"/>
         <!-- dajemy wpis o walidacji danego feature pod katem xpath_query -->
         <xsl:if test="$debug &gt; 1"><echo>#684 dajemy wpis o walidacji danego feature pod katem xpath_query dla $featureID_name_dita=<xsl:value-of select="$featureID_name_dita"/> </echo></xsl:if>
         <!--<sleep>
@@ -1169,6 +1177,11 @@
                 <param name="ant-launcher.jar" expression="{$ant-launcher.jar}"/>
                 <param name="process_locks" expression="{$process_locks}"/>
                 <param name="uuid" expression="{$uuid}"/>
+                <param name="xml_id" expression="{@xml_id}"/>
+                <param name="typeNameRoot" expression="{$typeNameRoot}"/>
+                <param name="recurse_ant_basedir.recurse_cache" expression="{$recurse_ant_basedir.recurse_cache}"/>
+                <param name="feature_pos_parent" expression="{$feature_pos_parent}"/>
+                <param name="feature_pos" expression="{$feature_pos}"/>
                 <classpath location="/opt/local/share/java/saxon9he.jar"/>
             </xsl:element>
             <!-- delete tempfiles -->
@@ -1505,7 +1518,7 @@
             <xsl:with-param name="feature_pos_parent" select="$feature_pos_parent"/>
             <xsl:with-param name="feature_pos" select="$feature_pos"/>
             <xsl:with-param name="input_obj_fid" select="$input_obj_fid"/>
-            <xsl:with-param name="typeName_dita" select="$typeName_dita"/> <!-- debug cache only  -->
+                <xsl:with-param name="typeName_dita" select="$typeName_dita"/> <!-- debug cache only  -->
             <!--<xsl:with-param name="loop_path_recurs" select="$loop_path_recurs"/>-->
             <!--<xsl:with-param name="loop_path_recurs" select="$loop_path_recurs"/>-->
         </xsl:apply-templates>
@@ -1746,6 +1759,9 @@
                                             </param>
                                             <param name="process_locks" expression="{$process_locks}"/>
                                             <param name="get_wfs" expression="{$get_wfs}"/>
+                                            <param name="recurse_ant_basedir.recurse_cache" expression="{$recurse_ant_basedir.recurse_cache}"/>
+                                            <param name="build_recurse_ant_cache_control.xsl" expression="{$build_recurse_ant_cache_control.xsl}"/>
+                                            <param name="typeNameRoot" expression="{$typeNameRoot}"/>
                                     </xslt>
                             </xsl:element>
                         <!-- zapisujemy wynik naszego biezacego przetwarzania dita element nizej do kolejnego przejechania z ant wyniku dla podstawienia danych  -->
@@ -1991,6 +2007,7 @@
         <xsl:param name="input_obj_with_xpath" required="yes"/>
         <xsl:param name="feature_pos"  required="yes"/>
         <xsl:param name="feature_pos_parent"  required="yes"/>
+        <xsl:param name="input_obj_fid" required="no"/>
         <xsl:for-each select=".">
             <xsl:choose>
                 <!--<xsl:when test="node()='topic'">asdad</xsl:when>-->

SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

@@ -864,6 +864,6 @@
         </xsl:choose>
     </xsl:template>
     
-    <xsl:template match="@xml_id|@xpath_token_filter|@xpath_token|@format"/>
+    <xsl:template match="@xml_id|@xpath_token_filter|@xpath_token|@format|@fid"/>
         
 </xsl:stylesheet>

SE/schema/default_db_xml_cache.public/builds_to_ant.xsl

@@ -148,11 +148,11 @@
                                         <arg value="-buildfile"/>
                                         <arg value="{$temp}/{$loop_xpath}/{.}/build.xml"/>
                                     </java>
-                                    <loadfile  property="builds_to_ant_cache_fid_ant{$loop_path_recurs}{$loop_xpath_real}{$xml_id}.{$feature_pos_parent}.{position()}" srcfile="{$temp}/{$loop_xpath}/{position()}.fid_parent.txt"/>
+                                    <!--<loadfile  property="builds_to_ant_cache_fid_ant{$loop_path_recurs}{$loop_xpath_real}{$xml_id}.{$feature_pos_parent}.{position()}" srcfile="{$temp}/{$loop_xpath}/{position()}.fid_parent.txt"/>-->
                                     
                                     <!-- THIS SHOULD BE THE SAME AS IN build_recurse_ant.xsl/builds_to_ant.xsl (to be template) line 1000 name CACHE_COPY_TASK - EOF -->
                                     
-                                    <echo> #146 builds_to_ant detected fid *.fid_parent.txt <xsl:value-of select="concat('${builds_to_ant_cache_fid_ant',$loop_path_recurs,$loop_xpath_real,$xml_id,'.',$feature_pos_parent,'.', position(),'}')"/></echo>
+                                    <!--<echo> #146 builds_to_ant detected fid *.fid_parent.txt <xsl:value-of select="concat('${builds_to_ant_cache_fid_ant',$loop_path_recurs,$loop_xpath_real,$xml_id,'.',$feature_pos_parent,'.', position(),'}')"/></echo>-->
                                    
                                    <!-- <mkdir>
                                         <xsl:attribute name="dir" select="concat($recurse_ant_basedir.recurse_cache,'/',system_cache__appinfo:escape_object_prefix_to_string($typeNameRoot),'.','${builds_to_ant_cache_fid_ant',$loop_path_recurs,$loop_xpath_real,$xml_id,'.',$feature_pos_parent,'.', position(),'}')"/>