porzadkowanie , blad logiki w PE

SE/dev/php-cli/edge_joins_filled_paths_make.xsl

@@ -278,7 +278,7 @@
                     </xsl:for-each>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:for-each select="$Ways/Ways/Way[@Way_X1=$Cur_X1 and @Way_Y1=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and ( not(@Way_X1=@Way_X2) or not(@Way_Y1=@Way_Y2) ) and not(@id=$not_id_prev) ]">
+                    <xsl:for-each select="$Ways/Ways/Way[@Way_X1=$Cur_X1 and @Way_Y1=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and  not(@Way_X1=@Way_X2 and @Way_Y1=@Way_Y2)  and not(@id=$not_id_prev) ]">
                         <LineString>
                             <xsl:attribute name="X" select="@Way_X2"/>
                             <xsl:attribute name="Y" select="@Way_Y2"/>
@@ -329,7 +329,7 @@
                             </xsl:for-each>
                         </LineString>
                     </xsl:for-each>
-                    <xsl:for-each select="$Ways/Ways/Way[@Way_X2=$Cur_X1 and @Way_Y2=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and ( not(@Way_X1=@Way_X2) or not(@Way_Y1=@Way_Y2) ) and not(@id=$not_id_prev) ]">
+                    <xsl:for-each select="$Ways/Ways/Way[@Way_X2=$Cur_X1 and @Way_Y2=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and ( not(@Way_X1=@Way_X2 and @Way_Y1=@Way_Y2) ) and not(@id=$not_id_prev) ]">
                         <LineString>
                             <xsl:attribute name="X" select="@Way_X1"/>
                             <xsl:attribute name="Y" select="@Way_Y1"/>

SE/dev/php-cli/edge_paths_with_PE.xsl

@@ -7,8 +7,9 @@
     
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
+    <xsl:param name="joins2ways_z_ID_Way.xml" select="'joins2ways_z_ID_Way.xml'"/>
     
-    <xsl:variable name="joins2ways_z_ID_Way" select="doc('joins2ways_z_ID_Way.xml')"/>
+    <xsl:variable name="joins2ways_z_ID_Way" select="$joins2ways_z_ID_Way.xml"/>
     
     <!--//match edge_joins_filled_paths-->
     

SE/dev/php-cli/edge_paths_with_PE_controll.xsl

@@ -25,6 +25,7 @@
     <xsl:param name="edge_paths_with_PE_controll_temp" select="'edge_paths_with_PE_controll_temp'"/> <!-- cache do przekazywani danych z petli-->
     <xsl:param name="edge_paths_with_PE_controll_temp.alias" select="'edge_paths_with_PE_controll_temp.alias'" />
     <xsl:param name="edge_paths_with_PE_controll_paths_temp" select="'edge_paths_with_PE_controll_paths_temp'"/> <!-- do przechowywania calych sciezek do PathCrossed-->
+    <xsl:param name="edge_joins_filled_paths" select="'edge_joins_filled_paths'"/>
     <!-- bedziemy od najdluzszej drogi starac sie rozmiescic PE w oparciu o rozmieszczenie klientow oraz odleglosci  -->
     
     
@@ -78,7 +79,7 @@
     
     
     <xsl:template match="Path|asText_XMl" mode="PointMatrixGroup">
-           <xsl:param name="edge_joins_filled_path" select=" doc(concat('edge_joins_filled_paths/edge_joins_filled_paths.',@id,'.xml'))"/>
+           <xsl:param name="edge_joins_filled_path" select=" doc(concat($edge_joins_filled_paths,'/edge_joins_filled_paths.',@id,'.xml'))"/>
         <Path>
             <xsl:attribute name="id" select="@id"/>
             <xsl:variable name="ID_Way" select="@id"/>
@@ -750,7 +751,6 @@
                     <merged><xsl:copy-of select="$candidates_merged_with_poprzednie"/></merged>
                 </candidates_merged_with_poprzednie>
             <xsl:message>calc_cost_way: calc <xsl:copy-of select="$candidates_merged_with_poprzednie//node()/@ID_Join"/></xsl:message>
-            
         </xsl:if>
         <xsl:for-each select="$candidates_merged_with_poprzednie/bp:Path_Point"> <!-- bylo cand_to_calc  -->
             <xsl:sort select="number(@distance)"/>

SE/dev/php-cli/edge_paths_with_PE_controll_to_PE_collection.xsl

@@ -3,7 +3,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:bp="https://procesy5.pl/biale_plamy-schema.xsd"
     exclude-result-prefixes="xs"
-    version="2.0">
+    version="2.0" >
     
     <xsl:include href="edge_paths_with_PE_controll_to_PE.xsl"/>
     
@@ -12,6 +12,7 @@
     
     <xsl:param name="edge_paths_with_PE_controll_paths_temp" select="'edge_paths_with_PE_controll_paths_temp'"/> <!-- katalog z PE w plikach edge_paths_with_PE_controll.xsl.312.xml -->
     
+    <!-- jedzie po koncach sciezek i z nich przyjmuje argument ID_Way po ktorym odpytuje sie pliki z wyloczeniami punktow -->
     
     <!--<xsl:variable name="edge_paths_with_PE_controll" select='collection( concat($edge_paths_with_PE_controll_paths_temp,"?select=*.xml;recurse=yes"))'/>-->
     

SE/dev/php-cli/joins2ways_z_ID_Way.xsl

@@ -10,6 +10,7 @@
     <xsl:variable name="ways2drogi" select="doc($ways2drogi.xml)"/>
     <xsl:param name="points2joins.xml"  select="'points2joins.xml'"/>
     <xsl:variable name="points2joins" select="doc($points2joins.xml)"/>
+    <xsl:param name="joins2ways_z_ID_Way_tempdir" select="'joins2ways_z_ID_Way'"/>
     
     
     <xsl:template match="joins2ways">
@@ -64,7 +65,7 @@
         </xsl:for-each-group>
         </xsl:variable>
         <xsl:copy-of select="$items_grouped"/>
-        <xsl:result-document href="joins2ways_z_ID_Way/joins2ways_z_ID_Way.{@id}.{@ID_Way}.xml">
+        <xsl:result-document href="{$joins2ways_z_ID_Way_tempdir}/joins2ways_z_ID_Way.{@id}.{@ID_Way}.xml">
             <joins2ways_z_ID_Way>
                 <xsl:attribute name="id" select="@id"/>
                 <xsl:copy-of select="$items_grouped"/>