todo dita merge z dita map

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/build.xml

@@ -33,7 +33,7 @@
         -DtypeName="p5_default_db:IN7_DZIENNIK_KORESP" 
         -Dxpath=ID -Dxpath_value=1000 
         -Duuid=1 -DwebRootUrl=somePathDir-->
-    <property name="basedir"  value="${basedir}"/> <!-- do ustalenia glownego katalogu -->
+    <property name="basedir"  value="${basedir}" /> <!-- do ustalenia glownego katalogu -->
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
     <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
@@ -49,17 +49,17 @@
     <property name="api_url" value="https://biuro.biall-net.pl/SE/version-git/wfs-data.php"/>
     <property name="namespace_prefix" value="p5_default_db"/> <!-- ex: p5_default_db to complete after p5_default_db:IN7_DZIENNIK_KORESP -->
     <property name="namespace_prefix_p5_tr_map" value="default_db"/> <!-- do przetowrzenia w nazwie pliku docelowej element-default_db__x3A__CRM_PROCES__x3A__CRM_PROCES oraz dla detect_resource_type_dir -->
-    <property name="typeName" value="${typeName}"/> <!-- to be set initially ex: p5_default_db:IN7_DZIENNIK_KORESP - be careful not to give it in apostrophs like 'p5_default_db:IN7_DZIENNIK_KORESP' - it wont work! -->
-    <property name="xpath" value="${xpath}"/> <!-- to be set initially like as key to search ID  -->
-    <property name="xpath_value" value="${xpath_value}"/> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
-    <property name="xpath_query" value="${xpath_query}"/> <!-- limit input by example: xpath_query="[position()&lt;3] limit RelatedFeatures; [not(local-name()='PROCES_INIT')] - to limit tree level -->
+    <property name="typeName" value="${typeName}" /> <!-- to be set initially ex: p5_default_db:IN7_DZIENNIK_KORESP - be careful not to give it in apostrophs like 'p5_default_db:IN7_DZIENNIK_KORESP' - it wont work! -->
+    <property name="xpath" value="${xpath}"  /> <!-- to be set initially like as key to search ID  -->
+    <property name="xpath_value" value="${xpath_value}" /> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
+    <property name="xpath_query" value="${xpath_query}" /> <!-- limit input by example: xpath_query="[position()&lt;3] limit RelatedFeatures; [not(local-name()='PROCES_INIT')] - to limit tree level -->
     
     
     <property name="ignore_maxOccurs_0" value="1"/> <!-- When element has maxOccurs=0 do not try to retrieve him to limit tree -->
     
     <property name="loop_path_recurs" value=""/>  <!-- w przypadku podania, system powinien w tym katalogu zapisywac wynik xml dzialania, azeby odbudowac rekursywne drzewo - zapisujemy po system_cache__appinfo:id np bedzie ${temp}/${uuid}_CRM_PROCES___d14e4479-1_PROCES_BEN/  -->
-    <property name="temp_name" value="temp"/> <!-- temp files-->
-    <property name="temp" value="${basedir}/${temp_name}${loop_path_recurs}"/> <!-- temp files-->
+    <property name="temp_name" value="temp" /> <!-- temp files-->
+    <property name="temp" value="${basedir}/${temp_name}${loop_path_recurs}" /> <!-- temp files-->
     
     <property name="xpath_query.xsl" value="${basedir}/${temp_name}/${uuid}.xpath_query.xsl"/>
     <property name="empty.xml" value="${basedir}/${temp_name}/${uuid}.empty.xml"/>
@@ -67,10 +67,11 @@
     <!--<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"   value="${temp}/${uuid}.out_task.dita.final"/>
-    <property name="out_task.dita.final_with_RelatedFeatureLoop_no_path"   value="${temp_name}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop"/>
-    <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${temp}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop"/>
+    <property name="out_task.dita"  value="${temp}/${uuid}.out_task_dita" />
+    <property name="out_task.dita.final"   value="${temp}/${uuid}_out_task_dita_final.dita" />
+    <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="${temp_name}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
+    <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${temp}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
     
      <!-- do zrobienia  -->
     <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->
@@ -113,12 +114,12 @@
     </target>
     <target name="typeName_check" depends="typeName_cond,typeName_ok,typeName_fail"/>
     <target name="typeName_ok"   unless="${typeName_set}" >
-        <property name="typeName_tested" value="${typeName}"/>
+        <property name="typeName_tested" value="${typeName}"  />
     </target>
     <target name="typeName_fail"  if="${typeName_set}" >
         <echo>typeName setting manually</echo>
         <input addproperty="typeName_input" message="podaj typeName  - nazwa obiektu  np:  nazwe obiektu np CRM_PROCES "/>
-        <property name="typeName_tested" value="p5_default_db:${typeName_input}"/>
+        <property name="typeName_tested" value="p5_default_db:${typeName_input}"  />
     </target>
     
     <!-- xpath -->
@@ -132,7 +133,7 @@
     </target>
     <target name="xpath_check" depends="xpath_cond,xpath_ok,xpath_fail"/>
     <target name="xpath_ok"   unless="${xpath_set}" >
-        <property name="xpath_tested" value="${xpath}"/>
+        <property name="xpath_tested" value="${xpath}"  />
     </target>
     <target name="xpath_fail"  if="${xpath_set}" >
         <echo>xpath setting </echo>
@@ -150,7 +151,7 @@
     </target>
     <target name="xpath_value_check" depends="xpath_value_cond,xpath_value_ok,xpath_value_fail"/>
     <target name="xpath_value_ok"   unless="${xpath_value_set}" >
-        <property name="xpath_value_tested" value="${xpath_value}"/>
+        <property name="xpath_value_tested" value="${xpath_value}"  />
     </target>
     <target name="xpath_value_fail"  if="${xpath_value_set}" >
         <echo>xpath_value setting </echo>
@@ -169,7 +170,7 @@
     </target>
     <target name="passwordBase64Basic_check" depends="passwordBase64Basic_cond,passwordBase64Basic_ok,passwordBase64Basic_fail"/>
     <target name="passwordBase64Basic_ok"   unless="${passwordBase64Basic_set}" >
-        <property name="passwordBase64Basic_tested" value="${passwordBase64Basic}"/>
+        <property name="passwordBase64Basic_tested" value="${passwordBase64Basic}"  />
     </target>
     <target name="passwordBase64Basic_fail"  if="${passwordBase64Basic_set}" >
         <echo>passwordBase64Basic setting </echo>
@@ -218,8 +219,8 @@
         <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} ;  </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"/>
+        <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"  />
         <condition property="test_if_dita" taskname="check_dita" >
             <available file="${main_build_recurse_ant.dita}"/>  
         </condition>
@@ -254,7 +255,7 @@
                         <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ;  </echo>
                                     
                         <property name="main_build_recurse_ant.dita_with_id" value="${simpleSchema_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.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"/>
+                        <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"  />
                         
                         
                         <condition property="test_if_tr_map" taskname="check_tr_map" >
@@ -296,7 +297,7 @@
                         <!--<echo message="OUTPUT__END"/>-->
                     </target>
     
-        <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="xml_recursed_from_tr_map" description="URL_TASK Pobierz XML">
+        <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="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" />-->
@@ -420,7 +421,7 @@
     </target>
    
    
-    <target name="clean_temp_dir" description="URL_TASK Target clean_temp_dir">
+    <target name="clean_temp_dir" description="URL_TASK Wyczyść cache modułu ">
         <delete includeemptydirs="yes">
             <fileset dir="${temp}"/>
         </delete>        
@@ -471,12 +472,12 @@
     <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
     <target name="build_recurse_ant.xml" depends="php_session_id_check,xpath_query.xsl,xpath_query.xsl_fail,main_build_recurse_ant.dita_with_id,main_build_recurse_ant.tr_map_with_id">
         <!-- build do wytworzenia pierwszego przetworzenia zagniezdzen -->
-        <property name="loop_xpath"  value="root"/>
-        <property name="build_recurse_ant.xml" value="${temp}/${uuid_tested}.build_${loop_xpath}.xml"/>
+        <property name="loop_xpath"  value="root" />
+        <property name="build_recurse_ant.xml" value="${temp}/${uuid_tested}.build_${loop_xpath}.xml" />
         <echo>#113 ant build_recurse_ant.xml=${build_recurse_ant.xml}; </echo>
-        <!--<delete file="${build_recurse_ant.xml}"/>-->
         <record name="ant.log" loglevel="verbose" append="true" />
-            <xslt basedir="./" style="${build_recurse_ant.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}"  >
+            <!--<delete file="${build_recurse_ant.xml}"/>-->
+        <xslt basedir="./" style="${build_recurse_ant.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}"  >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -553,7 +554,7 @@
         <echo> zapisalem plik gotowy do utworzenia dita do ${out_task.dita.final}. </echo>
     </target>
     
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="xml_recursed_from_tr_map" description="URL_TASK Pobierz HTML">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="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" />-->
@@ -658,7 +659,9 @@
         </echo>
         <echo message="OUTPUT__END"/>
     </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 html5">
+     
+    
+    <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">
         <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"/>
@@ -670,11 +673,11 @@
             <arg value="-o"/>
             <arg value="out"/>
         </exec>
-        <exec  executable="bash" dir="." outputproperty="out_task_file">
+        
+<!--<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"/>        
+            <arg value="echo ${out_task.dita.final.html} |sed 's/^.*\///'"/>
+        </exec>-->                <echo message="OUTPUT__START"/>        
         <!--<echo> url = ${url} 
         </echo>-->
         <!--<echo> passwordBase64Basic = ${passwordBase64Basic_tested} 
@@ -683,10 +686,14 @@
         </echo>-->
         <!--<echo> $wfs_output = ${wfs_output} 
         </echo>-->
+        <!--<loadfile property="out_task_file.loadfile" srcfile="out/${out_task_file}"></loadfile>-->
         <echo>
             &lt;br&gt;Wygenerowano druk html - sciagnij go &lt;a href=&quot;${webRootUrl}/out/${out_task_file}.html&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/out/${out_task_file}.html&lt;/a&gt;&lt;/br&gt; 
+        &lt;
+&gt;        
+&lt;br&gt;Dodaj do korespondencji (W przygotowaniu)            &lt;/br&gt; 
         </echo>
-        <echo>
+        <!-- <echo>
             &lt;br&gt;Dodaj do korespondencji (W przygotowaniu)&lt;/br&gt; 
         </echo>
         <echo>
@@ -694,6 +701,50 @@
         </echo>
         <echo>
             &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
+        </echo>-->
+        <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">
+        <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"/>
+            <arg value="${out_task.dita.final}" />
+            <!-- <arg value="-t" />
+            <arg value="temp" />-->
+            <arg value="-f" />
+            <arg value="tocjs"/>
+            <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.html} |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>-->
+        <!--<loadfile property="out_task_file.loadfile" srcfile="out/${out_task_file}"></loadfile>-->
+        <echo>
+            &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&quot;${webRootUrl}/out/${out_task.dita.final.html}&quot; target=&quot;_blank&quot;&gt; 
+&quot;        &lt;/a&gt;&lt;/br&gt;
         </echo>
+        <!-- <echo>
+            &lt;br&gt;Dodaj do korespondencji (W przygotowaniu)&lt;/br&gt; 
+        </echo>
+        <echo>
+            &lt;br&gt;Wyślij do adresatów emailem (W przygotowaniu)&lt;/br&gt; 
+        </echo>
+        <echo>
+            &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
+        </echo>-->
         <echo message="OUTPUT__END"/>
-    </target></project>
+    </target>
+    
+</project>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/build.xml

@@ -33,7 +33,7 @@
         -DtypeName="p5_default_db:IN7_DZIENNIK_KORESP" 
         -Dxpath=ID -Dxpath_value=1000 
         -Duuid=1 -DwebRootUrl=somePathDir-->
-    <property name="basedir"  value="${basedir}"/> <!-- do ustalenia glownego katalogu -->
+    <property name="basedir"  value="${basedir}" /> <!-- do ustalenia glownego katalogu -->
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
     <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
@@ -49,17 +49,17 @@
     <property name="api_url" value="https://biuro.biall-net.pl/SE/version-git/wfs-data.php"/>
     <property name="namespace_prefix" value="p5_default_db"/> <!-- ex: p5_default_db to complete after p5_default_db:IN7_DZIENNIK_KORESP -->
     <property name="namespace_prefix_p5_tr_map" value="default_db"/> <!-- do przetowrzenia w nazwie pliku docelowej element-default_db__x3A__CRM_PROCES__x3A__CRM_PROCES oraz dla detect_resource_type_dir -->
-    <property name="typeName" value="${typeName}"/> <!-- to be set initially ex: p5_default_db:IN7_DZIENNIK_KORESP - be careful not to give it in apostrophs like 'p5_default_db:IN7_DZIENNIK_KORESP' - it wont work! -->
-    <property name="xpath" value="${xpath}"/> <!-- to be set initially like as key to search ID  -->
-    <property name="xpath_value" value="${xpath_value}"/> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
-    <property name="xpath_query" value="${xpath_query}"/> <!-- limit input by example: xpath_query="[position()&lt;3] limit RelatedFeatures; [not(local-name()='PROCES_INIT')] - to limit tree level -->
+    <property name="typeName" value="${typeName}" /> <!-- to be set initially ex: p5_default_db:IN7_DZIENNIK_KORESP - be careful not to give it in apostrophs like 'p5_default_db:IN7_DZIENNIK_KORESP' - it wont work! -->
+    <property name="xpath" value="${xpath}"  /> <!-- to be set initially like as key to search ID  -->
+    <property name="xpath_value" value="${xpath_value}" /> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
+    <property name="xpath_query" value="${xpath_query}" /> <!-- limit input by example: xpath_query="[position()&lt;3] limit RelatedFeatures; [not(local-name()='PROCES_INIT')] - to limit tree level -->
     
     
     <property name="ignore_maxOccurs_0" value="1"/> <!-- When element has maxOccurs=0 do not try to retrieve him to limit tree -->
     
     <property name="loop_path_recurs" value=""/>  <!-- w przypadku podania, system powinien w tym katalogu zapisywac wynik xml dzialania, azeby odbudowac rekursywne drzewo - zapisujemy po system_cache__appinfo:id np bedzie ${temp}/${uuid}_CRM_PROCES___d14e4479-1_PROCES_BEN/  -->
-    <property name="temp_name" value="temp"/> <!-- temp files-->
-    <property name="temp" value="${basedir}/${temp_name}${loop_path_recurs}"/> <!-- temp files-->
+    <property name="temp_name" value="temp" /> <!-- temp files-->
+    <property name="temp" value="${basedir}/${temp_name}${loop_path_recurs}" /> <!-- temp files-->
     
     <property name="xpath_query.xsl" value="${basedir}/${temp_name}/${uuid}.xpath_query.xsl"/>
     <property name="empty.xml" value="${basedir}/${temp_name}/${uuid}.empty.xml"/>
@@ -67,10 +67,11 @@
     <!--<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"   value="${temp}/${uuid}.out_task.dita.final"/>
-    <property name="out_task.dita.final_with_RelatedFeatureLoop_no_path"   value="${temp_name}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop"/>
-    <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${temp}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop"/>
+    <property name="out_task.dita"  value="${temp}/${uuid}.out_task_dita" />
+    <property name="out_task.dita.final"   value="${temp}/${uuid}_out_task_dita_final.dita" />
+    <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="${temp_name}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
+    <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${temp}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
     
      <!-- do zrobienia  -->
     <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->
@@ -113,12 +114,12 @@
     </target>
     <target name="typeName_check" depends="typeName_cond,typeName_ok,typeName_fail"/>
     <target name="typeName_ok"   unless="${typeName_set}" >
-        <property name="typeName_tested" value="${typeName}"/>
+        <property name="typeName_tested" value="${typeName}"  />
     </target>
     <target name="typeName_fail"  if="${typeName_set}" >
         <echo>typeName setting manually</echo>
         <input addproperty="typeName_input" message="podaj typeName  - nazwa obiektu  np:  nazwe obiektu np CRM_PROCES "/>
-        <property name="typeName_tested" value="p5_default_db:${typeName_input}"/>
+        <property name="typeName_tested" value="p5_default_db:${typeName_input}"  />
     </target>
     
     <!-- xpath -->
@@ -132,7 +133,7 @@
     </target>
     <target name="xpath_check" depends="xpath_cond,xpath_ok,xpath_fail"/>
     <target name="xpath_ok"   unless="${xpath_set}" >
-        <property name="xpath_tested" value="${xpath}"/>
+        <property name="xpath_tested" value="${xpath}"  />
     </target>
     <target name="xpath_fail"  if="${xpath_set}" >
         <echo>xpath setting </echo>
@@ -150,7 +151,7 @@
     </target>
     <target name="xpath_value_check" depends="xpath_value_cond,xpath_value_ok,xpath_value_fail"/>
     <target name="xpath_value_ok"   unless="${xpath_value_set}" >
-        <property name="xpath_value_tested" value="${xpath_value}"/>
+        <property name="xpath_value_tested" value="${xpath_value}"  />
     </target>
     <target name="xpath_value_fail"  if="${xpath_value_set}" >
         <echo>xpath_value setting </echo>
@@ -169,7 +170,7 @@
     </target>
     <target name="passwordBase64Basic_check" depends="passwordBase64Basic_cond,passwordBase64Basic_ok,passwordBase64Basic_fail"/>
     <target name="passwordBase64Basic_ok"   unless="${passwordBase64Basic_set}" >
-        <property name="passwordBase64Basic_tested" value="${passwordBase64Basic}"/>
+        <property name="passwordBase64Basic_tested" value="${passwordBase64Basic}"  />
     </target>
     <target name="passwordBase64Basic_fail"  if="${passwordBase64Basic_set}" >
         <echo>passwordBase64Basic setting </echo>
@@ -218,8 +219,8 @@
         <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} ;  </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"/>
+        <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"  />
         <condition property="test_if_dita" taskname="check_dita" >
             <available file="${main_build_recurse_ant.dita}"/>  
         </condition>
@@ -254,7 +255,7 @@
                         <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ;  </echo>
                                     
                         <property name="main_build_recurse_ant.dita_with_id" value="${simpleSchema_dir}/${namespace_prefix_p5_tr_map}/${main_build_recurse_ant.tr_map_sed}.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"/>
+                        <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"  />
                         
                         
                         <condition property="test_if_tr_map" taskname="check_tr_map" >
@@ -296,7 +297,7 @@
                         <!--<echo message="OUTPUT__END"/>-->
                     </target>
     
-        <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="xml_recursed_from_tr_map" description="URL_TASK Pobierz XML">
+        <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="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" />-->
@@ -420,7 +421,7 @@
     </target>
    
    
-    <target name="clean_temp_dir" description="URL_TASK Target clean_temp_dir">
+    <target name="clean_temp_dir" description="URL_TASK Wyczyść cache modułu ">
         <delete includeemptydirs="yes">
             <fileset dir="${temp}"/>
         </delete>        
@@ -471,12 +472,12 @@
     <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
     <target name="build_recurse_ant.xml" depends="php_session_id_check,xpath_query.xsl,xpath_query.xsl_fail,main_build_recurse_ant.dita_with_id,main_build_recurse_ant.tr_map_with_id">
         <!-- build do wytworzenia pierwszego przetworzenia zagniezdzen -->
-        <property name="loop_xpath"  value="root"/>
-        <property name="build_recurse_ant.xml" value="${temp}/${uuid_tested}.build_${loop_xpath}.xml"/>
+        <property name="loop_xpath"  value="root" />
+        <property name="build_recurse_ant.xml" value="${temp}/${uuid_tested}.build_${loop_xpath}.xml" />
         <echo>#113 ant build_recurse_ant.xml=${build_recurse_ant.xml}; </echo>
-        <!--<delete file="${build_recurse_ant.xml}"/>-->
         <record name="ant.log" loglevel="verbose" append="true" />
-            <xslt basedir="./" style="${build_recurse_ant.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}"  >
+            <!--<delete file="${build_recurse_ant.xml}"/>-->
+        <xslt basedir="./" style="${build_recurse_ant.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}"  >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -553,7 +554,7 @@
         <echo> zapisalem plik gotowy do utworzenia dita do ${out_task.dita.final}. </echo>
     </target>
     
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="xml_recursed_from_tr_map" description="URL_TASK Pobierz HTML">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="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" />-->
@@ -658,7 +659,9 @@
         </echo>
         <echo message="OUTPUT__END"/>
     </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 html5">
+     
+    
+    <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">
         <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"/>
@@ -670,11 +673,11 @@
             <arg value="-o"/>
             <arg value="out"/>
         </exec>
-        <exec  executable="bash" dir="." outputproperty="out_task_file">
+        
+<!--<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"/>        
+            <arg value="echo ${out_task.dita.final.html} |sed 's/^.*\///'"/>
+        </exec>-->                <echo message="OUTPUT__START"/>        
         <!--<echo> url = ${url} 
         </echo>-->
         <!--<echo> passwordBase64Basic = ${passwordBase64Basic_tested} 
@@ -683,10 +686,14 @@
         </echo>-->
         <!--<echo> $wfs_output = ${wfs_output} 
         </echo>-->
+        <!--<loadfile property="out_task_file.loadfile" srcfile="out/${out_task_file}"></loadfile>-->
         <echo>
             &lt;br&gt;Wygenerowano druk html - sciagnij go &lt;a href=&quot;${webRootUrl}/out/${out_task_file}.html&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/out/${out_task_file}.html&lt;/a&gt;&lt;/br&gt; 
+        &lt;
+&gt;        
+&lt;br&gt;Dodaj do korespondencji (W przygotowaniu)            &lt;/br&gt; 
         </echo>
-        <echo>
+        <!-- <echo>
             &lt;br&gt;Dodaj do korespondencji (W przygotowaniu)&lt;/br&gt; 
         </echo>
         <echo>
@@ -694,6 +701,50 @@
         </echo>
         <echo>
             &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
+        </echo>-->
+        <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">
+        <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"/>
+            <arg value="${out_task.dita.final}" />
+            <!-- <arg value="-t" />
+            <arg value="temp" />-->
+            <arg value="-f" />
+            <arg value="tocjs"/>
+            <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.html} |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>-->
+        <!--<loadfile property="out_task_file.loadfile" srcfile="out/${out_task_file}"></loadfile>-->
+        <echo>
+            &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&quot;${webRootUrl}/out/${out_task.dita.final.html}&quot; target=&quot;_blank&quot;&gt; 
+&quot;        &lt;/a&gt;&lt;/br&gt;
         </echo>
+        <!-- <echo>
+            &lt;br&gt;Dodaj do korespondencji (W przygotowaniu)&lt;/br&gt; 
+        </echo>
+        <echo>
+            &lt;br&gt;Wyślij do adresatów emailem (W przygotowaniu)&lt;/br&gt; 
+        </echo>
+        <echo>
+            &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
+        </echo>-->
         <echo message="OUTPUT__END"/>
-    </target></project>
+    </target>
+    
+</project>