to sql path

SE/dev/php-cli/build.xml

@@ -48,11 +48,19 @@
             <property name="joins_asText_xml.xml" value="joins_asText_xml.xml"/> 
             <!-- sciezki -->
             <property name="edge_joins_filled_paths.xml" value="edge_joins_filled_paths.xml"/>
+             <property name="edge_joins_filled_paths" value="edge_joins_filled_paths"/> <!-- katalog do zapisywania sciezek -->
+              
+              
+              
+          
+            <property name="build_edge_paths_with_PE_controll_loop.xml" value="build_edge_paths_with_PE_controll_loop.xml"/>
+             <property name="build_edge_paths_with_PE_controll_loop.xsl" value="build_edge_paths_with_PE_controll_loop.xsl"/>
     
             <property name="edge_paths_with_PE.xsl" value="edge_paths_with_PE.xsl"/><!-- stary-->
                 <property name="edge_paths_with_PE_controll_to_PE.xsl" value="edge_paths_with_PE_controll_to_PE.xsl"/>
                 <property name="edge_paths_with_PE_controll.xsl" value="edge_paths_with_PE_controll.xsl"/><!-- nowy point matrix-->   
-                <property name="edge_paths_with_PE_controll_temp" value="edge_paths_with_PE_controll_temp"/> <!-- do oszukania silnika aby korzystac z petli i przekazywac dane do siebie -->
+                <property name="edge_paths_with_PE_controll_temp" value="edge_paths_with_PE_controll_temp"/>
+                <property name="edge_paths_with_PE_controll_paths_temp" value="edge_paths_with_PE_controll_paths_temp"/><!-- do oszukania silnika aby korzystac z petli i przekazywac dane do siebie -->
                 <property name="edge_paths_with_PE_controll_temp.alias" value="edge_paths_with_PE_controll_temp.alias"/>
     
             <property name="edge_paths_with_PE_controll.xml" value="edge_paths_with_PE_controll.xml"/>  
@@ -67,6 +75,11 @@
             <property name="biale_put_Cables_to_PE.php" value="biale_put_Cables_to_PE.php"/>
     
     
+    
+    <!--<include file="${build_edge_paths_with_PE_controll_loop.xml}" optional=""/>-->
+    
+    
+    
     <target description="shows options for project" name="help">
         <echo> Generator for telecomunications objects - concentrations points based on constraints of prices of cable and cost of cocentrators (PE).
             This parameters are set by variables:   Set variables ( ex. sh# ant -DPE_Price=2500 -DCable_Price=3 -Dlogic=grouped PE_and_Cables -Dmax_combinate_groups_elements=12 ) 
@@ -127,14 +140,8 @@
         <delete file="${edge_joins.xml}"/>
         <antcall target="edge_joins.xml"/>
         
-        <delete file="${edge_joins_filled_paths.xml}"/>
-        <antcall target="edge_joins_filled_paths_make"/>
-        
-        <antcall target="edge_paths_with_PE_controll.xml"/>
-        <antcall target="edge_paths_with_PE.xml"/>
-        
-        <antcall target="biale_plamy_put_PE_to_mysql_php"/>
-        
+       
+     
         <!--<antcall target="biale_plamy_class_findWay.php"/>-->
         <antcall target="PE_and_Cables"/>
     </target>
@@ -206,6 +213,18 @@
     
     
     <target name="PE_and_Cables" depends="check_files_for_PE_and_Cables">
+        
+        <delete file="${edge_joins_filled_paths.xml}"/>
+        <antcall target="edge_joins_filled_paths_make"/>
+        <antcall target="biale_put_xml_paths_to_mysql.php"/>
+        <antcall target="build_edge_paths_with_PE_controll_loop.xml"/>
+        <antcall target="build_edge_paths_with_PE_controll_loop.xml_run"/>
+        
+        <!--<antcall target="edge_paths_with_PE_controll.xml"/>--><!-- to rem  -->
+        <antcall target="edge_paths_with_PE.xml"/><!-- to do - zmienic aby z kolekcji pojechalo z build_edge_paths_with_PE_controll_loop.xml_run  -->
+        
+        <antcall target="biale_plamy_put_PE_to_mysql_php"/>
+        
         <antcall target="edge_paths_with_PE_controll.xml"/>
         <antcall target="edge_paths_with_PE.xml"/>
         <antcall target="biale_plamy_put_PE_to_mysql_php"/>
@@ -307,9 +326,10 @@
         
      </target>
     
-    <target name="edge_joins_filled_paths_make">
+    <target name="edge_joins_filled_paths_make" description="przygotowanie sciezek do parsowania przez ${edge_paths_with_PE_controll.xsl}, male sciezki do katalogu ${edge_joins_filled_paths} oraz zbudowanie zadania do build ">
         <echo message="przygotownie ${edge_joins_filled_paths.xml} z joins2ways xsl biale_plamy_joins2ways_do_paths.xsl pod katem 1  katem 1-elementowych subarrayow aby zrobic paths "/>
         <delete file="${edge_joins_filled_paths.xml}"/>
+        <delete dir="${edge_joins_filled_paths}"/>
         <xslt basedir="./" style="${edge_joins_filled_paths_make.xsl}" in="${edge_joins.xml}"  destdir="./" out="${edge_joins_filled_paths.xml}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
@@ -321,9 +341,42 @@
             <param name="joins_asText_xml.xml" expression="${joins_asText_xml.xml}"/>
             <param name="ways2joins.xml" expression="${ways2joins.xml}"/>
             <param name="joins2ways_z_ID_Way.xml" expression="${joins2ways_z_ID_Way.xml}"/>
+            <param name="edge_joins_filled_paths" expression="${edge_joins_filled_paths}"/>
+        </xslt>
+
+    </target>
+    
+    <target name="build_edge_paths_with_PE_controll_loop.xml">
+        <!-- zrobimy builda dla edge_path_control -->
+        <delete file="${build_edge_paths_with_PE_controll_loop.xml}"/>
+        <xslt basedir="./" style="${build_edge_paths_with_PE_controll_loop.xsl}" in="${edge_joins_filled_paths.xml}"  destdir="./" out="${build_edge_paths_with_PE_controll_loop.xml}" >
+            <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="DITA_PARSE_templ"/>-->
+                <!--<attribute name="http://saxon.sf.net/feature/initialTemplate" value="asd"/>-->
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <param name="edge_paths_with_PE_controll_temp" expression="${edge_paths_with_PE_controll_temp}"/>
+            <param name="edge_paths_with_PE_controll_temp.alias" expression="${edge_paths_with_PE_controll_temp.alias}"/>
+            <param name="edge_paths_with_PE_controll.xsl" expression="${edge_paths_with_PE_controll.xsl}"/>
+            <param name="edge_paths_with_PE_controll.xml" expression="${edge_paths_with_PE_controll.xml}"/>
+            <param name="edge_paths_with_PE_controll_paths_temp" expression="${edge_paths_with_PE_controll_paths_temp}"/> <!-- miejsce na temp drogi -->
+            <param name="edge_joins_filled_paths" expression="${edge_joins_filled_paths}"/>
+            <param name="PE_Price" expression="${PE_Price}"/>
+            <param name="Cable_Price" expression="${Cable_Price}"/>
+            <param name="max_combinate_groups_elements" expression="${max_combinate_groups_elements}"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
+            <param name="logic" expression="${logic}"/>
         </xslt>
     </target>
     
+    <target name="build_edge_paths_with_PE_controll_loop.xml_run">
+        <subant target="edge_paths_with_PE_controll_loop">
+            <file file="build_edge_paths_with_PE_controll_loop.xml"/>
+        </subant>
+        <!--<include file="${build_edge_paths_with_PE_controll_loop.xml}"/>
+        <ant antfile="${build_edge_paths_with_PE_controll_loop.xml}"/>-->
+    </target>
+    
     <target name="biale_put_xml_paths_to_mysql.php">
         <echo message="za pomoca ${biale_plamy_class_findWay.php} wkladam plik: ${edge_joins_filled_paths.xml} do bazy mysql "></echo>
         <exec executable="php" failonerror="true" dir=".">
@@ -364,33 +417,40 @@
         
         <delete file="${edge_paths_with_PE_controll.xml}"/>
         
-        <delete dir="${edge_paths_with_PE_controll_temp}"/>
-        <delete dir="${edge_paths_with_PE_controll_temp.alias}"/>
+         <delete dir="${edge_paths_with_PE_controll_temp}"/>
+         <delete dir="${edge_paths_with_PE_controll_temp.alias}"/>
          <mkdir dir="${edge_paths_with_PE_controll_temp}"/>
          <symlink link="${edge_paths_with_PE_controll_temp.alias}" resource="${edge_paths_with_PE_controll_temp}"/>
         
-        <xslt basedir="./" style="${edge_paths_with_PE_controll.xsl}" in="${edge_joins_filled_paths.xml}"  destdir="./" out="${edge_paths_with_PE_controll.xml}" >
-            
-            <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="DITA_PARSE_templ"/>-->
-                <!--<attribute name="http://saxon.sf.net/feature/initialTemplate" value="asd"/>-->
-            </factory>
-            <classpath location="/opt/local/share/java/saxon9he.jar"/>
-            <param name="edge_paths_with_PE.xml" expression="${edge_paths_with_PE.xml}"/>
-            <param name="edge_paths_with_PE_controll_temp" expression="${edge_paths_with_PE_controll_temp}"/>
-            <param name="edge_paths_with_PE_controll_temp.alias" expression="${edge_paths_with_PE_controll_temp.alias}"/>
-            
-            
-            <param name="PE_Price" expression="${PE_Price}"/>
-            <param name="Cable_Price" expression="${Cable_Price}"/>
-            <param name="max_combinate_groups_elements" expression="${max_combinate_groups_elements}"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
-            <param name="logic" expression="${logic}"/>
-            <!--<xsl:param name="logic" select="'sorted'"/>--> <!-- tutaj robi grupy ale analizyje w grupie tylko wazniejsze/bardziej oblozone wezly -->
-            
-            
-        </xslt>
+                <xslt basedir="./" style="${edge_paths_with_PE_controll.xsl}" in="${edge_joins_filled_paths.xml}"  destdir="./" out="${edge_paths_with_PE_controll.xml}" >
+                   <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="DITA_PARSE_templ"/>-->
+                       <!--<attribute name="http://saxon.sf.net/feature/initialTemplate" value="asd"/>-->
+                   </factory>
+                   <classpath location="/opt/local/share/java/saxon9he.jar"/>
+                   <!--<param name="edge_paths_with_PE.xml" expression="${edge_paths_with_PE.xml}"/>-->
+                   <param name="edge_paths_with_PE_controll_temp" expression="${edge_paths_with_PE_controll_temp}"/>
+                   <param name="edge_paths_with_PE_controll_temp.alias" expression="${edge_paths_with_PE_controll_temp.alias}"/>
+                   <param name="PE_Price" expression="${PE_Price}"/>
+                   <param name="Cable_Price" expression="${Cable_Price}"/>
+                   <param name="max_combinate_groups_elements" expression="${max_combinate_groups_elements}"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
+                   <param name="logic" expression="${logic}"/>
+                   <!--<xsl:param name="logic" select="'sorted'"/>--> <!-- tutaj robi grupy ale analizyje w grupie tylko wazniejsze/bardziej oblozone wezly -->
+               </xslt>
     </target>
+    
+    
+    <!--<target name="edge_paths_with_PE_controll_loop">
+        <echo>todo wyzwolic to w petli dla edge_joins_filled_paths posortowanych od najstarszych do najmlodszych plikow</echo>
+        <xmlproperty file="${edge_joins_filled_paths_sorted.xml}"/>  
+        <!-\-<for list="${item.key}" param="item">
+            <sequential>
+                <echo>The item  id is </echo>
+            </sequential>
+        </for>-\->
+        
+    </target>-->
    
    
     <target name="edge_paths_with_PE.xml">