error za droga - dodanie bypass errors

SE/dev/php-cli/biale_plamy_class_regenerate.php

@@ -8,15 +8,26 @@ $test = new bialePlamy(array("pointsTable"=>"Rozdzielcza_test2_bzyk_punkty_adres
 
 
 $test->generateWays();
+echo "\n generateWays complete";
 $test->generateXpoints();
+echo "\n generateJoins complete";
 ////$test->generateJoins();
 $test->generatePrzylacza();
+echo "\n generatePrzylacza complete";
+
 $test->generateWaysLenghts();
+echo "\n generateWaysLenghts complete";
+
 //$test->generateLongWays();
 
 $test->saveCache();
+echo "\n saveCache complete";
+
 $test->saveXML();
+echo "\n saveXML complete";
+
 $test->saveArrays();
+echo "\n saveArrays complete";
 
 
 //echo $test->printArray('joins2ways');

SE/dev/php-cli/build.xml

@@ -8,7 +8,7 @@
    
    
     
-    
+    <property name="bypass_errors" value="1"/><!-- to continue transform even with errors -->
     <property name="build.log" value="build.log"/><property name="build.log.old" value="${build.log}.old"/>
     
     <target name="build_log_exists">
@@ -126,7 +126,7 @@
                     logic = sorted  - use this option to minimize analyzed points in every group, which is  weighted somehow by cost PE and cable
                      -  ( default ${logic} )
             
-           
+            bypass_errors - to continue transform even with errors - default = ${bypass_errors}
             
             
             TARGETS
@@ -352,6 +352,7 @@
             <param name="ways2joins.xml" expression="${ways2joins.xml}"/>
             <param name="joins2ways_z_ID_Way.xml" expression="${joins2ways_z_ID_Way.xml}"/>
             <param name="edge_joins_filled_paths" expression="${edge_joins_filled_paths}"/>
+            <param name="bypass_errors" expression="${bypass_errors}"/>
         </xslt>
 
     </target>

SE/dev/php-cli/edge_joins_filled_paths_make.xsl

@@ -22,6 +22,8 @@
     
     <xsl:param name="debug"  select="0" /> <!-- set 1 to debug -->
     
+    <xsl:param name="bypass_errors" select="1"/> <!-- set to 0 if you want to secure terminate on error  -->
+    
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
     
@@ -380,9 +382,19 @@
         <xsl:choose>
             <xsl:when test="$loop &gt; 1000">
                 <loop_limit>
-                    <xsl:message terminate="yes">
-                       !!!!!!!!!!!!!!!! Loop limit dla PlaceWay: 1=2  dla $Cur_X1=<xsl:value-of select="$Cur_X1"/>; $Cur_Y1=<xsl:value-of select="$Cur_Y1"/> @id=<xsl:value-of select="@id"/>; $not_id=<xsl:value-of select="$not_id"/>
-                    </xsl:message>
+                    <xsl:choose>
+                        <xsl:when test="$bypass_errors">
+                            <xsl:message terminate="NO">
+                                !!!!!!!!!!!!!!!! Loop limit dla PlaceWay: 1=2  dla $Cur_X1=<xsl:value-of select="$Cur_X1"/>; $Cur_Y1=<xsl:value-of select="$Cur_Y1"/> @id=<xsl:value-of select="@id"/>; $not_id=<xsl:value-of select="$not_id"/>
+                            </xsl:message>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:message terminate="yes">
+                                !!!!!!!!!!!!!!!! Loop limit dla PlaceWay: 1=2  dla $Cur_X1=<xsl:value-of select="$Cur_X1"/>; $Cur_Y1=<xsl:value-of select="$Cur_Y1"/> @id=<xsl:value-of select="@id"/>; $not_id=<xsl:value-of select="$not_id"/>
+                            </xsl:message>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    
                 </loop_limit>
                 
             </xsl:when>