a.binder 9 anni fa
parent
commit
7f8cb3ef6b

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

@@ -108,6 +108,7 @@
             <param name="loop_xpath" expression="root"/><!-- xpath sciezki przetwarzania xmla -->
             <param name="loop_xpath" expression="root"/><!-- xpath sciezki przetwarzania xmla -->
             <param name="loop_xpath_save" expression="${loop_xpath}"/>
             <param name="loop_xpath_save" expression="${loop_xpath}"/>
             <param name="current_leaf.dita" expression="${main_build_recurse_ant.dita_with_id}"/>
             <param name="current_leaf.dita" expression="${main_build_recurse_ant.dita_with_id}"/>
+            <param name="basedir" expression="${basedir}"/>
         </xslt>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <ant  antfile="${build_recurse_ant.xml}" dir="."/>
         <ant  antfile="${build_recurse_ant.xml}" dir="."/>

+ 4 - 2
SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -26,6 +26,7 @@
     <xsl:param name="passwordBase64Basic" required="yes" />
     <xsl:param name="passwordBase64Basic" required="yes" />
     <xsl:param name="url" />
     <xsl:param name="url" />
     <xsl:param name="webRootUrl" /> 
     <xsl:param name="webRootUrl" /> 
+    <xsl:param name="basedir" required="yes"/> <!-- aktualny katalog gdzie znajduja sie pliki temp -->
     
     
     <!--<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="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 -->
@@ -58,7 +59,7 @@
                 <xsl:variable name="RelatedFeatureCount" select="last()"/>
                 <xsl:variable name="RelatedFeatureCount" select="last()"/>
                 <xsl:variable name="RelatedFeaturePos" select="position()"/>
                 <xsl:variable name="RelatedFeaturePos" select="position()"/>
                 <xsl:variable name="featureID_name" select="substring-after($typeName,':')"/>
                 <xsl:variable name="featureID_name" select="substring-after($typeName,':')"/>
-                <xsl:message>#58 bylo $loop_xpath=<xsl:value-of select="$loop_xpath"/>;</xsl:message>
+                <xsl:message>#58 bylo $loop_xpath=<xsl:value-of select="$loop_xpath"/>; $basedir=<xsl:value-of select="$basedir"/>; </xsl:message>
                 <xsl:variable name="loop_xpath">
                 <xsl:variable name="loop_xpath">
                     <xsl:choose>
                     <xsl:choose>
                         <xsl:when test="$loop_xpath='root'">
                         <xsl:when test="$loop_xpath='root'">
@@ -303,13 +304,14 @@
                                                 <attribute name="http://saxon.sf.net/feature/initialMode" value="after_first_ant_assing_vars"/>
                                                 <attribute name="http://saxon.sf.net/feature/initialMode" value="after_first_ant_assing_vars"/>
                                             </factory>
                                             </factory>
                                             <classpath location="/opt/local/share/java/saxon9he.jar"/>
                                             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-                                            <param name="wfs_output" expression="temp/{$wfs_output.xml}"/>
+                                            <param name="wfs_output" expression="{$basedir}/temp/{$wfs_output.xml}"/>
                                             <param name="xpath" expression="{$xpath}" /> <!-- kontrolnie - nie potrzebne -->
                                             <param name="xpath" expression="{$xpath}" /> <!-- kontrolnie - nie potrzebne -->
                                             <param name="xpath_value" expression="{$xpath_value}" /> <!-- kontrolnie - nie potrzebne -->
                                             <param name="xpath_value" expression="{$xpath_value}" /> <!-- kontrolnie - nie potrzebne -->
                                             <param name="loop_xpath" expression="{$loop_xpath}"/>
                                             <param name="loop_xpath" expression="{$loop_xpath}"/>
                                             <param name="loop_xpath_save" expression="{$loop_xpath_save}"/>
                                             <param name="loop_xpath_save" expression="{$loop_xpath_save}"/>
                                             <param name="typeName" expression="{$typeName}"/><!-- kontrolnie - nie potrzebne -->
                                             <param name="typeName" expression="{$typeName}"/><!-- kontrolnie - nie potrzebne -->
                                             <param name="uuid" expression="{$uuid}"/>
                                             <param name="uuid" expression="{$uuid}"/>
+                                            <param name="basedir" expression="{$basedir}"/>
                                         <param name="passwordBase64Basic" expression="{$passwordBase64Basic}"/>
                                         <param name="passwordBase64Basic" expression="{$passwordBase64Basic}"/>
                                     </xslt>
                                     </xslt>
                             </xsl:element>
                             </xsl:element>