a.binder 8 лет назад
Родитель
Сommit
a39350dd59

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

@@ -332,7 +332,7 @@
             <mkdir dir="${process_locks}"/>
         </target>
     
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map,xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" description="URL_TASK Pobierz XML obiektu">
                         
                         <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
                         <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
@@ -342,29 +342,45 @@
                         <!--<echoxml file="${out_task.dita.final}.xml">
                             <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
                         </echoxml>-->
-                    <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
-                    <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
-                            <factory name="net.sf.saxon.TransformerFactoryImpl">    
-                                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
-                                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
-                            </factory>
-                            <classpath location="/opt/local/share/java/saxon9he.jar"/>
-                            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
-                            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
-                            <param name="uuid" expression="${uuid_tested}"/>
-                            <!--<param name="basedir" expression="${basedir}"/>-->
-                            <param name="temp" expression="${temp}"/>
-                            <param name="with_RelatedFeatureLoop" expression="1"/>
-                            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
-                        </xslt>
+                   
                         <echo message="OUTPUT__START"/>
                         <echo>
                             &lt;br&gt;Wygenerowano wyjsciowy plik XML - sciagnij go &lt;a href=&quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&lt;/a&gt;&lt;/br&gt; 
                         </echo>
                         <echo message="OUTPUT__END"/>
          </target>
+    
+    
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+        
+        <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
+        <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
+        
+        <!--<loadfile property="out_task.dita.final_no_RelatedFeatureRoot" srcfile="${out_task.dita.final}"/>-->
+        <!--<move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>-->
+        <!--<echoxml file="${out_task.dita.final}.xml">
+                            <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
+                        </echoxml>-->
+        <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="with_RelatedFeatureLoop" expression="1"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+       
+    </target>
+    
    
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
         
         <ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
             <property name="uuid" value="${uuid}"/>