|
|
@@ -56,15 +56,17 @@
|
|
|
|
|
|
<target name="biale_plamy-generate_data" >
|
|
|
<!-- stary sposob -->
|
|
|
- <antcall target="biale_plamy_prepare_mysql_data"/>
|
|
|
- <antcall target="biale_plamy-generate_data_sql"/>
|
|
|
+ <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="biale_plamy_points2ID_Way_do_Joins"/>
|
|
|
+ <antcall target="joins2ways_z_ID_Way.xml"/>
|
|
|
+
|
|
|
<delete file="${edge_joins.xml}"/>
|
|
|
- <antcall target="biale_plamy_joins2ways_do_paths"/>
|
|
|
+ <antcall target="edge_joins.xml"/>
|
|
|
+
|
|
|
<!-- tymczasowy rem bo dziala -->
|
|
|
- <antcall target="biale_plamy_paths_to_findways_php"/>
|
|
|
+ <antcall target="biale_plamy_class_findWay.php"/>
|
|
|
<antcall target="PE_and_Cables"/>
|
|
|
</target>
|
|
|
|
|
|
@@ -72,47 +74,51 @@
|
|
|
|
|
|
<target name="biale_plamy-generate_data_by_nosql">
|
|
|
<!-- nowy sposob -->
|
|
|
- <antcall target="biale_plamy_prepare_php_data_by_class"/>
|
|
|
+ <antcall target="biale_plamy_class.php"/>
|
|
|
+
|
|
|
<delete file="${joins2ways_z_ID_Way.xml}"/>
|
|
|
- <antcall target="biale_plamy_points2ID_Way_do_Joins"/>
|
|
|
+ <antcall target="joins2ways_z_ID_Way.xml"/>
|
|
|
|
|
|
- <delete file="${joins_asText_xml.xml}"/>
|
|
|
- <antcall target="joins_asText_xml"/>
|
|
|
+ <antcall target="AsTextToXml"/>
|
|
|
|
|
|
<delete file="${edge_joins.xml}"/>
|
|
|
- <antcall target="biale_plamy_joins2ways_do_paths"/>
|
|
|
+ <antcall target="edge_joins.xml"/>
|
|
|
|
|
|
<delete file="${edge_joins_filled_paths.xml}"/>
|
|
|
<antcall target="edge_joins_filled_paths_make"/>
|
|
|
|
|
|
- <!--<antcall target="biale_plamy_paths_to_findways_php"/>-->
|
|
|
+ <!--<antcall target="biale_plamy_class_findWay.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"/>
|
|
|
+ <antcall target="joins2ways_z_ID_Way.xml"/>
|
|
|
|
|
|
+ <antcall target="AsTextToXml"/>
|
|
|
+
|
|
|
<delete file="${edge_joins.xml}"/>
|
|
|
- <antcall target="biale_plamy_joins2ways_do_paths"/>
|
|
|
+ <antcall target="edge_joins.xml"/>
|
|
|
|
|
|
<delete file="${edge_joins_filled_paths.xml}"/>
|
|
|
<antcall target="edge_joins_filled_paths_make"/>
|
|
|
|
|
|
- <antcall target="biale_plamy_paths_to_findways_php"/>
|
|
|
+ <antcall target="biale_plamy_class_findWay.php"/><!-- to jest szukanie path mega wolne -->
|
|
|
<antcall target="PE_and_Cables"/>
|
|
|
</target>
|
|
|
|
|
|
-
|
|
|
+ <target name="AsTextToXml">
|
|
|
+ <delete file="${ways_as_Text_z_ID_xml.xml}"/>
|
|
|
+ <antcall target="ways_as_Text_z_ID_xml.xml"/>
|
|
|
+
|
|
|
+ <delete file="${joins_asText_xml.xml}"/>
|
|
|
+ <antcall target="joins_asText_xml.xml"/>
|
|
|
+ </target>
|
|
|
|
|
|
|
|
|
<target name="clean">
|
|
|
@@ -152,7 +158,7 @@
|
|
|
|
|
|
|
|
|
<target name="PE_and_Cables">
|
|
|
- <antcall target="biale_plamy_from_paths_php_to_place_PE"/>
|
|
|
+ <antcall target="edge_paths_with_PE.xml"/>
|
|
|
<!-- tymczasowy rem bo skryptu nie ma -->
|
|
|
<antcall target="biale_plamy_put_PE_to_mysql_php"/>
|
|
|
<antcall target="biale_plamy_analyze_shortest_and_trace_cables"/>
|
|
|
@@ -161,14 +167,14 @@
|
|
|
</target>
|
|
|
|
|
|
|
|
|
- <target name="biale_plamy_prepare_mysql_data">
|
|
|
+ <target name="biale_plamy-prepare_sql_data.php">
|
|
|
<echo message="biale_plamy_prepare_mysql_data - przygotowuje punkty xpoint"/>
|
|
|
<exec executable="php" failonerror="true" dir=".">
|
|
|
<arg file="${biale_plamy-prepare_sql_data.php}"/>
|
|
|
</exec>
|
|
|
</target>
|
|
|
|
|
|
- <target name="biale_plamy_prepare_php_data_by_class">
|
|
|
+ <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}"/>
|
|
|
@@ -177,7 +183,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
- <target name="biale_plamy-generate_data_sql">
|
|
|
+ <target name="biale_plamy-generate_data.php">
|
|
|
<!--<antcall target="install_in_file_db_query">
|
|
|
<param name="sql_query" value="select 1+1;"/>
|
|
|
</antcall>-->
|
|
|
@@ -189,7 +195,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
- <target name="biale_plamy_points2ID_Way_do_Joins">
|
|
|
+ <target name="joins2ways_z_ID_Way.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="${joins2ways_z_ID_Way.xml}"/>
|
|
|
<xslt basedir="./" style="${joins2ways_z_ID_Way.xsl}" in="${joins2ways.xml}" destdir="./" out="${joins2ways_z_ID_Way.xml}" >
|
|
|
@@ -204,7 +210,7 @@
|
|
|
</target>
|
|
|
|
|
|
|
|
|
- <target name="joins_asText_xml">
|
|
|
+ <target name="joins_asText_xml.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}" >
|
|
|
@@ -219,7 +225,7 @@
|
|
|
</target>
|
|
|
|
|
|
|
|
|
- <target name="biale_plamy_joins2ways_do_paths">
|
|
|
+ <target name="edge_joins.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="${edge_joins.xml}"/>
|
|
|
<xslt basedir="./" style="${biale_plamy_joins2ways_do_paths.xsl}" in="${joins2ways_z_ID_Way.xml}" destdir="./" out="${edge_joins.xml}" >
|
|
|
@@ -234,7 +240,7 @@
|
|
|
</target>
|
|
|
|
|
|
<!-- wyznaczenie sciezek do ulozenia PE - dziala - -->
|
|
|
- <target name="ways_as_Text_z_ID_xml">
|
|
|
+ <target name="ways_as_Text_z_ID_xml.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}" >
|
|
|
@@ -264,7 +270,8 @@
|
|
|
</target>
|
|
|
|
|
|
|
|
|
- <target name="biale_plamy_paths_to_findways_php">
|
|
|
+ <target name="biale_plamy_class_findWay.php">
|
|
|
+ <!-- to jest szukanie path mega wolne -->
|
|
|
<exec executable="php" failonerror="true" dir=".">
|
|
|
<arg file="${biale_plamy_class_findWay.php}"/>
|
|
|
</exec>
|
|
|
@@ -274,7 +281,7 @@
|
|
|
|
|
|
|
|
|
<!-- postawienie PE po trasach -->
|
|
|
- <target name="biale_plamy_from_paths_php_to_place_PE">
|
|
|
+ <target name="edge_paths_with_PE.xml">
|
|
|
<echo message="Wyznaczenie PE na podstawie tras "/>
|
|
|
<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}" >
|
