popr

SE/dev/php-cli/build__biale_plamy.xml

@@ -322,6 +322,7 @@
     </target>
    
     <target name="biale_put_Cables_to_PE">
+        <echo message="Wgrywam Kable z pliku ${cables_from_joins_to_PE.xml} do bazy danych "></echo>
         <exec executable="php" failonerror="true" dir=".">
             <arg file="${biale_put_Cables_to_PE.php}"/>
         </exec>

SE/dev/php-cli/cables_from_joins_to_PE.xsl

@@ -34,7 +34,6 @@
         <!-- jedziemy po joins2ways_z_ID_Way, sprawdzamy czy jest dla niego PE_candidates_dump , jak tak, to szukamy jego PE i liczymy sciezke 
                lub probujemy rysowac zawsze od konca drogi-->
             
-            
           <xsl:for-each select="item">
             <xsl:variable name="ID_Way" select="@ID_Way"/>
             <xsl:variable name="Joins" select="@id"/>
@@ -86,7 +85,6 @@
                                     </xsl:choose>
                             </xsl:for-each>
                         </xsl:variable>
-                        
                         <xsl:choose>
                             <xsl:when test="$found_in_path_in_edge_joins_filled_path/found_in_path_in_edge_joins_filled_path">
                                 <xsl:for-each select="$found_in_path_in_edge_joins_filled_path/found_in_path_in_edge_joins_filled_path[1]">
@@ -106,9 +104,7 @@
                                             <xsl:with-param name="ID_Point" select="$ID_Point"/>
                                         </xsl:call-template>
                                     </found_in_path_in_edge_joins_filled_path>-->
-                                    
                                     <xsl:copy-of select="."/>
-                                    
                                 </xsl:for-each>
                                 <xsl:copy-of select="$found_in_path_in_edge_joins_filled_path/not_found"/>
                             </xsl:when>
@@ -138,9 +134,11 @@
            
            <xsl:variable name="Next_PE_Pos" select="min($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@Pos)&gt;number($Pos_found)]/@Pos)"/>
            <xsl:variable name="Prev_PE_Pos" select="max($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@Pos)&lt;=number($Pos_found)]/@Pos)"/>
+           <xsl:variable name="Same_PE_Pos" select="max($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@Pos)=number($Pos_found)]/@Pos)"/>
            <detect_next_PE>
                <xsl:attribute name="Pos_found" select="$Pos_found"/>
-               <!--<xsl:copy-of select="$PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@Pos)&gt;number($Pos_found)]/@Pos"/>--> <!--[number(@Pos)&gt;number($Pos_found)]-->
+               <!--debug-->
+               <xsl:copy-of select="$PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@Pos)&gt;number($Pos_found)]/@Pos"/> <!--[number(@Pos)&gt;number($Pos_found)]-->
                <xsl:attribute name="Next_PE_Pos" select="$Next_PE_Pos"/>
                <xsl:attribute name="Prev_PE_Pos" select="$Prev_PE_Pos"/>
                <xsl:choose>
@@ -168,14 +166,12 @@
                            <xsl:with-param name="Path_Point" select="$Path_Point"/>
                        </xsl:call-template>
                    </xsl:when>
-                   
                    <xsl:otherwise>
-                       <xsl:variable name="error">#Error 111 - nie moze byc innego wyjatku
-                           Pos_found=<xsl:value-of select="$Pos_found"/>;
-                           $Next_PE_Pos=<xsl:value-of select="$Next_PE_Pos"/>;
-                           $Prev_PE_Pos=<xsl:value-of select="$Prev_PE_Pos"/>;
-                           abs($Pos_found - $Next_PE_Pos)=<xsl:value-of select="abs($Pos_found - $Next_PE_Pos)"/>
-                           abs($Pos_found - $Prev_PE_Pos)=<xsl:value-of select="abs($Pos_found - $Prev_PE_Pos)"/></xsl:variable>
+                       <xsl:variable name="error">#Error 174 - nie moze byc innego wyjatku
+                           ID_Way=<xsl:value-of select="$ID_Way"/>;<xsl:value-of select="$ID_Point"/>  Pos_found=<xsl:value-of select="$Pos_found"/>; $Next_PE_Pos=<xsl:value-of select="$Next_PE_Pos"/>;
+                           $Prev_PE_Pos=<xsl:value-of select="$Prev_PE_Pos"/>; abs($Pos_found - $Next_PE_Pos)=<xsl:value-of select="abs($Pos_found - $Next_PE_Pos)"/> abs($Pos_found - $Prev_PE_Pos)=<xsl:value-of select="abs($Pos_found - $Prev_PE_Pos)"/>
+                           $Same_PE_Pos=<xsl:value-of select="$Same_PE_Pos"/>; $Pos_found=<xsl:value-of select="$Pos_found"/> ; 
+                       </xsl:variable>
                        <xsl:message terminate="no" select="$error">
                        <error><xsl:copy-of select="$error"/></error>
                    </xsl:message>