a.binder hace 9 años
padre
commit
d1c4af0ae3

+ 6 - 5
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build.xml

@@ -70,6 +70,7 @@
     <!--<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.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" />
     
@@ -661,7 +662,7 @@
     </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 HTML">
+    <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"/>
@@ -673,10 +674,10 @@
             <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>
+            <arg value="echo ${out_task.dita.final.html} |sed 's/^.*\///'"/>
+        </exec>-->
         <echo message="OUTPUT__START"/>        
         <!--<echo> url = ${url} 
         </echo>-->
@@ -688,7 +689,7 @@
         </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;br&gt;Wygenerowano druk html - sciagnij go &lt;a href=&quot;${webRootUrl}/out/${out_task.dita.final.html}&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/out/${out_task.dita.final.html}&lt;/a&gt;&lt;/br&gt;
             &lt;br&gt; $webRootUrl to ${webRootUrl}
             &lt;br&gt; $out_task.dita.final to ${out_task.dita.final}
             &lt;br&gt; $out_task_file to ${out_task_file}