poprawki

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

@@ -40,7 +40,7 @@
     <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="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="ID"/> <!-- to be set initially like as key to search ID  -->
+    <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  -->
     
     <!-- variables to first transform of doc for then get related features -->
@@ -50,6 +50,7 @@
  
     <!--<tempfile property="uuid" deleteonexit="yes"/>-->
     <tempfile property="out_task.dita" deleteonexit="no"  destdir="temp"/>
+    <tempfile property="out_task.dita.final" deleteonexit="no"  destdir="temp"/>
     <tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />
     
     
@@ -86,8 +87,8 @@
             <param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>
             <param name="uuid" expression="${uuid}"/>
             
-            <param name="out_task.dita" expression="${out_task.dita}"/>
-            <param name="wfs_output" expression="${wfs_output}"/>
+            <!--<param name="out_task.dita" expression="${out_task.dita}"/>-->
+            <param name="wfs_output" expression=""/>
             
             <param name="api_url" expression="${api_url}"/>
             <!--<param name="namespace_prefix" expression="${namespace_prefix}"/>--> 
@@ -102,8 +103,8 @@
         <!-- 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 ">
-        <xslt basedir="./" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${out_task.dita}" >
+    <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 ">
+        <xslt basedir="./" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${out_task.dita.final}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -116,7 +117,7 @@
     </target>
 
 
-    <target name="get_related_feature">
+    <!--<target name="get_related_feature">
         <exec executable="curl"  output="${wfs_output}" errorproperty="wfs_error" resultproperty="wfs_result">
             <arg line="-H 'Authorization: Basic ${passwordBase64Basic}' ${url}"/>
         </exec>
@@ -131,7 +132,7 @@
         </exec>
         <echo message="ERROR__END"/>
         
-    </target>
+    </target>-->
 
 
     <target name="buildpdf_recursed" depends="build_recurse_ant_merge_dita_from_temp.xsl">
@@ -139,9 +140,9 @@
         <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}" />
-            <arg value="-t" />
-            <arg value="temp" />
+            <arg value="${out_task.dita.final}" />
+           <!-- <arg value="-t" />
+            <arg value="temp" />-->
             <arg value="-f" />
             <arg value="pdf"/>
             <arg value="-o"/>
@@ -149,7 +150,7 @@
         </exec>
         <exec  executable="bash" dir="." outputproperty="out_task_file">
             <arg value="-c"/>
-            <arg value="echo ${out_task.dita} |sed 's/^.*\///'"/>
+            <arg value="echo ${out_task.dita.final} |sed 's/^.*\///'"/>
         </exec>
         <echo message="OUTPUT__START"/>        
         <!--<echo> url = ${url} 
@@ -176,12 +177,12 @@
     </target>
 
 
-    <target name="buildpdf" depends="get_related_feature">
-        <xslt basedir="./" style="IN7_DZIENNIK_KORESP.xsl" in="${wfs_output}"  destdir="./" out="${out_task.dita}" >
+    <!--<target name="buildpdf" depends="get_related_feature">
+        <xslt basedir="./" style="IN7_DZIENNIK_KORESP.xsl" in="${wfs_output}"  destdir="./" out="${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/initialMode" value="PROCES_INCLUDE"/>-->
-                <!--<attribute name="http://saxon.sf.net/feature/initialTemplate" value="Types__x3A__xlsx__x3A__main"/>-->
+                <!-\-<attribute name="http://saxon.sf.net/feature/initialMode" value="PROCES_INCLUDE"/>-\->
+                <!-\-<attribute name="http://saxon.sf.net/feature/initialTemplate" value="Types__x3A__xlsx__x3A__main"/>-\->
             </factory>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <param name="dita_task_template_file_param" expression="main.dita"/>
@@ -200,14 +201,14 @@
             <arg value="echo ${out_task.dita} |sed 's/^.*\///'"/>
         </exec>
         <echo message="OUTPUT__START"/>        
-        <!--<echo> url = ${url} 
-        </echo>-->
-        <!--<echo> passwordBase64Basic = ${passwordBase64Basic} 
-        </echo>-->
-        <!--<echo> $webRootUrl = ${webRootUrl} 
-        </echo>-->
-        <!--<echo> $wfs_output = ${wfs_output} 
-        </echo>-->
+        <!-\-<echo> url = ${url} 
+        </echo>-\->
+        <!-\-<echo> passwordBase64Basic = ${passwordBase64Basic} 
+        </echo>-\->
+        <!-\-<echo> $webRootUrl = ${webRootUrl} 
+        </echo>-\->
+        <!-\-<echo> $wfs_output = ${wfs_output} 
+        </echo>-\->
         <echo>
             &lt;br&gt;Wygenerowano druk pdf - sciagnij go &lt;a href=&quot;${webRootUrl}/out/${out_task_file}.pdf&quot;&gt; &quot;${webRootUrl}/out/${out_task_file}.pdf&lt;/a&gt;&lt;/br&gt; 
         </echo>
@@ -221,7 +222,7 @@
             &lt;br&gt;Umieść swój podpis graficzny (W przygotowaniu)&lt;/br&gt; 
         </echo>
         <echo message="OUTPUT__END"/>
-    </target>
+    </target>-->
     
     
 </project>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xsl

@@ -21,7 +21,7 @@
     <xsl:param name="url" />
     <xsl:param name="webRootUrl" /> 
     
-    <xsl:param name="out_task.dita"/> <!-- nazwa temp docelowego zrodla do wykonania pliku pdf -->
+    <!--<xsl:param name="out_task.dita"/>--> <!-- nazwa temp docelowego zrodla do wykonania pliku pdf -->
     <!--<xsl:param name="current_leaf.dita" required="yes"/>--> <!-- nazwa aktualnego przetowarzenia .dita - najpierw main_build_recurse_ant.dita potem przechodzi w  1.1.root_x2f_IN7_DZIENNIK_KORESP.1.dita.xml -->
     <!--<xsl:param name="wfs_output" select="concat('temp/wfs_output.',$uuid)"/>-->
                     <!-- jak parametr jest to znaczy, ze przetwarzamy  -->
@@ -220,8 +220,8 @@
                                     </xsl:otherwise>
                                 </xsl:choose>
                                 
-                                <tempfile property="out_task.dita" deleteonexit="no"  destdir="temp"/>
-                                    <tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />
+                                <!--<tempfile property="out_task.dita" deleteonexit="no"  destdir="temp"/>-->
+                                    <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->
                                     <xsl:element name="exec">
                                         <xsl:attribute name="executable" select="'curl'"/>
                                         <xsl:attribute name="output"  select="concat('temp/',$wfs_output.xml)"/>