a.binder 6 лет назад
Родитель
Сommit
799bae7b92

+ 92 - 57
SE/schema/WPS_Functions/default_db/recurse_ant/build_recurse_ant.xml

@@ -46,6 +46,9 @@
     <include file="../../send_email/build_send_email.xml" as="send_email"/>
     
     <include file="../../get_wfs_recurse_xsl/build.bgwrx.PRODUCT.xml" as="PRODUCT" />
+    <include file="../CRM_PROCES_tree/build_CRM_PROCES_tree.xml" as="CRM_PROCES_tree"/>
+    <include file="../../system_ui_info_speech/build_system_ui_info_speech.xml" as="p5suis"/>
+    <include file="../../dita-ot/build_dita-ot.xml" as="dita-ot"/>
     
     <property name="basedir"  location="${basedir}" /> <!-- do ustalenia glownego katalogu -->
     <property name="default_db:recurse_ant_basedir"  value="${recurse_ant.basedir}"/>
@@ -100,13 +103,6 @@
     <!--<property name="default_db_xml_cache.public" value="../../../default_db_xml_cache.public"/>--> <!-- katalog z xsl z projektu src-xmlschema.git -->
     
     <!--<tempfile property="uuid" deleteonexit="yes"/>-->
-    <property name="out_task.dita"  value="${temp}/${uuid}.out_task_dita" />
-    <property name="out_task.dita.final.out"   value="${temp}/${uuid}_out_task_dita_final.dita.out" />
-    <property name="out_task.dita.final"   value="${temp}/${uuid}_out_task_dita_final.dita" />
-    <property name="out_task.dita.final.noext"   value="${uuid}_out_task_dita_final" />
-    <property name="out_task.dita.final.html"   value="${uuid}_out_task_dita_final.html" /> <!-- dita -f html5 wywala kropki -->
-    <property name="out_task.dita.final_with_RelatedFeatureLoop_no_path"   value="${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
-    <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${default_db:recurse_ant_basedir}/out/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
     
     <!-- should be also set in parent build --><!-- should be also set in parent build -->
     <!--R<property name="ant-launcher.jar" location="/opt/local/share/java/apache-ant/lib/ant-launcher.jar"/>--><!-- should be also set in parent build -->
@@ -277,14 +273,25 @@
     </target>
 
 
+    
+
+
+
     <target name="set_dita" depends="check_set_default_db_xml_cache.public_local,check_default_db_xml_cache.public_default" >
         <!--<property name="main_build_recurse_ant.dita" value="main_build_recurse_ant.dita"/>-->
         <exec  executable="bash" dir="." outputproperty="main_build_recurse_ant.dita_sed">
             <arg value="-c"/>
             <arg value="echo ${typeName_tested} |sed 's/.*://'"/>
         </exec>
+        
+        <local name="main_build_recurse_ant.dita.ditamap"/>
+        <property name="main_build_recurse_ant.dita.ditamap" value="${main_build_recurse_ant.dita_sed}.ditamap"/>
+        <condition property="main_build_recurse_ant.dita" value="${main_build_recurse_ant.dita.ditamap}">
+            <available file="${user.dir}/${main_build_recurse_ant.dita.ditamap}"/>
+        </condition>
+        
         <property name="main_build_recurse_ant.dita" value="${main_build_recurse_ant.dita_sed}.dita"/>
-        <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ; $uuid = ${uuid} </echo>
+        <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ; $uuid = ${uuid} ; $main_build_recurse_ant.dita.ditamap = ${main_build_recurse_ant.dita.ditamap} </echo>
         
         <property name="main_build_recurse_ant.dita_with_id" value="${temp}/${main_build_recurse_ant.dita}.with_id.xml"  />
         <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"  />
@@ -346,7 +353,7 @@
                         <antcall target="build_recurse_ant_merge_dita_from_temp.xsl_tr_map"/>
                     </target>
                     
-                    <target name="xml_recursed_from_tr_map" depends="uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,check_tr_map" description="Buduje wyjsciowego XMLa na podstawie mapy transportowej dla zastosowan w API DEVEL">
+                    <target name="xml_recursed_from_tr_map" depends="input,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,check_tr_map" description="Buduje wyjsciowego XMLa na podstawie mapy transportowej dla zastosowan w API DEVEL">
                         <!--<echo message="OUTPUT__START"/>-->
                         
                         <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
@@ -369,7 +376,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,xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" description="URL_TASK Pobierz XML obiektu">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="input,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" />-->
@@ -388,7 +395,7 @@
          </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">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" depends="input,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" />-->
@@ -446,7 +453,7 @@
     </target>
    
    
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed" unless="confirmAntfile.isset" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych za pomoca funkcji xsl_recursed">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed" unless="confirmAntfile.isset" depends="input,install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych za pomoca funkcji xsl_recursed">
         <record name="recursed.log" action="start" />
         
         <exec  executable="bash" dir="." outputproperty="out_task_file">
@@ -847,7 +854,7 @@
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     
-    <target name="build_recurse_ant_merge_dita_from_temp.xsl" depends="build_recurse_ant.xml" description="z plikow temp/$uuid.* buduje $out_task.dita.final ">
+    <target name="build_recurse_ant_merge_dita_from_temp.xsl" depends="input,build_recurse_ant.xml" description="z plikow temp/$uuid.* buduje $out_task.dita.final ">
         <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}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
@@ -864,7 +871,7 @@
     </target>
 
 
-    <target name="build_recurse_ant_merge_dita_from_temp.xsl_tr_map" depends="build_recurse_ant.xml" description="z plikow temp/$uuid.* buduje $out_task.dita.final ">
+    <target name="build_recurse_ant_merge_dita_from_temp.xsl_tr_map" depends="input,build_recurse_ant.xml" description="z plikow temp/$uuid.* buduje $out_task.dita.final ">
         <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}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
@@ -887,7 +894,7 @@
         </echo>
     </target>
     
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="xml_recursed_from_tr_map" description="URL_TASK Pobierz HTML obiektu">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="input,xml_recursed_from_tr_map" description="URL_TASK Pobierz HTML 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" />-->
@@ -953,7 +960,7 @@
 
 
 
-    <target name="buildpdf_recursed" 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}">
+    <target name="buildpdf_recursed" depends="input,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}">
         <echo>#926 executing dita in @dir = $temp = ${temp}</echo>
         <exec executable="${dita.dir}" dir="${temp}" > <!-- R dir="." -->
             <arg value="-i"/>
@@ -1000,7 +1007,7 @@
     
     
     
-    <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}">
+    <target name="builxml_recursed" description="To build just XML from map - usable for custom scripting" depends="input,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"/>
@@ -1045,13 +1052,53 @@
         <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">
-        <record name="buildpdf_recursed_xsl.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}</echo>
+    <target name="default_db.PROCES_INIT.tree.dita.debug" depends="CRM_PROCES_tree.default_db.PROCES_INIT.tree.dita.debug"/>
+        
+    <target name="dita-ot.input">
+        <echo>#1063 todo set dita parameters to generate</echo>
+        <property name="dita-ot.output.dir.input" location="${CRM_PROCES_tree_basedir.temp}/${uuid}"/>
+        <property name="dita-ot.args.input.input" value="${CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap}" />
+        <property name="dita-ot.args.input.input.filepath.dir" location="${CRM_PROCES_tree_basedir.temp}/${uuid}"/>
+        <property name="dita-ot.args.input.input.filename" value="${uuid}.ditamap"/>
+        <property name="dita-ot.args.input.input.filename.noext" value="${uuid}"/>
+        <property name="dita-ot.args.input.ditamap.title.info" value="Wygenerowana build_xsl_recurse #1063"/>
+        <property name="dita-ot.temp.input.errorproperty.xml" location="${dita-ot.output.dir.input}/dita-ot.errorproperty.xml"/>
+        <property name="dita-ot.temp.input.resultproperty.xml" location="${dita-ot.output.dir.input}/dita-ot.resultproperty.xml"/>
+        <property name="dita-ot.temp.input.outputproperty.xml" location="${dita-ot.output.dir.input}/dita-ot.outputproperty.xml"/>
+    </target>
+    
+    <target name="build_recursed_xsl:tree:dita.input">
+        <property name="recurse_ant.basedir.out.uuid.out_task.dita.final_with_RelatedFeatureLoop.xml"  value="${CRM_PROCES_tree_basedir.temp}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop.xml"/>
+        <property name="CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap" value="${CRM_PROCES_tree_basedir.temp}/${uuid}/${uuid}.ditamap"/>
+        <property name="out_task.dita.final"   value="${recurse_ant.basedir.out.uuid.out_task.dita.final_with_RelatedFeatureLoop.xml}" />
+    </target>
+    
+    <target name="build_recursed_xsl:tree:dita" depends="build_recursed_xsl:tree:dita.input,input,build_recursed_xsl,CRM_PROCES_tree.default_db:PROCES_INIT:tree:dita,dita-ot.input,dita-ot.chm-pdf.pdf"  description="retrieve data styled Related and build object from api using just XSL calls - needed username and password - than apply all dita templates modules multi process, modules, images etc - finalize">
+        <echo>#1050 will try call name="default_db:PROCES_INIT:tree:dita"
+            $recurse_ant.basedir.out/$uuid.out_task.dita.final_with_RelatedFeatureLoop.xml = ${recurse_ant.basedir.out}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop.xml
+        </echo>
+        
+    </target>
+    
+    
+    <target name="input">
+        <property name="out_task.dita"  value="${temp}/${uuid}.out_task_dita" />
+        <property name="out_task.dita.final.out"   value="${temp}/${uuid}_out_task_dita_final.dita.out" />
+        <property name="out_task.dita.final"   value="${recurse_ant.basedir.out}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop.xml" /><!-- value="${temp}/${uuid}_out_task_dita_final.dita" -->
+        <property name="out_task.dita.final.noext"   value="${uuid}_out_task_dita_final" />
+        <property name="out_task.dita.final.html"   value="${uuid}_out_task_dita_final.html" /> <!-- dita -f html5 wywala kropki -->
+        <property name="out_task.dita.final_with_RelatedFeatureLoop_no_path"   value="${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
+        <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${default_db:recurse_ant_basedir}/out/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
+        
+    </target>
+    
+    <target name="build_recursed_xsl" depends="input,install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve data styled Related and build object from api using just XSL calls - needed username and password">
         <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 -->
+        <property name="debug.dita-ot.dtd.catalog" refid="dita-ot.dtd.catalog"/>
+        <echo>#1075 $out_task.dita.final = ${out_task.dita.final}</echo>
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${out_task.dita.final.out}" failonerror="true" force="true" > <!-- 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"/>
@@ -1060,20 +1107,33 @@
             <!--<classpath location="/opt/local/share/java/saxon.jar"/>-->
             
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <param name="out_task.dita.final" expression="${out_task.dita.final}"/>
             <!--<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="php_session_id_ok.string" expression="${php_session_id_ok.string}"/>
             <!--<param name="basedir" expression="${basedir}"/>-->
             <param name="temp" expression="${temp}"/>
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
-            <param name="simpleSchema.xml" expression="${basedir}/${main_build_recurse_ant.dita}"/>
+            <param name="simpleSchema.xml" expression="${user.dir}/${main_build_recurse_ant.dita}"/>
             <param name="noRelatedFeatureRoot" expression="1"/>
+            <xmlcatalog refid="dita-ot.dtd.catalog"/>
         </xslt>
         
+    </target>
+    
+    <target name="buildpdf_recursed_xsl" depends="input,build_recursed_xsl"  description="retrieve and build object from api using just XSL calls - needed username and password">
+        <record name="buildpdf_recursed_xsl.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}</echo>
+        <echoxml file="${empty.xml}">
+            <empty>empty</empty>
+        </echoxml>
+        <property name="debug.dita-ot.dtd.catalog" refid="dita-ot.dtd.catalog"/>
+        
+        
         
         <!--<ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
             <property name="uuid" value="${uuid}"/>
@@ -1093,7 +1153,7 @@
         <!--<antcall target="send_email.send_email_from_xml_parsed">
             <param name="send_email.xml_to_parse.xml" value="${out_task.dita.final}"/>
         </antcall>-->
-            <exec executable="${dita.dir}" dir=".">
+        <exec executable="${dita.dir.bin.dita}" dir=".">
             <arg value="-i"/>
             <arg value="${out_task.dita.final}" />
             <!-- <arg value="-t" />
@@ -1101,7 +1161,7 @@
             <arg value="-f" />
             <arg value="pdf"/>
             <arg value="-o"/>
-            <arg value="${out}"/>
+            <arg value="${user.dir}/${out}"/>
         </exec>
         <exec  executable="bash" dir="." outputproperty="out_task_file">
             <arg value="-c"/>
@@ -1138,47 +1198,22 @@
         <record action="stop" name="confirmAntfile.isset.log"/>
     </target>
     
-    <target name="buildpdf_recursed_xsl_mail" unless="confirmAntfile.isset" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile,php_session_id_cond"  description="URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem "  >
+    <target name="buildpdf_recursed_xsl_mail" unless="confirmAntfile.isset" depends="input,build_recursed_xsl,confirmAntfile,php_session_id_cond"  description="URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem "  ><!-- depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile,php_session_id_cond" -->
         <!--<description>URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem x ${primaryKey}</description>-->
         <record name="buildpdf_recursed_xsl_mail.log" action="start" />
         <!--<fail unless="php_session_id_tested">#1135 no php_session_id_tested</fail>-->
         <echo>#836 $php_session_id_tested = ${php_session_id_tested} ; $basedir = ${basedir} ; 
             $dita.dir = ${dita.dir}
             $confirmAntfile.isset = ${confirmAntfile.isset} will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id} , $empty.xml = ${empty.xml}; $uuid = ${uuid} ; $uuid_tested = ${uuid_tested}</echo>
-        <echoxml file="${empty.xml}">
+        <!--<echoxml file="${empty.xml}">
             <empty>empty</empty>
-        </echoxml>
-        <property name="debug.dita-ot.dtd.catalog" refid="dita-ot.dtd.catalog"/>
+        </echoxml>-->
+        <!--<property name="debug.dita-ot.dtd.catalog" refid="dita-ot.dtd.catalog"/>-->
         <echo>#1150 php_session_id_ok.string = ${php_session_id_ok.string}; 
             $dita-ot.toolkit = ${dita-ot.toolkit}
             $debug.dita-ot.dtd.catalog = ${debug.dita-ot.dtd.catalog}</echo>
         
-        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${out_task.dita.final.out}" failonerror="true"> <!-- 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"/>
-                <attribute name="http://saxon.sf.net/feature/dtd-validation-recoverable"
-                    value="true"/>
-            </factory>
-            
-            <!--<classpath location="/opt/local/share/java/saxon.jar"/>-->
-            
-            <classpath location="/opt/local/share/java/saxon9he.jar"/>
-            <param name="out_task.dita.final" expression="${out_task.dita.final}"/>
-            <!--<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_ok.string}"/>
-            <!--<param name="basedir" expression="${basedir}"/>-->
-            <param name="temp" expression="${temp}"/>
-            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
-            <param name="simpleSchema.xml" expression="${user.dir}/${main_build_recurse_ant.dita}"/>
-            <param name="noRelatedFeatureRoot" expression="1"/>
-            <xmlcatalog refid="dita-ot.dtd.catalog"/>
-        </xslt>
+        
         
         
         <!--<copy file="${out_task.dita.final}" tofile="/tmp/test.dita" verbose="true"/>-->
@@ -1266,7 +1301,7 @@
         <record name="buildpdf_recursed_xsl_mail.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">
+    <target name="buildpdf_recursed_html5" depends="input,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">
         <!--R<property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>-->
         <exec executable="${dita.dir}" dir=".">
             <arg value="-i"/>
@@ -1310,7 +1345,7 @@
         <echo message="OUTPUT__END"/>
     </target>
     
-    <target name="buildpdf_recursed_tocjs" 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 Dynamiczną Wersję HTML">
+    <target name="buildpdf_recursed_tocjs" depends="input,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 Dynamiczną Wersję HTML">
         <property name="dita.dir" value="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
         <exec executable="${dita.dir}" dir=".">
             <arg value="-i"/>

+ 39 - 25
SE/schema/WPS_Functions/dita-ot/build.dita-ot.chm-pdf.xml

@@ -14,21 +14,25 @@
     
     <target name="all" description="build CHM and PDF" depends="input.input,chm,pdf"/>
     
-    
-    
     <target name="finally" unless="finally_exception.cond" depends="finally_cond">
-            <input addproperty="dita-ot.resultproperty.PARAM"/>
-            <echo>Finally #16  $finally_exception.cond = ${finally_exception.cond}
-                $dita-ot.resultproperty = ${dita-ot.resultproperty} 
-                $dita-ot.resultproperty.PARAM = ${dita-ot.resultproperty.PARAM} Wykonano pdf z mapy p5:file ${dita-ot.args.input.input} to ${dita-ot.output.dir.input}</echo>
-            <antcall target="p5suis.p5suis:say_to_queue.PL">
-                <param name="p5suis:say_text" value=" Wykonano pdf ${dita-ot.args.input.ditamap.title.info} z mapy p5:file ${dita-ot.args.input.input}"/>
-            </antcall>
+        <input addproperty="dita-ot.resultproperty.PARAM"/>
+        <echo>Finally #16  $finally_exception.cond = ${finally_exception.cond}
+            $dita-ot.resultproperty = ${dita-ot.resultproperty} 
+            $dita-ot.resultproperty.PARAM = ${dita-ot.resultproperty.PARAM} Wykonano pdf z mapy p5:file ${dita-ot.args.input.input} to ${dita-ot.output.dir.input}</echo>
+        <antcall target="p5suis.p5suis:say_to_queue.PL">
+            <param name="p5suis:say_text" value=" Wykonano pdf ${dita-ot.args.input.ditamap.title.info} z mapy p5:file ${dita-ot.args.input.input}"/>
+        </antcall>
         <echo append="true" file="${dita-ot.output.complete.touch}">#144 Completed  ${dita-ot.NOW} </echo>
-            <delete dir="${dita-ot.temp.input}" verbose="yes" failonerror="no"/>
-            <echo>#29 Copying file="${dita-ot.repository.pdf}" tofile="${dita-ot.local.pdf}" </echo>
-            <copy file="${dita-ot.repository.pdf}" tofile="${dita-ot.local.pdf}" failonerror="no"/>
-        </target>
+        <delete dir="${dita-ot.temp.input}" verbose="yes" failonerror="no"/>
+        <echo>#29 Copying file="${dita-ot.repository.pdf}" tofile="${dita-ot.local.pdf}" </echo>
+        <copy file="${dita-ot.repository.pdf}" tofile="${dita-ot.local.pdf}" failonerror="no"/>
+    </target>
+    
+    
+    
+    
+            
+        
     
     
     <target name="finally_cond">
@@ -46,7 +50,7 @@
             repo src $dita-ot.repository.pdf = ${dita-ot.repository.pdf}
             local dst $dita-ot.local.pdf ${dita-ot.local.pdf}
             $dita-ot.resultproperty = ${dita-ot.resultproperty} 
-            $dita-ot.outputproperty = {dita-ot.outputproperty}
+            $dita-ot.outputproperty = ${dita-ot.outputproperty}
             $dita-ot.resultproperty.PARAM = ${dita-ot.resultproperty.PARAM} nie wykonano  pdf z mapy p5:file ${dita-ot.args.input.input} to ${dita-ot.output.dir.input}</echo>
         <antcall target="p5suis.p5suis:say_to_queue.PL">
             <param name="p5suis:say_text" value="Błąd tworzenia pdf ${dita-ot.args.input.ditamap.title.info} z mapy p5:file ${dita-ot.args.input.input} 
@@ -144,9 +148,7 @@
         </echo>
     </target>
     
-    
-    
-    <target name="pdf" depends="input.input,
+    <target name="pdf.controller" depends="input.input,
         dita-ot.output.complete.touch.if_uptodate.if_exists,
         dita-ot.output.preparing.touch,
         dita-ot.output.complete.touch.if_uptodate,
@@ -154,7 +156,15 @@
         dita-ot.output.complete.touch.if_exists,
         dita-ot.output.preparing.touch.if_exists,
         dita-ot.output.error.touch.if_exists,
-        dita-ot.output.complete.touch.if_exists.message" unless="dita-ot.output.complete.touch.if_exists" description="build PDF" > <!-- ant-contrib.init -->
+        dita-ot.output.complete.touch.if_exists.message,pdf.action,finally,finally_exception" unless="dita-ot.output.complete.touch.if_exists" description="build PDF" >
+        
+    </target> 
+        
+    <target name="pdf" depends="pdf.controller"/>
+        
+    
+    
+    <target name="pdf.action"  unless="dita-ot.output.complete.touch.if_exists" description="build PDF" > <!-- ant-contrib.init -->
         <tstamp>
             <format property="dita-ot.NOW" pattern="yyyy MMMM dd HH:mm:ss" locale="en"/>
         </tstamp>
@@ -176,6 +186,8 @@
             $dita-ot.output.error.touch = ${dita-ot.output.error.touch}
             $dita-ot.current-dita-ot.toolkit = ${dita-ot.current-dita-ot.toolkit}
             $dita-ot.current-dita-ot.lib = ${dita-ot.current-dita-ot.lib}
+            $dita-ot.temp.input.errorproperty.xml = ${dita-ot.temp.input.errorproperty.xml}
+            $dita-ot.temp.input.resultproperty.xml = ${dita-ot.temp.input.resultproperty.xml}
             ####
         </echo>
         <!-- The class which could not be loaded (org.dita.dost.module.GenMapAndTopicListModule) 
@@ -241,15 +253,16 @@
                     <param name="p5suis:say_text" value="Tworzę pdf ${dita-ot.args.input.ditamap.title.info} z mapy p5:file ${dita-ot.args.input.input}"/>
                 </antcall>
                 <java dir="${dita-ot.current-dita-ot.toolkit}"
+                    
                     classname="org.apache.tools.ant.launch.Launcher"
                     classpath="${ant-launcher.jar}"
                     fork="true"
                     errorproperty="dita-ot.errorproperty"
                     resultproperty="dita-ot.resultproperty"
                     outputproperty="dita-ot.outputproperty"
-                    failonerror="true"
+                    failonerror="false"
                     maxmemory="1128m">
-                    <!--<arg value="-h"/>-->
+                    <!--<arg value="-h"/> error="${dita-ot.output.dir.input}.error.log"-->
                     
                     <arg value="-Dargs.input=${dita-ot.args.input.input}"/>
                     <arg value="-Dtranstype=pdf"/>
@@ -315,13 +328,14 @@
                     $dita-ot.resultproperty = ${dita-ot.resultproperty}
                 </echo>
                 
-                <antcall target="chm-pdf.finally">
+                <!--<antcall target="chm-pdf.finally">
                      <param name="dita-ot.resultproperty.PARAM" value="${dita-ot.resultproperty}"/>
-                 </antcall>
-                <antcall target="chm-pdf.finally_exception">
+                 </antcall>-->
+                <!--<antcall target="chm-pdf.finally_exception">
                      <param name="dita-ot.resultproperty.PARAM" value="${dita-ot.resultproperty}"/>
-                 </antcall>
-                             
+                 </antcall>-->
+            
+                <property name="dita-ot.resultproperty.PARAM" value="${dita-ot.resultproperty}"/>    
                 
                 
             <!--</finally>-->

+ 5 - 1
SE/schema/WPS_Functions/dita-ot/build_dita-ot.auto.xml

@@ -21,8 +21,12 @@
       <description> to auto make unique temp dir by $dita-ot.args.input.input</description>
       <input addproperty="dita-ot.args.input.input" message="type $dita-ot.args.input.input ditamap to generate" defaultvalue="${p5dkp.dita_root.ditamap}"/>
       
+      <fail unless="dita-ot.output.dir.input">
+         #25 not set $dita-ot.output.dir.input
+      </fail>
+      
       <property name="dita-ot.temp.input" location="${dita-ot.temp}/${dita-ot.args.input.input}"/>
-    
+      
       <!--<property name="dita-ot.temp.input.errorproperty.xml" location="${dita-ot.args.input.input}/errorproperty.xml"/>
       <property name="dita-ot.temp.input.resultproperty.xml" location="${dita-ot.args.input.input}/resultproperty.xml"/>
       <property name="dita-ot.temp.input.outputproperty.xml" location="${dita-ot.args.input.input}/outputproperty.xml"/>

+ 40 - 9
SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl

@@ -27,7 +27,7 @@
     <!--<xsl:include href="../../default_db_xml_cache.public/default_db/enter_to_ph.xsl"/>-->
     <xsl:include href="../../default_db_xml_cache.public/dita_enter_to_ph.xsl"/>
    
-    <xsl:param name="out_task.dita.final" required="yes"/>
+    <xsl:param name="out_task.dita.final"  /><!-- required="yes" -->
     <xsl:output indent="yes"  />
     <xsl:strip-space elements="*"/>
     
@@ -45,9 +45,9 @@
     <!--<xsl:param name="vrtfNamespaces_file" required="yes"/>-->
     
     <xsl:param name="username" select="'a.binder'"/>
-    <xsl:param name="username.pass"  required="yes"/>
+    <xsl:param name="username.pass"   /><!-- select="get_wfs_recurse_xsl:username.pass()" --><!-- required="yes" -->
     <xsl:param name="php_session_id_ok.string"/>
-    <xsl:param name="simpleSchema_dir" required="yes"/>
+    <xsl:param name="simpleSchema_dir" /><!-- required="yes" -->
     <xsl:param name="simpleSchema.xml" /> <!-- Optionally force simpleSchema to build map -->
     
     <xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/> <!-- TODO should be detected -->
@@ -91,6 +91,30 @@
 </wfs:Query></GetFeature>
  -->
     
+    <xsl:function name="get_wfs_recurse_xsl:out_task.dita.final">
+        <xsl:choose>
+            <xsl:when test="string-length($out_task.dita.final)&gt;0">
+                <xsl:value-of select="$out_task.dita.final"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">#100-10 get_wfs_recurse_xsl:out_task.dita.final ERROR not set required  $out_task.dita.final param ==empty;
+                </xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <xsl:function name="get_wfs_recurse_xsl:username.pass">
+        <xsl:choose>
+            <xsl:when test="string-length($username.pass)&gt;0">
+                <xsl:value-of select="$username.pass"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">#100 get_wfs_recurse_xsl:username.pass ERROR not set required  $username.pass param ==empty;
+                </xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
     
     <xsl:function name="get_wfs_recurse_xsl:GetsimpleSchema">
         <xsl:param name="typeNameRealResource"/>
@@ -120,6 +144,7 @@
         
         
         <xsl:if test="not( substring-before(system_cache__appinfo:translate_object_escaped_prefix_from_string(substring-before($typeNameRealResource,':')),':'))">
+            <xsl:message>#147 detected $simpleSchemaFile == "<xsl:value-of select="$simpleSchemaFile"/>"; </xsl:message>
             <xsl:copy-of select="doc($simpleSchemaFile)"/>
         </xsl:if>
         
@@ -547,7 +572,7 @@
         <xsl:param name="targetNamespace_DEFAULTS_prefix" select="$targetNamespace_DEFAULTS_prefix"/>
         <!--<xsl:param name="xpath_value" select="$xpath_value"/>-->
         <xsl:param name="get_wfs_recurse_xsl:xpath"/>
-        <xsl:message>#255 $typeName = <xsl:value-of select="$typeName"/>; $typeName.object = <xsl:value-of select="$typeName.object"/> </xsl:message>
+        <xsl:message>#255 $typeName = <xsl:value-of select="$typeName"/>; $typeName.object = "<xsl:value-of select="$typeName.object"/>" ; $simpleSchema.xml = "<xsl:value-of select="$simpleSchema.xml"/>"; </xsl:message>
         
         <!--<RelatedFeatureRoot>-->
             <!--<xsl:namespace name="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" select="'https://biuro.biall-net.pl/wfs/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA'"/>-->
@@ -555,11 +580,12 @@
              <xsl:variable name="get_wfs_recurse_xsl:GetsimpleSchema" >
                  <xsl:choose>
                      <xsl:when test=" string-length($simpleSchema.xml) &gt; 1">
-                         <xsl:message>#435 USING doc($simpleSchema.xml) </xsl:message>
+                         <xsl:message>#435-A USING doc($simpleSchema.xml) ="<xsl:value-of select="$simpleSchema.xml"/>" </xsl:message>
                          <xsl:copy-of select="doc($simpleSchema.xml)"/>
                      </xsl:when>
                      <xsl:when test=" string-length($typeName.object) &gt; 1"/>
                      <xsl:otherwise><!-- todo copy of or value of ?  -->
+                         <xsl:message>#435-B USING get_wfs_recurse_xsl:GetsimpleSchema($typeName) </xsl:message>
                          <xsl:copy-of select="get_wfs_recurse_xsl:GetsimpleSchema($typeName)"/>
                      </xsl:otherwise>
                  </xsl:choose>
@@ -1535,7 +1561,7 @@
                 <xsl:with-param name="REQUEST.MAXFEATURES" select="$REQUEST.MAXFEATURES"/>
             </xsl:call-template>
         </xsl:variable>
-        <xsl:message>
+        <!--<xsl:message>
             
             
             
@@ -1559,10 +1585,10 @@
             $xpath_value_dita
             <xsl:copy-of select="$xpath_value_dita"/>
             
-            <!--$input_obj_with_xpath - kontekstowy rekord
-            <xsl:copy-of select="$input_obj_with_xpath"/>-->
+            <!-\-$input_obj_with_xpath - kontekstowy rekord
+            <xsl:copy-of select="$input_obj_with_xpath"/>-\->
             
-        </xsl:message>
+        </xsl:message>-->
         <!--<xsl:variable name="url_string" select="concat($protocol,$username,':',$username.pass,'@',$api,'/',$targetNamespace_DEFAULTS_prefix,'/',$request_string)"/>-->
         <xsl:variable name="get_wfs_recurse_xsl:wfs_response" select="doc($request_string)"/>
         <xsl:if test="number($debug) &gt; 5">
@@ -1812,7 +1838,12 @@
     </xsl:template>
     
     
+    <xsl:template  match="typeName[parent::RelatedFeature]" mode="after_first_ant_assing_vars_childs"/>
+    <xsl:template  match="typeNameRealResource[parent::RelatedFeature]" mode="after_first_ant_assing_vars_childs"/>
+    
     <!-- przetwarzanie kolejne w celu podstawienia wartosci i wystawienia build dla kolejnych wezlow - problem z obsluga rownorzednie zagniezdzonych wezlow poprzez inne wezly -->
+    
+    
     <xsl:template  match="*" mode="after_first_ant_assing_vars_childs">
         <xsl:param name="xml_id_parent" required="yes"/>
         <xsl:param name="loop_xpath"   required="yes"/>

+ 2 - 0
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/GRAFIK_PRACY_view.dita

@@ -5,6 +5,8 @@
   doctype-public="-//OASIS//DTD DITA Topic//EN"
   doctype-system="topic.dtd"
   >
+  <!--doctype-public="-//OASIS//DTD DITA Map//EN"
+    doctype-system="map.dtd"-->
   <!-- Sample template to use with Procesy5 model-driven engine with Concurrent and Parallel processing   -->
   <!-- for more information see http://procesy5.pl/procesy5-wfs-api-doc/ or http://procesy5.pl/procesy5-wfs-api-doc/data_read_ant_example_with_filter.html  -->
   <!-- to be used inside Procesy5 system or separatelly in ant environment  together with following scripts:

+ 1 - 1
SE/schema/default_db_xml_cache/build_complexType.xsl

@@ -21,7 +21,7 @@
     
     
     <xsl:output indent="yes"/>
-    <xsl:param name="system_cache__appinfo:path.2863.len.limit" select="500"/>
+    <xsl:param name="system_cache__appinfo:path.2863.len.limit" select="250"/>
     <xsl:param name="debug_level_param" /><!-- select="4" -->
     
     <xsl:param name="default_db.instance.xml" required="yes"/>