Просмотр исходного кода

+more debug, parallel zabija glowny proces? od niedawna

a.binder 9 лет назад
Родитель
Сommit
39922f6036

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

@@ -630,6 +630,7 @@
                             <xsl:attribute name="property" select="concat('get_related_feature_run_child_ant_xpath_test_loadfile',$loop_xpath_real,'_',$loop_path_recurs,'_temp')"/>
                             <xsl:attribute name="srcfile" select="concat('${get_related_feature_run_child_ant_xpath_test_out',$loop_xpath_real,'_',$loop_path_recurs,'_temp}')"/>
                         </xsl:element>
+                        <echo>#633 test xpath_query.xsl ${<xsl:value-of select="concat('get_related_feature_run_child_ant_xpath_test_loadfile',$loop_xpath_real,'_',$loop_path_recurs,'_temp')"/>} ;</echo>
                         <condition >
                             <xsl:attribute name="taskname" select="concat('get_related_feature_run_child_ant_if_query_',$loop_xpath_real,'_',$loop_path_recurs)"/>
                             <xsl:attribute name="property" select="concat('get_related_feature_run_child_ant_xpath_test_loadfile_check',$loop_xpath_real,'_',$loop_path_recurs,'_temp')"/>
@@ -824,7 +825,7 @@
             </xsl:element>-->
             <param name="default_antfile" expression="{$temp}/{$uuid}.build_{$loop_xpath}_x2f_.{@xml_id}.{ substring-after(@typeName,':') }.1.xml"/>
             <param name="xpath_query" expression="{$xpath_query}"/> <!-- limit related TODO -->
-            <param name="xpath_query.xsl" expression="{$xpath_query.xsl}"/>
+            <!--<param name="xpath_query.xsl" expression="{$xpath_query.xsl}"/>-->
             <param name="featureID_name_dita" expression="{$featureID_name_dita}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xsl:element>
@@ -933,7 +934,7 @@
             </xsl:element>-->
             <param name="default_antfile" expression="{$temp}/{$uuid}.build_{$loop_xpath}_x2f_.{@xml_id}.{ substring-after(@typeName,':') }.1.xml"/>
             <param name="xpath_query" expression="{$xpath_query}"/>
-            <param name="xpath_query.xsl" expression="{$xpath_query.xsl}"/>
+            <!--<param name="xpath_query.xsl" expression="{$xpath_query.xsl}"/>-->
             <param name="featureID_name_dita" expression="{$featureID_name_dita}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xsl:element>
@@ -1081,7 +1082,7 @@
                                 </xsl:choose>
                                 
                                
-                                
+                                <echo>#1084 exec curl for $typeNameRealResource=<xsl:value-of select="$typeNameRealResource"/> and $xpath_dita=<xsl:value-of select="$xpath_dita"/>; and $xpath_value_dita=<xsl:value-of select="$xpath_value_dita"/>; </echo>
                                 
                                 <!--<tempfile property="out_task.dita" deleteonexit="no"  destdir="temp"/>-->
                                     <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->

+ 16 - 7
SE/schema/default_db_xml_cache.public/builds_to_ant.xsl

@@ -70,6 +70,7 @@
                             #    
                             builds_to_ant - uruchomienie ANT w parallel  temp/<xsl:value-of select="."/>;
                             $xpath_query=<xsl:value-of select="$xpath_query"/>;
+                            $xpath_query_test/xpath_query_test=<xsl:value-of select="$xpath_query_test/xpath_query_test"/>;
                             $featureID_name_dita<xsl:value-of select="$featureID_name_dita"/>;
                             #
                             #
@@ -79,19 +80,26 @@
                                 <java>
                                     <xsl:attribute name="classname" select="'org.apache.tools.ant.Main'"/>
                                     <!--<xsl:attribute name="dir" select="'${basedir}'"/>-->
-                                    <!--<xsl:attribute name="dir" select="'${basedir}'"/>-->
-                                    <!--<xsl:attribute name="fork" select="'false'"/>-->
-                                    <xsl:attribute name="clonevm" select="'false'"/>
+                                    <!--<xsl:attribute name="fork" select="'true'"/>-->
+                                    <xsl:attribute name="clonevm" select="'true'"/>
                                     <xsl:attribute name="failonerror" select="'true'"/>
-                                    <xsl:attribute name="append" select="'true'"/>
-                                    <!--<xsl:attribute name="resultproperty" select="concat(.,'_resprop')"/>-->
-                                    <!--<xsl:attribute name="output" select="concat(.,'_out.log')"/>-->
+                                    <!--<xsl:attribute name="append" select="'false'"/>-->
+                                    <xsl:attribute name="resultproperty" select="concat(.,'_resprop')"/>
+                                    <xsl:attribute name="output" select="concat(.,'_out.log')"/>
                                     <arg value="-buildfile"/>
                                     <arg value="{$temp}/{.}"/>
                                 </java>
                             </xsl:for-each>
                         </parallel>
-                        
+                        <echo>#
+                            #
+                            #
+                            #
+                            #94 i run all PARALLEL TASKS - should wait some time!
+                            #
+                            #
+                            #
+                            #</echo>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:message> SECOND AND NEXT LEVEL ANT is executed in normal </xsl:message>
@@ -143,6 +151,7 @@
                             #
                             builds_to_ant - PARALLEL RUN  za chwile uruchomie antfile  LOOP exec <xsl:value-of select="concat($temp,'/',.)"/>/build_root.xml ;
                             $xpath_query=<xsl:value-of select="$xpath_query"/>;
+                            $xpath_query_test/xpath_query_test=<xsl:value-of select="$xpath_query_test/xpath_query_test"/>;
                             $featureID_name_dita<xsl:value-of select="$featureID_name_dita"/>;
                             #
                             #