|
|
@@ -161,7 +161,7 @@
|
|
|
<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"/>
|
|
|
+ <antcall target="cables_from_joins_to_PE.xml"/>
|
|
|
<!--Tymczasowa zatrzymanie bo nie chodzi na zdalnym - plik juz jest-->
|
|
|
<antcall target="biale_put_Cables_to_PE"/>
|
|
|
</target>
|
|
|
@@ -196,7 +196,7 @@
|
|
|
|
|
|
|
|
|
<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 "/>
|
|
|
+ <echo message="przygotownie z joins2ways xsl biale_plamy_joins2ways_do_paths.xsl pod katem 1 katem 1-elementowych subarrayow aby zrobic paths out ${joins2ways_z_ID_Way.xml} "/>
|
|
|
<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}" >
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
@@ -211,7 +211,7 @@
|
|
|
|
|
|
|
|
|
<target name="joins_asText_xml.xml">
|
|
|
- <echo message="uporzadkowanie Joins as text aby mialy xmlowe wspolrzedne"/>
|
|
|
+ <echo message="uporzadkowanie Joins as text aby mialy xmlowe wspolrzedne - out ${joins_asText_xml.xml}"/>
|
|
|
<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">
|
|
|
@@ -226,7 +226,7 @@
|
|
|
|
|
|
|
|
|
<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 "/>
|
|
|
+ <echo message="przygotownie ${edge_joins.xml} 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}" >
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
@@ -241,7 +241,7 @@
|
|
|
|
|
|
<!-- wyznaczenie sciezek do ulozenia PE - dziala - -->
|
|
|
<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 "/>
|
|
|
+ <echo message="przygotownie ${ways_as_Text_z_ID_xml.xml} 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">
|
|
|
@@ -255,7 +255,7 @@
|
|
|
</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 "/>
|
|
|
+ <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}"/>
|
|
|
<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">
|
|
|
@@ -269,6 +269,12 @@
|
|
|
</xslt>
|
|
|
</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=".">
|
|
|
+ <arg file="${biale_put_xml_paths_to_mysql.php}"/>
|
|
|
+ </exec>
|
|
|
+ </target>
|
|
|
|
|
|
<target name="biale_plamy_class_findWay.php">
|
|
|
<!-- to jest szukanie path mega wolne -->
|
|
|
@@ -282,7 +288,7 @@
|
|
|
|
|
|
<!-- postawienie PE po trasach -->
|
|
|
<target name="edge_paths_with_PE.xml">
|
|
|
- <echo message="Wyznaczenie PE na podstawie tras "/>
|
|
|
+ <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}" >
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
@@ -302,7 +308,7 @@
|
|
|
</target>
|
|
|
|
|
|
<!-- przeliczenie dla kazdego PE z trasy punktu przeciecia i wybranie najkrotszej i wygenerowania kabla -->
|
|
|
- <target name="biale_plamy_analyze_shortest_and_trace_cables">
|
|
|
+ <target name="cables_from_joins_to_PE.xml">
|
|
|
<delete file="${cables_from_joins_to_PE.xml}"/>
|
|
|
<xslt basedir="./" style="${cables_from_joins_to_PE.xsl}" in="${joins2ways_z_ID_Way.xml}" destdir="./" out="${cables_from_joins_to_PE.xml}" >
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
