|
|
@@ -39,7 +39,11 @@
|
|
|
<!--<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 -->
|
|
|
- <xsl:param name="wfs_output" required="no"/> <!-- potem wfs_output.xml jak sciagnie nazwa temp sciagniecia z api xml forsowana przez pierwsze sciagniecie -->
|
|
|
+ <xsl:param name="recurse_ant_basedir" required="yes"/> <!-- aktualny katalog gdzie znajduja sie pliki temp -->
|
|
|
+
|
|
|
+
|
|
|
+ <xsl:param name="recurse_ant_basedir.temp" required="yes"/>
|
|
|
+ <xsl:param name="recurse_ant" required="yes"/><xsl:param name="wfs_output" required="no"/> <!-- potem wfs_output.xml jak sciagnie nazwa temp sciagniecia z api xml forsowana przez pierwsze sciagniecie -->
|
|
|
<xsl:param name="api_url" required="yes"/>
|
|
|
<!--<xsl:param name="namespace_prefix" select="'p5_default_db'"/>-->
|
|
|
<xsl:param name="typeName" required="yes" /> <!-- to be set initially ex: p5_default_db:IN7_DZIENNIK_KORESP -->
|
|
|
@@ -86,7 +90,8 @@
|
|
|
to wyzwolenie powinno juz zrobic ant_buildy "dla kolejnego X'
|
|
|
to wyzwolenie korzysta z apply-templates wyzwolenia glownego, w celu przygotowania ant_build
|
|
|
-->
|
|
|
- <xsl:template match="*">
|
|
|
+ <xsl:param name="simpleSchema_dir" required="yes"/>
|
|
|
+ <xsl:param name="default_db_xml_cache.public" required="yes"/><xsl:template match="*">
|
|
|
<xsl:param name="typeName" select="$typeName" />
|
|
|
<xsl:param name="xpath" select="$xpath" />
|
|
|
<xsl:param name="xpath_value" select="$xpath_value" />
|
|
|
@@ -165,7 +170,7 @@
|
|
|
</xsl:choose>
|
|
|
</xsl:variable>
|
|
|
<xsl:message>#71 wstawiam projekt $feature_pos=<xsl:value-of select="$feature_pos"/>; $loop_xpath=<xsl:value-of select="$loop_xpath"/>; </xsl:message>
|
|
|
- <project basedir="../." name="get_related_feature{$loop_xpath_real}" default="get_related_feature_run_child_ant_if{$loop_xpath_real}">
|
|
|
+ <project basedir="{$recurse_ant_basedir}" name="get_related_feature{$loop_xpath_real}" default="get_related_feature_run_child_ant_if{$loop_xpath_real}">
|
|
|
|
|
|
<!--
|
|
|
get_related_feature_run_child_ant{$loop_xpath_real} - domyslny przed 2017-03-28-->
|
|
|
@@ -220,7 +225,15 @@
|
|
|
<xsl:attribute name="value" select="$ignore_maxOccurs_0"/>
|
|
|
</xsl:element>
|
|
|
|
|
|
- <xsl:comment>
|
|
|
+ <xsl:element name="property">
|
|
|
+ <xsl:attribute name="name" select="'default_db:recurse_ant_basedir'"/>
|
|
|
+ <xsl:attribute name="value" select="'.'"/>
|
|
|
+ </xsl:element>
|
|
|
+
|
|
|
+ <property name="simpleSchema_dir" value="{$simpleSchema_dir}"/>
|
|
|
+ <property name="default_db_xml_cache.public" value="{$default_db_xml_cache.public}"/>
|
|
|
+
|
|
|
+ <property name="temp" value="{$temp}"/><xsl:comment>
|
|
|
Important variables:
|
|
|
typeName=<xsl:value-of select="$typeName"/>;
|
|
|
xpath=<xsl:value-of select="$xpath"/>;
|
|
|
@@ -493,7 +506,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
- <project basedir="{$basedir}" name="get_related_feature{$loop_xpath_real}_{$loop_path_recurs}" default="get_related_feature_run_child_ant_if_query_{$loop_xpath_real}_{$loop_path_recurs}"> <!-- get_related_feature_run_child_ant{$loop_xpath_real}_{$loop_path_recurs -->
|
|
|
+ <project basedir="{$recurse_ant_basedir.temp}{$loop_path_recurs}" name="get_related_feature{$loop_xpath_real}_{$loop_path_recurs}" default="get_related_feature_run_child_ant_if_query_{$loop_xpath_real}_{$loop_path_recurs}"> <!-- get_related_feature_run_child_ant{$loop_xpath_real}_{$loop_path_recurs -->
|
|
|
<!-- default przed 2017-03-28 concat('get_related_feature_run_child_ant_if_query_',$loop_xpath_real,'_',$loop_path_recurs)
|
|
|
get_related_feature_run_child_ant{$loop_xpath_real}_{$loop_path_recurs} -->
|
|
|
<xsl:comment>RelatedFeatureCount:<xsl:value-of select="count(*)"/></xsl:comment>
|
|
|
@@ -551,7 +564,26 @@
|
|
|
<xsl:attribute name="value" select="$ignore_maxOccurs_0"/>
|
|
|
</xsl:element>
|
|
|
|
|
|
- <xsl:comment>
|
|
|
+ <xsl:element name="property">
|
|
|
+ <xsl:attribute name="name" select="'default_db:recurse_ant_basedir'"/>
|
|
|
+ <xsl:attribute name="value" select="$recurse_ant_basedir"/>
|
|
|
+ </xsl:element>
|
|
|
+ <xsl:element name="property">
|
|
|
+ <xsl:attribute name="name" select="'default_db:recurse_ant'"/>
|
|
|
+ <xsl:attribute name="value" select="$recurse_ant"/>
|
|
|
+ </xsl:element>
|
|
|
+ <xsl:element name="property">
|
|
|
+ <xsl:attribute name="name" select="'default_db:recurse_ant_basedir.temp'"/>
|
|
|
+ <xsl:attribute name="value" select="$recurse_ant_basedir.temp"/>
|
|
|
+ </xsl:element>
|
|
|
+
|
|
|
+ <property name="simpleSchema_dir" value="{$simpleSchema_dir}"/>
|
|
|
+ <property name="default_db_xml_cache.public" value="{$default_db_xml_cache.public}"/>
|
|
|
+
|
|
|
+ <xsl:element name="property">
|
|
|
+ <xsl:attribute name="name" select="'temp'"/>
|
|
|
+ <xsl:attribute name="value" select="concat($recurse_ant_basedir.temp,$loop_path_recurs)"/>
|
|
|
+ </xsl:element><xsl:comment>
|
|
|
Important variables:
|
|
|
typeName=<xsl:value-of select="$typeName"/>;
|
|
|
xpath=<xsl:value-of select="$xpath"/>;
|
|
|
@@ -597,7 +629,7 @@
|
|
|
<xsl:element name="tempfile">
|
|
|
<xsl:attribute name="property" select="concat('get_related_feature_run_child_ant_xpath_test',$loop_xpath_real,'_',$loop_path_recurs,'_temp')"/>
|
|
|
<xsl:attribute name="deleteonexit" select="'no'"/>
|
|
|
- <xsl:attribute name="destdir" select="$temp"/>
|
|
|
+ <xsl:attribute name="destdir" select="concat($recurse_ant_basedir.temp,$loop_path_recurs)"/>
|
|
|
<xsl:attribute name="suffix" select="'.xml'"/>
|
|
|
<xsl:attribute name="prefix" select="concat('__test_featureID_name_dita_',$featureID_name_dita)"/>
|
|
|
</xsl:element>
|
|
|
@@ -608,15 +640,15 @@
|
|
|
<xsl:element name="tempfile">
|
|
|
<xsl:attribute name="property" select="concat('get_related_feature_run_child_ant_xpath_test_out',$loop_xpath_real,'_',$loop_path_recurs,'_temp')"/>
|
|
|
<xsl:attribute name="deleteonexit" select="'no'"/>
|
|
|
- <xsl:attribute name="destdir" select="$temp"/>
|
|
|
+ <xsl:attribute name="destdir" select="concat($recurse_ant_basedir.temp,$loop_path_recurs)"/>
|
|
|
<xsl:attribute name="suffix" select="'.xml'"/>
|
|
|
<xsl:attribute name="prefix" select="concat('__test_featureID_name_dita_out_',$featureID_name_dita)"/>
|
|
|
</xsl:element>
|
|
|
<xsl:element name="xslt">
|
|
|
- <xsl:attribute name="basedir" select="'./'"/>
|
|
|
+ <xsl:attribute name="basedir" select="concat($recurse_ant_basedir.temp,$loop_path_recurs)"/>
|
|
|
<xsl:attribute name="style" select="$xpath_query.xsl"/>
|
|
|
<xsl:attribute name="in" select="concat('${get_related_feature_run_child_ant_xpath_test',$loop_xpath_real,'_',$loop_path_recurs,'_temp}')"/>
|
|
|
- <xsl:attribute name="destdir" select="'./'"/>
|
|
|
+ <xsl:attribute name="destdir" select="concat($recurse_ant_basedir.temp,$loop_path_recurs)"/>
|
|
|
<xsl:attribute name="out" select="concat('${get_related_feature_run_child_ant_xpath_test_out',$loop_xpath_real,'_',$loop_path_recurs,'_temp}')"/>
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
|
|
|
@@ -658,7 +690,7 @@
|
|
|
<!--<tempfile property="test_child_curl_ouptut.xml"/>--> <!-- todo deleteonexit=yes -->
|
|
|
<xsl:element name="tempfile">
|
|
|
<xsl:attribute name="property" select="concat('get_related_feature_run_child_ant',$loop_xpath_real,'_',$loop_path_recurs,'_temp')" />
|
|
|
- <xsl:attribute name="destdir" select="$temp"/>
|
|
|
+ <xsl:attribute name="destdir" select="concat($recurse_ant_basedir.temp,$loop_path_recurs)"/>
|
|
|
<xsl:attribute name="prefix" select="'test_if_exec_child_ant-'"/>
|
|
|
<xsl:attribute name="suffix" select="'.xml'"/>
|
|
|
</xsl:element>
|
|
|
@@ -713,7 +745,7 @@
|
|
|
<xsl:attribute name="depends" select="concat('get_related_feature_run_child_ant',$loop_xpath_real,'_',$loop_path_recurs,'_check')"/>
|
|
|
<xsl:attribute name="if" select="concat('${get_related_feature_run_child_ant',$loop_xpath_real,'_',$loop_path_recurs,'_test}')"/>
|
|
|
|
|
|
- <ant antfile="{$basedir}/build.xml" target="xml_recursed_from_tr_map"/>
|
|
|
+ <ant antfile="{$recurse_ant_basedir}/build.xml" target="xml_recursed_from_tr_map"/>
|
|
|
</xsl:element>
|
|
|
<!-- na koniec przetwarzania danego zaglebienia uruchamiamy calosc ponownie do kolejnego zaglebienia -->
|
|
|
<!-- task do polaczenia zaglebien -->
|
|
|
@@ -764,10 +796,10 @@
|
|
|
<xsl:attribute name="prefix" select="concat('${uuid}.builds_to_ant-loop_test_featureID_name_dita_out',@xml_id,'-')"/>
|
|
|
</xsl:element>
|
|
|
<xsl:element name="xslt">
|
|
|
- <xsl:attribute name="basedir" select="'./'"/>
|
|
|
+ <xsl:attribute name="basedir" select="$temp"/>
|
|
|
<xsl:attribute name="style" select="$xpath_query.xsl"/>
|
|
|
<xsl:attribute name="in" select="concat('${builds_to_ant__test_query__featureID_name_dita.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
- <xsl:attribute name="destdir" select="'./'"/>
|
|
|
+ <xsl:attribute name="destdir" select="$temp"/>
|
|
|
<xsl:attribute name="out" select="concat('${builds_to_ant__test_query__featureID_name_dita_out.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
|
|
|
@@ -804,10 +836,10 @@
|
|
|
<builds_to_ant>${builds_to_ant<xsl:value-of select="concat($loop_xpath_real,@xml_id)"/>}</builds_to_ant>
|
|
|
</xsl:element>
|
|
|
<xsl:element name="xslt">
|
|
|
- <xsl:attribute name="basedir" select="'./'"/>
|
|
|
+ <xsl:attribute name="basedir" select="$temp"/>
|
|
|
<xsl:attribute name="style" select="$builds_to_ant.xsl"/>
|
|
|
<xsl:attribute name="in" select="concat('${builds_to_ant.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
- <xsl:attribute name="destdir" select="'./'"/>
|
|
|
+ <xsl:attribute name="destdir" select="$temp"/>
|
|
|
<xsl:attribute name="out" select="concat('${builds_to_ant_file.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
|
|
|
@@ -849,7 +881,7 @@
|
|
|
<xsl:comment>
|
|
|
#590 LOOP BEGIN ; @maxOccurs=<xsl:value-of select="@system_cache__appinfo:maxOccurs"/>; </xsl:comment>
|
|
|
<echo> #523 RelatedFeatureLoop @maxOccurs=<xsl:value-of select="@system_cache__appinfo:maxOccurs"/>; ant bede odpalac w podkatalogu:@xml_id=(<xsl:value-of select="@xml_id"/>)
|
|
|
- <xsl:value-of select="concat($temp,'/',@xml_id,'/',$uuid,'.build_',$loop_xpath,'_x2f_.',@xml_id,'.',substring-after(@typeName,':'),'.1.xml')"/> </echo>
|
|
|
+ <xsl:value-of select="concat($temp,'/',@xml_id,'/',$uuid,'.build_',$loop_xpath_real,'_x2f_.',@xml_id,'.',substring-after(@typeName,':'),'.1.xml')"/> </echo>
|
|
|
<xsl:message>#591 todo executing by exec instead of ant without inheritAll because it's looping!!! </xsl:message>
|
|
|
|
|
|
|
|
|
@@ -874,10 +906,10 @@
|
|
|
<xsl:attribute name="prefix" select="concat('${uuid}.builds_to_ant-loop_test_featureID_name_dita_out',@xml_id,'-')"/>
|
|
|
</xsl:element>
|
|
|
<xsl:element name="xslt">
|
|
|
- <xsl:attribute name="basedir" select="'./'"/>
|
|
|
+ <xsl:attribute name="basedir" select="$temp"/>
|
|
|
<xsl:attribute name="style" select="$xpath_query.xsl"/>
|
|
|
<xsl:attribute name="in" select="concat('${builds_to_ant__test_query__featureID_name_dita.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
- <xsl:attribute name="destdir" select="'./'"/>
|
|
|
+ <xsl:attribute name="destdir" select="$temp"/>
|
|
|
<xsl:attribute name="out" select="concat('${builds_to_ant__test_query__featureID_name_dita_out.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
|
|
|
@@ -914,10 +946,10 @@
|
|
|
<builds_to_ant>${builds_to_ant<xsl:value-of select="concat($loop_xpath_real,@xml_id)"/>}</builds_to_ant>
|
|
|
</xsl:element>
|
|
|
<xsl:element name="xslt">
|
|
|
- <xsl:attribute name="basedir" select="'./'"/>
|
|
|
+ <xsl:attribute name="basedir" select="$temp"/>
|
|
|
<xsl:attribute name="style" select="$builds_to_ant.xsl"/>
|
|
|
<xsl:attribute name="in" select="concat('${builds_to_ant.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
- <xsl:attribute name="destdir" select="'./'"/>
|
|
|
+ <xsl:attribute name="destdir" select="$temp"/>
|
|
|
<xsl:attribute name="out" select="concat('${builds_to_ant_file.xml',$loop_xpath_real,@xml_id,'}')"/>
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
|
|
|
@@ -1115,7 +1147,7 @@
|
|
|
$temp is <xsl:value-of select="$temp"/>;</echo>
|
|
|
<xsl:comment> teraz podmieniamy dane z otrzymanego xmla do pliku dita aby potem zrobic polaczony plik w kolejnym wyzwoleniu ant</xsl:comment>
|
|
|
<delete file="{$temp}/{$wfs_output.dita}.vals.dita"/>
|
|
|
- <xslt basedir="./" style="{$build_recurse_ant.xsl}" in="{$temp}/{$wfs_output.dita}" destdir="./" out="{$temp}/{$wfs_output.dita}.vals.dita" >
|
|
|
+ <xslt basedir="." style="{$build_recurse_ant.xsl}" in="{$temp}/{$wfs_output.dita}" destdir="./" out="{$temp}/{$wfs_output.dita}.vals.dita" >
|
|
|
<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="after_first_ant_assing_vars"/>
|
|
|
@@ -1129,10 +1161,12 @@
|
|
|
<param name="typeName" expression="{$typeName}"/><!-- kontrolnie - nie potrzebne -->
|
|
|
<param name="uuid" expression="{$uuid}"/>
|
|
|
<param name="basedir" expression="{$basedir}"/>
|
|
|
- <param name="build_recurse_ant.xsl" expression="{$build_recurse_ant.xsl}"/>
|
|
|
+ <param name="recurse_ant_basedir" expression="{$recurse_ant_basedir}"/>
|
|
|
+ <param name="recurse_ant_basedir.temp" expression="{$recurse_ant_basedir.temp}"/>
|
|
|
+ <param name="recurse_ant" expression="{$recurse_ant}"/><param name="build_recurse_ant.xsl" expression="{$build_recurse_ant.xsl}"/>
|
|
|
<param name="passwordBase64Basic" expression="{$passwordBase64Basic}"/>
|
|
|
<param name="feature_pos" expression="{$feature_pos}"/> <!-- aby wsadzic nr wezla do $wfs_output.dita.vals.dita -->
|
|
|
- <param name="build_recurse_ant.xsl" expression="{$build_recurse_ant.xsl}"/>
|
|
|
+
|
|
|
<param name="temp" expression="{$temp}"/>
|
|
|
<param name="builds_to_ant.xsl" expression="{$builds_to_ant.xsl}"/>
|
|
|
<param name="cookie_curl_option" expression="{$cookie_curl_option}"/>
|
|
|
@@ -1142,7 +1176,8 @@
|
|
|
<param name="xpath_query" expression="{$xpath_query}"/>
|
|
|
<param name="xpath_query.xsl" expression="{$xpath_query.xsl}"/>
|
|
|
<param name="empty.xml" expression="{$empty.xml}"/>
|
|
|
- </xslt>
|
|
|
+ <param name="simpleSchema_dir" expression="{$simpleSchema_dir}"/>
|
|
|
+ <param name="default_db_xml_cache.public" expression="{$default_db_xml_cache.public}"/></xslt>
|
|
|
</xsl:element>
|
|
|
<!-- zapisujemy wynik naszego biezacego przetwarzania dita element nizej do kolejnego przejechania z ant wyniku dla podstawienia danych -->
|
|
|
<!-- blad - result jest po tym template -->
|