.

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

@@ -17,17 +17,9 @@
     -->
 
 
-    <property name="INPUT" value="Test_z_getfeature_do_parse.xml"/>
-    <tempfile property="tmp.xml" destdir="temp" deleteonexit="yes"/>
-    <tempfile property="Test_z_getfeature_do_parse__noxml.xml" destdir="temp" deleteonexit="yes"/>
-    <tempfile property="main__noxml.dita" destdir="temp" deleteonexit="yes"/>
-    <tempfile property="Test_z_getfeature_do_parse__noxml.xml" destdir="temp" deleteonexit="yes"/>
-    <tempfile property="main__noxml.dita" destdir="temp" deleteonexit="yes"/>
-    <tempfile property="out_task.dita" deleteonexit="yes" />
-    <!--<tempfile destdir="out.dita" deleteonexit="yes"/>-->
-    <!--<delete file="tmp.xml"/>
-    <delete file="Test_z_getfeature_do_parse__noxml.xml"/>
-    <delete file="main__noxml.dita"/>-->
+    
+    <tempfile property="out_task.dita" deleteonexit="no" />
+  
 
 
     <!--<if>
@@ -53,9 +45,6 @@
         <echo message="${wfs_error}"/>
         <echo message="ERROR__END"/>
         
-        
-        
-        
     </target>
 
 
@@ -63,27 +52,13 @@
     <target name="buildpdf" depends="get_related_feature">
 
         
-        <!-- przyklad z uzywaniem saxona ktorego wczesniej trzeba pobrac z port install saxon -->
-        <xslt style="copy-no-xml.xsl" in="${wfs_result}" out="${Test_z_getfeature_do_parse__noxml.xml}"> <!-- {Test_z_getfeature_do_parse__noxml.xml"-->
-            <factory name="net.sf.saxon.TransformerFactoryImpl">
-                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
-            </factory>
-            <classpath location="/opt/local/share/java/saxon9he.jar"/>
-        </xslt>
-        <xslt style="copy-no-xml.xsl" in="main.dita" out="${main__noxml.dita}"/>
-        <concat destfile="${tmp.xml}" append="true" encoding="UTF-8" >
-            <string>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-                &lt;root&gt;</string>
-            <file file="${Test_z_getfeature_do_parse__noxml.xml}"  />
-            <file file="${main__noxml.dita}"/>
-            <string>&lt;/root&gt;</string>
-        </concat>
-        <xslt basedir="./" style="IN7_DZIENNIK_KORESP.xsl" in="${tmp.xml}"  destdir="./" out="${out_task.dita}" >
-            <factory name="net.sf.saxon.TransformerFactoryImpl">
+        <xslt basedir="./" style="IN7_DZIENNIK_KORESP.xsl" in="${wfs_result}"  destdir="./" out="${out_task.dita}" >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-        </xslt>
+            <param name="dita_task_template_file_param" expression="main.dita"/>
+        </xslt> 
         <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"/>
@@ -93,18 +68,24 @@
             <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} |sed 's/^.*\///'"/>
         </exec>
+        
+        <!--<propertyregex  property="out_file" input="${out_task.dita}" regexp="$.*/(.*)" select="\1."/>-->
+        <!--<loadfile property="result" srcFile="out/${out_task_file}.pdf"/>-->
+        <!--<echo message="input was : ${input}"/>-->
+        <!--<echo message="${result}"/>-->
+        
 
         <!--<propertyregex  property="out_file" input="${out_task.dita}" regexp="$.*/(.*)" select="\1."/>-->
         <!--<loadfile property="result" srcFile="out/${out_task_file}.pdf"/>-->
         <!--<echo message="input was : ${input}"/>-->
         <!--<echo message="OUTPUT_PDF_FILE: out/${out_task_file}.pdf"/>-->
         <echo>
-            <br>Wygenerowano druk pdf - sciagnij go <a href="${out_task_file}"> ${out_task_file}</a></br> 
+            <br>Wygenerowano druk pdf - sciagnij go <a href="out/${out_task_file}.pdf"> out/${out_task_file}.pdf</a></br> 
         </echo>
         
     </target>