|
|
@@ -41,7 +41,10 @@
|
|
|
<property name="edge_joins_filled_paths.xml" value="edge_joins_filled_paths.xml"/>
|
|
|
|
|
|
<property name="edge_paths_with_PE.xsl" value="edge_paths_with_PE.xsl"/><!-- stary-->
|
|
|
- <property name="edge_paths_with_PE_controll.xsl" value="edge_paths_with_PE_controll.xsl"/><!-- nowy point matrix-->
|
|
|
+ <property name="edge_paths_with_PE_controll.xsl" value="edge_paths_with_PE_controll.xsl"/><!-- nowy point matrix-->
|
|
|
+ <property name="edge_paths_with_PE_controll_temp" value="edge_paths_with_PE_controll_temp"/> <!-- do oszukania silnika aby korzystac z petli i przekazywac dane do siebie -->
|
|
|
+ <property name="edge_paths_with_PE_controll_temp.alias" value="edge_paths_with_PE_controll_temp.alias"/>
|
|
|
+
|
|
|
<property name="edge_paths_with_PE_controll.xml" value="edge_paths_with_PE_controll.xml"/>
|
|
|
|
|
|
<property name="edge_paths_with_PE.xml" value="edge_paths_with_PE.xml"/><!-- biale_plamy_from_paths_php_to_place_PE-->
|
|
|
@@ -75,6 +78,10 @@
|
|
|
|
|
|
<delete file="${edge_joins_filled_paths.xml}"/>
|
|
|
<antcall target="edge_joins_filled_paths_make"/>
|
|
|
+
|
|
|
+ <antcall target="edge_paths_with_PE_controll.xsl"/>
|
|
|
+ <antcall target="edge_paths_with_PE.xml"/>
|
|
|
+
|
|
|
<antcall target="biale_plamy_put_PE_to_mysql_php"/>
|
|
|
|
|
|
<!--<antcall target="biale_plamy_class_findWay.php"/>-->
|
|
|
@@ -98,7 +105,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="PE_and_Cables"/>
|
|
|
</target>
|
|
|
|
|
|
@@ -149,10 +156,8 @@
|
|
|
|
|
|
<target name="PE_and_Cables">
|
|
|
<antcall target="edge_paths_with_PE.xml"/>
|
|
|
- <!-- tymczasowy rem bo skryptu nie ma -->
|
|
|
<antcall target="biale_plamy_put_PE_to_mysql_php"/>
|
|
|
<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>
|
|
|
|
|
|
@@ -299,10 +304,16 @@
|
|
|
</xslt>
|
|
|
</target>
|
|
|
<!-- postawienie PE po trasach nowe-->
|
|
|
- <target name="edge_paths_with_PE.xml">
|
|
|
+ <target name="edge_paths_with_PE_controll.xsl">
|
|
|
<echo message="Wyznaczenie PE na podstawie tras ${edge_paths_with_PE.xml} nowym ${edge_paths_with_PE_controll.xsl} "/>
|
|
|
- <delete file="${edge_paths_with_PE.xml}"/>
|
|
|
+
|
|
|
<delete file="${edge_paths_with_PE_controll.xml}"/>
|
|
|
+
|
|
|
+ <delete dir="${edge_paths_with_PE_controll_temp}"/>
|
|
|
+ <delete dir="${edge_paths_with_PE_controll_temp.alias}"/>
|
|
|
+ <mkdir dir="${edge_paths_with_PE_controll_temp}"/>
|
|
|
+ <symlink link="${edge_paths_with_PE_controll_temp.alias}" resource="${edge_paths_with_PE_controll_temp}"/>
|
|
|
+
|
|
|
<xslt basedir="./" style="${edge_paths_with_PE_controll.xsl}" in="${edge_joins_filled_paths.xml}" destdir="./" out="${edge_paths_with_PE_controll.xml}" >
|
|
|
<factory name="net.sf.saxon.TransformerFactoryImpl">
|
|
|
<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
|
|
|
@@ -311,10 +322,28 @@
|
|
|
</factory>
|
|
|
<classpath location="/opt/local/share/java/saxon9he.jar"/>
|
|
|
<param name="edge_paths_with_PE.xml" expression="${edge_paths_with_PE.xml}"/>
|
|
|
+ <param name="edge_paths_with_PE_controll_temp" expression="${edge_paths_with_PE_controll_temp}"/>
|
|
|
+ <param name="edge_paths_with_PE_controll_temp.alias" expression="${edge_paths_with_PE_controll_temp.alias}"/>
|
|
|
</xslt>
|
|
|
</target>
|
|
|
|
|
|
|
|
|
+ <target name="edge_paths_with_PE.xml">
|
|
|
+ <echo message="Wyznaczenie PE na podstawie tras ${edge_paths_with_PE.xml} na podstawie ${edge_paths_with_PE_controll.xml} "/>
|
|
|
+ <delete file="${edge_paths_with_PE.xml}"/>
|
|
|
+
|
|
|
+ <xslt basedir="./" style="${edge_paths_with_PE_controll_to_PE.xsl}" in="${edge_paths_with_PE_controll.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="edge_paths_with_PE.xml" expression="${edge_paths_with_PE.xml}"/>
|
|
|
+ <param name="edge_paths_with_PE_controll_temp" expression="${edge_paths_with_PE_controll_temp}"/>
|
|
|
+ <param name="edge_paths_with_PE_controll_temp.alias" expression="${edge_paths_with_PE_controll_temp.alias}"/>-->
|
|
|
+ </xslt>
|
|
|
+ </target>
|
|
|
|
|
|
<target name="biale_plamy_put_PE_to_mysql_php">
|
|
|
<exec executable="php" failonerror="true" dir=".">
|