popr

SE/dev/php-cli/build__biale_plamy.xml

@@ -9,7 +9,11 @@
     <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-find_ways.php" value="biale_plamy-find_ways.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"/>
+    
+    <property name="biale_plamy_class_findWay.php" value="biale_plamy_class_findWay.php"/><!--<property name="biale_plamy-find_ways.php" value="biale_plamy-find_ways.php"/>-->
         <property name="joins_asText.xml" value="joins_asText.xml"/>
         <property name="joins2ways.xml" value="joins2ways.xml"/>
         <property name="points2ID_Way.xml" value="points2ID_Way.xml"/>
@@ -21,9 +25,17 @@
             <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"/>
+        
+            <property name="edge_joins_filled_paths_make.xsl" value="edge_joins_filled_paths_make.xsl"/>
+            
+    
         <property name="points_asText.xml" value="points_asText.xml"/>
         <property name="points2joins.xml" value="points2joins.xml"/>
         <property name="edge_joins.xml" value="edge_joins.xml"/>
+        
+            <property name="joins_asText_xml.xsl" value="joins_asText_xml.xsl"/>
+            <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"/>
     
@@ -60,35 +72,73 @@
     
     <target name="biale_plamy-generate_data_by_nosql">
         <!-- nowy sposob -->
-        <antcall target="biale_plamy_prepare_php_data_by_class"/>  <delete file="${joins2ways_z_ID_Way.xml}"/>
+        <antcall target="biale_plamy_prepare_php_data_by_class"/>  
+        <delete file="${joins2ways_z_ID_Way.xml}"/>
+        <antcall target="biale_plamy_points2ID_Way_do_Joins"/>
+        
+        <delete file="${joins_asText_xml.xml}"/>
+        <antcall  target="joins_asText_xml"/>
+        
+        <delete file="${edge_joins.xml}"/>
+        <antcall target="biale_plamy_joins2ways_do_paths"/>
+        
+        <delete file="${edge_joins_filled_paths.xml}"/>
+        <antcall target="edge_joins_filled_paths_make"/>
+        
+        <antcall target="biale_plamy_paths_to_findways_php"/>
+        <antcall target="PE_and_Cables"/>
+    </target>
+    
+    
+    <target name="biale_plamy-just_xsl_PE_cables">
+        <!-- nowy sposob -->
+          
+        <delete file="${joins2ways_z_ID_Way.xml}"/>
         <antcall target="biale_plamy_points2ID_Way_do_Joins"/>
+        
+        <delete file="${ways_as_Text_z_ID_xml.xml}"/>
+        <antcall target="ways_as_Text_z_ID_xml"/>
+        
+        <delete file="${joins_asText_xml.xml}"/>
+        <antcall  target="joins_asText_xml"/>
+        
         <delete file="${edge_joins.xml}"/>
         <antcall target="biale_plamy_joins2ways_do_paths"/>
+        
+        <delete file="${edge_joins_filled_paths.xml}"/>
+        <antcall target="edge_joins_filled_paths_make"/>
+        
         <antcall target="biale_plamy_paths_to_findways_php"/>
         <antcall target="PE_and_Cables"/>
     </target>
     
+    
+    
+    
     <target name="clean">
+        <delete file="${joins2ways_z_ID_Way.xml}"/>
+        <delete file="${edge_joins_filled_paths.xml}"/>
+        <delete file="${edge_paths_with_PE.xml}"/>
+        <delete file="${cables_from_joins_to_PE.xml}"/>
+        <delete file="${joins_asText_xml.xml}"/>
+        <delete file="${ways_as_Text_z_ID_xml.xml}"/>
+    </target>
+    
+    <target name="clean_input">
+        <delete file="${points2ID_Way.xml}"/>
         <delete file="${points2joins.xml}"/>
         <delete file="${ways2joins.xml}"/>
         <delete file="${ways_asText.xml}"/>
         <delete file="${joins_asText.xml}"/>
-        <delete file="${joins2ways_z_ID_Way.xml}"/>
         <delete file="${edge_joins.xml}"/>
         <delete file="${joins2ways.xml}"/>
-        <delete file="${points2ID_Way.xml}"/>
         <delete file="${ways2drogi.xmll}"/>
-        <delete file="${joins2ways_z_ID_Way.xml}"/>
         <delete file="${points_asText.xml}"/>
-        <delete file="${points2joins.xml}"/>
         <delete file="${edge_joins.xml}"/>
-        <delete file="${edge_joins_filled_paths.xml}"/>
-        <delete file="${edge_paths_with_PE.xml}"/>
-        <delete file="${cables_from_joins_to_PE.xml}"/>
+        <delete file="${points2joins.xml}"/>
     </target>
     
     
-    
     <target name="check_files_for_PE_and_Cables" >
         <echo message="czy sa wymagane pliki do wygenerowania samych PE_and_Cables"/>
         <condition property="files_PE_and_Cables" taskname="PE_and_Cables" value="AVIABLE">
@@ -137,6 +187,8 @@
         <echo message="Teraz Przelec arraya joins2ways pod katem 1-elementowych subarrayow"/>
     </target> 
    
+   
+   
     <target name="biale_plamy_points2ID_Way_do_Joins">
         <echo message="przygotownie z joins2ways xsl biale_plamy_joins2ways_do_paths.xsl pod katem 1  katem 1-elementowych subarrayow aby zrobic paths "/>
         <delete file="${joins2ways_z_ID_Way.xml}"/>
@@ -151,6 +203,22 @@
         </xslt>
     </target>
    
+   
+    <target name="joins_asText_xml">
+        <echo message="uporzadkowanie Joins as text aby mialy xmlowe wspolrzedne"/>
+        <delete file="${joins_asText_xml.xml}"/>
+        <xslt basedir="./" style="${joins_asText_xml.xsl}" in="${joins_asText.xml}"  destdir="./" out="${joins_asText_xml.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="points2ID_Way.xml"  expression="${ways2drogi.xml}"/>-->
+        </xslt>
+    </target>
+   
+   
     <target name="biale_plamy_joins2ways_do_paths">
         <echo message="przygotownie z joins2ways xsl biale_plamy_joins2ways_do_paths.xsl pod katem 1  katem 1-elementowych subarrayow aby zrobic paths "/>
         <delete file="${edge_joins.xml}"/>
@@ -165,13 +233,45 @@
         </xslt>
     </target>
    
-    <!-- wyznaczenie sciezek do ulozenia PE - dziala-->
-    <target name="biale_plamy_paths_to_findways_php">
-        <exec executable="php" failonerror="true" dir=".">
-            <arg file="${biale_plamy-find_ways.php}"/>
-        </exec>
-        <!-- to wyrzuca edge_joins_filled_paths.xml-->
+    <!-- wyznaczenie sciezek do ulozenia PE - dziala -  -->
+    <target name="ways_as_Text_z_ID_xml">
+         <echo message="przygotownie z joins2ways xsl biale_plamy_joins2ways_do_paths.xsl pod katem 1  katem 1-elementowych subarrayow aby zrobic paths "/>
+         <delete file="${ways_as_Text_z_ID_xml.xml}"/>
+         <xslt basedir="./" style="${ways_as_Text_z_ID_xml.xsl}" in="${ways_asText.xml}"  destdir="./" out="${ways_as_Text_z_ID_xml.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="ways2drogi.xml" expression="${ways2drogi.xml}"/>
+         </xslt>
+     </target>
+    
+    <target name="edge_joins_filled_paths_make">
+        <echo message="przygotownie z joins2ways xsl biale_plamy_joins2ways_do_paths.xsl pod katem 1  katem 1-elementowych subarrayow aby zrobic paths "/>
+        <delete file="${ways_as_Text_z_ID_xml.xml}"/>
+        <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"/>
+                <!--<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="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}"/>
+        </xslt>
     </target>
+    
+    
+     <target name="biale_plamy_paths_to_findways_php">
+         <exec executable="php" failonerror="true" dir=".">
+             <arg file="${biale_plamy_class_findWay.php}"/>
+         </exec>
+         <!-- to wyrzuca edge_joins_filled_paths.xml-->
+     </target>
+    
+   
    
     <!-- postawienie PE po trasach -->
     <target name="biale_plamy_from_paths_php_to_place_PE">