|
|
@@ -23,8 +23,13 @@
|
|
|
<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.xml" value="edge_paths_with_PE.xml"/><!-- biale_plamy_from_paths_php_to_place_PE
|
|
|
- -->
|
|
|
+ <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"/>
|
|
|
+
|
|
|
+ <property name="cables_from_joins_to_PE.xsl" value="cables_from_joins_to_PE.xsl"/>
|
|
|
+ <property name="cables_from_joins_to_PE.xml" value="cables_from_joins_to_PE.xml"/><!-- xml do wygenerowania -->
|
|
|
+
|
|
|
+ <property name="biale_put_Cables_to_PE.php" value="biale_put_Cables_to_PE.php"/>
|
|
|
|
|
|
<target name="check" >
|
|
|
<echo message="testuje check"/>
|
|
|
@@ -39,6 +44,17 @@
|
|
|
<antcall target="biale_plamy_points2ID_Way_do_Joins"/>
|
|
|
<delete file="${edge_joins.xml}"/>
|
|
|
<antcall target="biale_plamy_joins2ways_do_paths"/>
|
|
|
+ <!-- tymczasowy rem bo dziala -->
|
|
|
+ <antcall target="biale_plamy_paths_to_findways_php"/>
|
|
|
+
|
|
|
+ <antcall target="biale_plamy_from_paths_php_to_place_PE"/>
|
|
|
+ <!-- tymczasowy rem bo skryptu nie ma -->
|
|
|
+ <antcall target="biale_plamy_put_PE_to_mysql_php"/>
|
|
|
+
|
|
|
+ <antcall target="biale_plamy_analyze_shortest_and_trace_cables"/>
|
|
|
+
|
|
|
+ <!--Tymczasowa zatrzymanie bo nie chodzi na zdalnym - plik juz jest-->
|
|
|
+ <antcall target="biale_put_Cables_to_PE"/>
|
|
|
|
|
|
</target>
|
|
|
|
|
|
@@ -90,13 +106,51 @@
|
|
|
</target>
|
|
|
|
|
|
<!-- wyznaczenie sciezek do ulozenia PE - dziala-->
|
|
|
- <target name="biale_plamy_paths_to_findways_php"></target>
|
|
|
+ <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-->
|
|
|
+ </target>
|
|
|
|
|
|
<!-- postawienie PE po trasach -->
|
|
|
- <target name="biale_plamy_from_paths_php_to_place_PE"></target>
|
|
|
+ <target name="biale_plamy_from_paths_php_to_place_PE">
|
|
|
+ <echo message="Wyznaczenie PE na podstawie tras "/>
|
|
|
+ <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">
|
|
|
+ <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="dita_task_template_file_param" expression="main.dita"/>-->
|
|
|
+ </xslt>
|
|
|
+ </target>
|
|
|
|
|
|
+ <target name="biale_plamy_put_PE_to_mysql_php">
|
|
|
+ <exec executable="php" failonerror="true" dir=".">
|
|
|
+ <arg file="${biale_put_PE_to_mysql.php}"/>
|
|
|
+ </exec>
|
|
|
+ </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>
|
|
|
+ <target name="biale_plamy_analyze_shortest_and_trace_cables">
|
|
|
+ <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">
|
|
|
+ <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="dita_task_template_file_param" expression="main.dita"/>-->
|
|
|
+ </xslt>
|
|
|
+ </target>
|
|
|
+
|
|
|
+ <target name="biale_put_Cables_to_PE">
|
|
|
+ <exec executable="php" failonerror="true" dir=".">
|
|
|
+ <arg file="${biale_put_Cables_to_PE.php}"/>
|
|
|
+ </exec>
|
|
|
+ </target>
|
|
|
|
|
|
<!--<target name="1_install_mysql_functions">
|
|
|
<property name="php_script_header"><?php
|
