a.binder пре 8 година
родитељ
комит
1aec315fa8

+ 3 - 9
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/build_recurse_ant.xml

@@ -998,12 +998,7 @@
     </target>
     
     <target name="buildpdf_recursed_xsl" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve and build object from api using just XSL calls - needed username and password">
-        
-        <record name="log.log" action="start"/>
-        
-        <echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id} , $empty.xml = ${empty.xml} 
-            $main_build_recurse_ant.dita} = ${main_build_recurse_ant.dita}
-        </echo>
+        <echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id} , $empty.xml = ${empty.xml}</echo>
         <echoxml file="${empty.xml}">
             <empty>empty</empty>
         </echoxml>
@@ -1019,8 +1014,8 @@
             <!--<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="xpath" expression="${xpath_tested}"/>
-            <param name="xpath_value" expression="${xpath_value_tested}"/>
+            <param name="xpath" expression="${xpath}"/>
+            <param name="xpath_value" expression="${xpath_value}"/>
             <param name="username.pass" expression="${Password}"/>
             <param name="php_session_id_ok.string" expression="${php_session_id}"/>
             <!--<param name="basedir" expression="${basedir}"/>-->
@@ -1074,7 +1069,6 @@
             &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
         </echo>-->
         <echo message="OUTPUT__END"/>
-        <record name="log.log" action="stop"/>
     </target>
     
     <target name="buildpdf_recursed_html5" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}" description="URL_TASK Pobierz Wersję HTML">

+ 128 - 1
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/build_recurse_ant.xml

@@ -422,6 +422,86 @@
     </target>
    
    
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych za pomoca funkcji xsl_recursed">
+        
+        <exec  executable="bash" dir="." outputproperty="out_task_file">
+            <arg value="-c"/>
+            <arg value="echo ${out_task.dita.final} |sed 's/^.*\///'"/>
+        </exec>
+        
+        <echo>#427 $out_task.dita.final = ${out_task.dita.final} , $out = ${out} , $out_task_file =  ${out_task_file}
+            $out_task.dita.final.noext = ${out_task.dita.final.noext}
+            $out_task.dita.final_with_RelatedFeatureLoop = ${out_task.dita.final_with_RelatedFeatureLoop}
+        </echo>
+        <!-- 
+                 [echo] #427 $out_task.dita.final = /Users/a.binder/Documents/se/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/temp/Proj6782__/Proj6782___out_task_dita_final.dita , 
+                 $out = out ,
+                 $out_task_file =  Proj6782___out_task_dita_final.dita
+
+            
+            /Users/a.binder/Documents/se/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/CRM_PROCES_tree/build_CRM_PROCES_tree.xml:294: input file
+            /Users/a.binder/Documents/se/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/out/Proj6782__.out_task.dita.final_with_RelatedFeatureLoop.xml does not exist -->
+        
+        <echoxml file="${empty.xml}">
+            <empty>empty</empty>
+        </echoxml>
+        
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${out_task.dita.final}" > <!-- out_task.dita.final -->
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <!--<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>-->
+                <attribute name="http://saxon.sf.net/feature/initialTemplate" value="main"/>
+            </factory>
+            
+            <!--<classpath location="/opt/local/share/java/saxon.jar"/>-->
+            
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <param name="typeName" expression="${typeName}"/>
+            <!--<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="xpath" expression="${xpath}"/>
+            <param name="xpath_value" expression="${xpath_value}"/>
+            <param name="username.pass" expression="${Password}"/>
+            <param name="php_session_id_ok.string" expression="${php_session_id}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="debug" expression="0"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+            <!--<param name="simpleSchema.xml" expression="${basedir}/${main_build_recurse_ant.dita}"/>-->
+            <!--<param name="noRelatedFeatureRoot" expression="1"/>-->
+        </xslt>
+        
+        
+        <!--<move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>-->
+        <copy file="${out_task.dita.final}" tofile="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>
+        
+        <ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
+            <property name="uuid" value="${uuid}"/>
+            <property name="default_db:recurse_ant_basedir.out" value="${default_db:recurse_ant_basedir}/out"/>
+        </ant>
+        
+        <exec executable="${dita.dir}" dir=".">
+            <arg value="-i"/>
+            <arg value="${CRM_PROCES_tree_basedir.temp}/${uuid}/${uuid}.ditamap" />
+            <!-- <arg value="-t" />
+            <arg value="temp" />-->
+            <arg value="-f" />
+            <arg value="pdf"/>
+            <arg value="-o"/>
+            <arg value="${out}"/>
+        </exec>
+        
+        <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>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
+        </echo>
+        <echo message="OUTPUT__END"/>
+    </target>
+   
+   
     
 <!-- @2017-12-14 copied to build_get_wfs.xml TO BE REMOVED FROM THERE!!! after basepath modify! -->
         <target name="php_session_id_cond">
@@ -500,7 +580,8 @@
     
    
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
-        <echo>#490 debug external_schema_table.path ${external_schema_table.path} - is it correct?</echo>    
+        <echo>#490 debug external_schema_table.path ${external_schema_table.path} - is it correct?
+            $xpath_query.xsl = ${xpath_query.xsl}</echo>    
         <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
@@ -870,6 +951,52 @@
         <echo message="OUTPUT__END"/>
     </target>   
     
+    
+    <target name="builxml_recursed" description="To build just XML from map - usable for custom scripting" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,check_dita" if="${test_if_dita}">
+        <input addproperty="main_build_recurse_ant.dita" message="Type xml map of object to traverse (RelatedFeature xpath=ID  typeName=p5_default_db:CRM_LISTA_ZASOBOW) "/>
+        <input addproperty="typeName"/>
+        <input addproperty="uuid"/>
+        <input addproperty="xpath"/>
+        <input addproperty="xpath_value"/>
+        <input addproperty="passwordBase64Basic"/>
+        <input addproperty="out_task.dita.final"/>
+        
+        
+        
+        <!-- -Dmain_build_recurse_ant.dita=/Users/a.binder/Documents/xmlschema_procesy5/src-xmlschema/public_html/WPS_Functions/default_db/recurse_ant/CRM_LISTA_ZASOBOW_test.schema.xml -->
+        <!--<exec executable="${dita.dir}" dir=".">
+            <arg value="-i"/>
+            <arg value="${out_task.dita.final}" />
+            <!-\- <arg value="-t" />
+            <arg value="temp" />-\->
+            <arg value="-f" />
+            <arg value="pdf"/>
+            <arg value="-o"/>
+            <arg value="${out}"/>
+        </exec>-->
+        <!--<exec  executable="bash" dir="." outputproperty="out_task_file">
+            <arg value="-c"/>
+            <arg value="echo ${out_task.dita.final} |sed 's/^.*\///'"/>
+        </exec>-->
+        <echo message="OUTPUT__START"/>        
+        <!--<echo> url = ${url} 
+        </echo>-->
+        <!--<echo> passwordBase64Basic = ${passwordBase64Basic_tested} 
+        </echo>-->
+        <!--<echo> $webRootUrl = ${webRootUrl} 
+        </echo>-->
+        <!--<echo> $wfs_output = ${wfs_output} 
+        </echo>-->
+        <echo>
+            out_task.dita.final = ${out_task.dita.final}
+        </echo>
+        <!--<echo>
+            &lt;br&gt;Wygenerowano druk pdf - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&lt;/a&gt;&lt;/br&gt; 
+        </echo>-->
+        
+        <echo message="OUTPUT__END"/>
+    </target>
+    
     <target name="buildpdf_recursed_xsl" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve and build object from api using just XSL calls - needed username and password">
         <echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id} , $empty.xml = ${empty.xml}</echo>
         <echoxml file="${empty.xml}">