kosmetyka

SE/dev/php-cli/build__biale_plamy.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
     xmlns:bp="https://procesy5.pl/biale_plamy-schema.xsd"
-    basedir="." name="biale_plamy-generate_data" default="biale_plamy-generate_data_by_nosql">
+    basedir="." name="biale_plamy-generate_data" default="biale_plamy-generate_data">
     <!-- 
     
     
     -->
-    <property name="biale_plamy_class.php" value="biale_plamy_class.php"/>
-    <property name="biale_plamy-prepare_sql_data.php" value="biale_plamy-prepare_sql_data.php"/>
-    <property name="biale_plamy-generate_data.php" value="biale_plamy-generate_data.php"/>
+    
+    <!--<property name="biale_plamy-prepare_sql_data.php" value="biale_plamy-prepare_sql_data.php"/>-->
+    <property name="biale_plamy_class_regenerate.php" value="biale_plamy_class_regenerate.php"/>
     
     <property name="ways_as_Text_z_ID_xml.xsl" value="ways_as_Text_z_ID_xml.xsl"/>
     <property name="ways_as_Text_z_ID_xml.xml" value="ways_as_Text_z_ID_xml.xml"/>
@@ -22,6 +22,8 @@
         <property name="points2joins.xml" value="points2joins.xml"/>
             <property name="ways2joins.xml" value="ways2joins.xml"/>
              <property name="ways_asText.xml" value="ways_asText.xml"/>
+    
+        <property name="waysLengths.xmll" value="waysLengths.xml"/>
             <property name="joins2ways_z_ID_Way.xsl" value="joins2ways_z_ID_Way.xsl"/>
              <property name="joins2ways_z_ID_Way.xml" value="joins2ways_z_ID_Way.xml"/>
             <property name="biale_plamy_joins2ways_do_paths.xsl" value="biale_plamy_joins2ways_do_paths.xsl"/>
@@ -37,7 +39,7 @@
             <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.xsl" value="edge_joins_filled_paths.xsl"/>
+            <property name="edge_paths_with_PE.xsl" value="edge_paths_with_PE.xsl"/>
     
             <property name="edge_paths_with_PE.xml" value="edge_paths_with_PE.xml"/><!--     biale_plamy_from_paths_php_to_place_PE-->
             <property name="biale_put_PE_to_mysql.php" value="biale_put_PE_to_mysql.php"/>
@@ -53,28 +55,11 @@
             <available file="${INPUT}" filepath="." />
         </condition>
     </target>
+   
     
-    <target name="biale_plamy-generate_data" >
-        <!-- stary sposob -->
-        <antcall target="biale_plamy-prepare_sql_data.php"/>        
-        <antcall target="biale_plamy-generate_data.php"/>
-        <echo message="odpalam biale_plamy-generate_data "/>
-        <delete file="${joins2ways_z_ID_Way.xml}"/>
-        <antcall target="joins2ways_z_ID_Way.xml"/>
-        
-        <delete file="${edge_joins.xml}"/>
-        <antcall target="edge_joins.xml"/>
-        
-        <!-- tymczasowy rem bo dziala -->
-        <antcall target="biale_plamy_class_findWay.php"/>
-        <antcall target="PE_and_Cables"/>
-    </target>
-    
-    
-    
-    <target name="biale_plamy-generate_data_by_nosql">
+    <target name="biale_plamy-generate_data">
         <!-- nowy sposob -->
-        <antcall target="biale_plamy_class.php"/>  
+        <antcall target="biale_plamy_class_regenerate.php"/>  
         
         <delete file="${joins2ways_z_ID_Way.xml}"/>
         <antcall target="joins2ways_z_ID_Way.xml"/>
@@ -86,6 +71,7 @@
         
         <delete file="${edge_joins_filled_paths.xml}"/>
         <antcall target="edge_joins_filled_paths_make"/>
+        <antcall target="biale_plamy_put_PE_to_mysql_php"/>
         
         <!--<antcall target="biale_plamy_class_findWay.php"/>-->
         <antcall target="PE_and_Cables"/>
@@ -108,7 +94,7 @@
         <delete file="${edge_joins_filled_paths.xml}"/>
         <antcall target="edge_joins_filled_paths_make"/>
         
-        <antcall target="biale_plamy_class_findWay.php"/><!-- to jest szukanie path mega wolne -->
+        <antcall target="biale_plamy_put_PE_to_mysql_php"/>
         <antcall target="PE_and_Cables"/>
     </target>
     
@@ -174,21 +160,16 @@
         </exec>
     </target>
     
-    <target name="biale_plamy_class.php">
-        <echo message=" przygotowuje punkty xpoint przez biale_plamy_class.php"/>
-        <exec executable="php" failonerror="true" dir=".">
-            <arg file="${biale_plamy_class.php}"/>
-        </exec>
-    </target>
+    
    
    
    
-    <target name="biale_plamy-generate_data.php">
+    <target name="biale_plamy_class_regenerate.php">
         <!--<antcall target="install_in_file_db_query">
             <param name="sql_query" value="select 1+1;"/>
         </antcall>-->
         <exec executable="php" failonerror="true" dir=".">
-            <arg file="${biale_plamy-generate_data.php}"/>
+            <arg file="${biale_plamy_class_regenerate.php}"/>
         </exec>
         <echo message="Teraz Przelec arraya joins2ways pod katem 1-elementowych subarrayow"/>
     </target> 
@@ -206,6 +187,10 @@
             </factory>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <param name="points2ID_Way.xml"  expression="${ways2drogi.xml}"/>
+            <param name="points2joins.xml"  expression="${points2joins.xml}"/>
+            <param name="points2ID_Way.xml"  expression="${ways2drogi.xml}"/>
+            
+            
         </xslt>
     </target>
    
@@ -220,7 +205,7 @@
                 <!--<attribute name="http://saxon.sf.net/feature/initialTemplate" value="asd"/>-->
             </factory>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-            <!--<param name="points2ID_Way.xml"  expression="${ways2drogi.xml}"/>-->
+            <param name="points2joins.xml"  expression="${points2joins.xml}"/>
         </xslt>
     </target>
    
@@ -251,7 +236,14 @@
              </factory>
              <classpath location="/opt/local/share/java/saxon9he.jar"/>
              <param name="ways2drogi.xml" expression="${ways2drogi.xml}"/>
+             <param name="waysLengths.xml" expression="${waysLengths.xmll}"/>
+             <!--<param name="ways2joins.xml"  expression="${ways2joins.xml}"/>-->
+             
          </xslt>
+        
+        
+        
+        
      </target>
     
     <target name="edge_joins_filled_paths_make">
@@ -266,6 +258,8 @@
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <param name="ways_as_Text_z_ID_xml.xml" expression="${ways_as_Text_z_ID_xml.xml}"/>
             <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}"/>
         </xslt>
     </target>
     
@@ -290,7 +284,7 @@
     <target name="edge_paths_with_PE.xml">
         <echo message="Wyznaczenie PE na podstawie tras ${edge_paths_with_PE.xml} "/>
         <delete file="${edge_paths_with_PE.xml}"/>
-        <xslt basedir="./" style="${edge_joins_filled_paths.xsl}" in="${edge_joins_filled_paths.xml}"  destdir="./" out="${edge_paths_with_PE.xml}" >
+        <xslt basedir="./" style="${edge_paths_with_PE.xml}" in="${edge_joins_filled_paths.xml}"  destdir="./" out="${edge_paths_with_PE.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"/>-->