dodanie prefiksu… java nie dziala mi na duzym pro ku…

SE/dev/php-cli/biale_plamy-prepare_sql_data.php

@@ -13,7 +13,7 @@ Lib::loadClass("Vendor_Geophp");
 
 
 $db = DB::getDB();
-$sql="create temporary table Rozdzielcza_test_bzyk_punkty_adresowe_temp select * from Rozdzielcza_test_bzyk_punkty_adresowe;
+/*$sql="create temporary table Rozdzielcza_test_bzyk_punkty_adresowe_temp select * from Rozdzielcza_test_bzyk_punkty_adresowe;
 
 -- 1 Dorobiona funkcja do pokazywania ID_Way
 update Rozdzielcza_test_bzyk_punkty_adresowe_temp t1 set t1.the_geom_nearest_way=test_find_nearest_way(t1.ID);
@@ -35,6 +35,7 @@ insert into Rozdzielcza_test_bzyk_przylacza (the_geom,ID_Way) select
  linefromtext(concat('linestring(',x(the_geom),' ',y(the_geom),',',x(the_geom_xpoint),' ',y(the_geom_xpoint),')')) , 
  ID from Rozdzielcza_test_bzyk_punkty_adresowe;
  ";
+ */
 
  $result = DB::getPDO()->fetchall($sql);
  

SE/dev/php-cli/biale_plamy_class_regenerate.php

@@ -2,51 +2,16 @@
 
 require("biale_plamy_class.php");
 
+require("biale_plamy_set_from_argv.php");
 
 
 
 
-echo "\n<br> Params (example) are :
-	pointsTable=Rozdzielcza_test2_bzyk_punkty_adresowe 
-	origWaysTable=Rozdzielcza_test2_bzyk_drogi
-	prefix=test2	
-	
-	";
 
-$pointsTable="Rozdzielcza_test2_bzyk_punkty_adresowe";
-$origWaysTable="Rozdzielcza_test2_bzyk_drogi";
-$prefix="test2";
 
-//przylaczaTable=Rozdzielcza_test2_bzyk_przylacza
-//	joinsTable=Rozdzielcza_test2_bzyk_joins
-//	waysTable=Rozdzielcza_test2_bzyk_ways
-print_r($_SERVER["argv"]);
 
-if($_SERVER["argv"] ) {
-	
-	foreach($_SERVER["argv"]  as $id=>$argv) {
-		echo "\n argv:".$argv." \n";
-		$par_arr= explode('=',$argv); 
-		print_r($par_arr);
-		if($par_arr[1])
-		eval("\$par_arr[0]=\"$par_arr[1]\";");
-		
-	}
 
-echo "
-  ustawiono nowe parametry: 
-
-  pointsTable=".$pointsTable." 
-  origWaysTable=".$origWaysTable." 
-  prefix=".$prefix."   \n <br>"	;	
-} 
-
-
-
-
-
-
-$test = new bialePlamy(array("pointsTable"=>"Rozdzielcza_".$prefix."_bzyk_punkty_adresowe", "origWaysTable"=>"Rozdzielcza_".$prefix."_bzyk_drogi"));
+$test = new bialePlamy(array("pointsTable"=>"Rozdzielcza_".$plamy_prefix."_bzyk_punkty_adresowe", "origWaysTable"=>"Rozdzielcza_".$plamy_prefix."_bzyk_drogi"));
 //$test->enableShowProgress();
 //$test->loadCache();
 
@@ -75,6 +40,6 @@ echo "\n saveArrays complete";
 
 
 //echo $test->printArray('joins2ways');
-$test->saveWaysTable("Rozdzielcza_".$prefix."_bzyk_ways");
-$test->saveJoinsTable("Rozdzielcza_".$prefix."_bzyk_joins");
-$test->savePrzylaczaTable("Rozdzielcza_".$prefix."_bzyk_przylacza");
+$test->saveWaysTable("Rozdzielcza_".$plamy_prefix."_bzyk_ways");
+$test->saveJoinsTable("Rozdzielcza_".$plamy_prefix."_bzyk_joins");
+$test->savePrzylaczaTable("Rozdzielcza_".$plamy_prefix."_bzyk_przylacza");

SE/dev/php-cli/biale_plamy_class_usage.php

@@ -2,45 +2,11 @@
 
 require("biale_plamy_class.php");
 
+require("biale_plamy_set_from_argv.php");
 
 
-echo "\n<br> Params (example) are :
-	pointsTable=Rozdzielcza_test2_bzyk_punkty_adresowe 
-	origWaysTable=Rozdzielcza_test2_bzyk_drogi
-	prefix=test2	
-	
-	";
-
-$pointsTable="Rozdzielcza_test2_bzyk_punkty_adresowe";
-$origWaysTable="Rozdzielcza_test2_bzyk_drogi";
-$prefix="test2";
-
-//przylaczaTable=Rozdzielcza_test2_bzyk_przylacza
-//	joinsTable=Rozdzielcza_test2_bzyk_joins
-//	waysTable=Rozdzielcza_test2_bzyk_ways
-print_r($_SERVER["argv"]);
-
-if($_SERVER["argv"] ) {
-	
-	foreach($_SERVER["argv"]  as $id=>$argv) {
-		echo "\n argv:".$argv." \n";
-		$par_arr= explode('=',$argv); 
-		print_r($par_arr);
-		if($par_arr[1])
-		eval("\$par_arr[0]=\"$par_arr[1]\";");
-		
-	}
-
-echo "
-  ustawiono nowe parametry: 
-
-  pointsTable=".$pointsTable." 
-  origWaysTable=".$origWaysTable." 
-  prefix=".$prefix."   \n <br>"	;	
-} 
-
-$test = new bialePlamy(array("pointsTable"=>"Rozdzielcza_".$prefix."_bzyk_punkty_adresowe",
-						     "origWaysTable"=>"Rozdzielcza_".$prefix."_bzyk_drogi"));
+$test = new bialePlamy(array("pointsTable"=>"Rozdzielcza_".$plamy_prefix."_bzyk_punkty_adresowe",
+						     "origWaysTable"=>"Rozdzielcza_".$plamy_prefix."_bzyk_drogi"));
 $test->enableShowProgress();
 $test->loadCache("dupa");
 
@@ -61,4 +27,4 @@ $test->generateLongWays();
 //$test->saveWaysTable("Rozdzielcza_test2_bzyk_ways");
 //$test->saveJoinsTable("Rozdzielcza_test2_bzyk_joins");
 //$test->savePrzylaczaTable("Rozdzielcza_test2_bzyk_przylacza");
-$test->saveLongWaysTable("Rozdzielcza_".$prefix."_bzyk_long_ways");
+$test->saveLongWaysTable("Rozdzielcza_".$plamy_prefix."_bzyk_long_ways");

SE/dev/php-cli/biale_plamy_joins2ways_do_paths.xsl

@@ -4,9 +4,11 @@
     exclude-result-prefixes="xs"
     xmlns:bp="https://procesy5.pl/biale_plamy-schema.xsd"
     version="2.0">
-   <!--<xsl:param name=""></xsl:param>-->
    
-    <xsl:variable name="ways2joins" select="doc('ways2joins.xml')"/>
+   
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    <xsl:variable name="ways2joins.xml" select="concat('ways2joins',$plamy_prefix,'.xml')"/>
+    <xsl:variable name="ways2joins" select="doc($ways2joins.xml)"/>
    
    <xsl:output indent="yes"/>
    <xsl:strip-space elements="*"/>

SE/dev/php-cli/build.xml

@@ -607,7 +607,7 @@
             https://biuro.biall-net.pl/SE/version-git/api.php/xml/table/default_db/_S_ADDRESS_STREETS_distincts/items -\-no-check-certificate -O _S_ADDRESS_STREETS_distincts.xml ;-->
         <property name="WFS_VERSION" value="&amp;VERSION=1.0.0"/>
         <property name="TYPENAME" value="&amp;TYPENAME=p5_default_db:Rozdzielcza_test_bzyk_PE"/>
-        <property name="username_p5_admin_pass" value="Vis11on69B"/>
+        <property name="username_p5_admin_pass" value="xxxxx"/>
 
         <!--<property name="OGC_Filter"> 
             &amp;Filter=

SE/dev/php-cli/build_edge_paths_with_PE_controll_loop.xsl

@@ -5,13 +5,14 @@
     exclude-result-prefixes="xs"
     version="2.0">
     
-    <xsl:param name="edge_paths_with_PE_controll_temp" select="'edge_paths_with_PE_controll_temp'"/>
-    <xsl:param name="edge_paths_with_PE_controll_temp.alias" select="'edge_paths_with_PE_controll_temp.alias'"/>
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    <xsl:param name="edge_paths_with_PE_controll_temp" select="concat('edge_paths_with_PE_controll_temp',$plamy_prefix)"/>
+    <xsl:param name="edge_paths_with_PE_controll_temp.alias" select="concat('edge_paths_with_PE_controll_temp.alias',$plamy_prefix)"/>
     <xsl:param name="edge_paths_with_PE_controll.xsl" select="'edge_paths_with_PE_controll.xsl'"/>
-    <xsl:param name="edge_paths_with_PE_controll.xml" select="'edge_paths_with_PE_controll.xml'"/>
-    <xsl:param name="edge_paths_with_PE_controll_paths_temp" select="'edge_paths_with_PE_controll_paths_temp'"/>
+    <xsl:param name="edge_paths_with_PE_controll.xml" select="concat('edge_paths_with_PE_controll.xml',$plamy_prefix)"/>
+    <xsl:param name="edge_paths_with_PE_controll_paths_temp" select="concat('edge_paths_with_PE_controll_paths_temp',$plamy_prefix)"/>
     
-    <xsl:param name="edge_joins_filled_paths" select="'edge_joins_filled_paths'"/>
+    <xsl:param name="edge_joins_filled_paths" select="concat('edge_joins_filled_paths',$plamy_prefix)"/>
     <xsl:param name="PE_Price" select="2500"/>
     <xsl:param name="Cable_Price" select="3"/>
     <xsl:param name="max_combinate_groups_elements" select="10"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
@@ -53,7 +54,7 @@
         <delete file="{$edge_paths_with_PE_controll_paths_temp}/{$edge_paths_with_PE_controll.xsl}.{@id}.xml"/>
         <xslt basedir="./" style="{$edge_paths_with_PE_controll.xsl}" 
             in="{$edge_joins_filled_paths}/{$edge_joins_filled_paths}.{@id}.xml"  destdir="./" 
-            out="{$edge_paths_with_PE_controll.xsl}.{@id}.xml" >
+            out="{$edge_paths_with_PE_controll.xsl}{$plamy_prefix}.{@id}.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"/>-->
@@ -67,9 +68,10 @@
             <param name="max_combinate_groups_elements" expression="{$max_combinate_groups_elements}"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
             <param name="logic" expression="{$logic}"/>
             <param name="edge_paths_with_PE_controll_paths_temp" expression="{$edge_paths_with_PE_controll_paths_temp}"/>
+            <param name="plamy_prefix" expression="{$plamy_prefix}"/>
             <!--<xsl:param name="logic" select="'sorted'"/>--> <!-- tutaj robi grupy ale analizyje w grupie tylko wazniejsze/bardziej oblozone wezly --> 
         </xslt>
-        <move file="{$edge_paths_with_PE_controll.xsl}.{@id}.xml" todir="{$edge_paths_with_PE_controll_paths_temp}"/>
+        <move file="{$edge_paths_with_PE_controll.xsl}{$plamy_prefix}.{@id}.xml" todir="{$edge_paths_with_PE_controll_paths_temp}"/>
     </xsl:template>
     
 </xsl:stylesheet>

SE/dev/php-cli/cables_from_joins_to_PE.xsl

@@ -8,11 +8,12 @@
     <xsl:strip-space elements="*"/>
     
     <xsl:include href="asText.xsl"/>
+    <xsl:param name="plamy_prefix" select="'test2'"/>
     
-    <xsl:param name="edge_paths_with_PE.xml" select="'edge_paths_with_PE.xml'"/>
-    <xsl:param name="joins_asText_xml.xml" select="'joins_asText_xml.xml'"/>
+    <xsl:param name="edge_paths_with_PE.xml" select="concat('edge_paths_with_PE',$plamy_prefix,'.xml')"/>
+    <xsl:param name="joins_asText_xml.xml" select="concat('joins_asText_xml',$plamy_prefix,'.xml')"/>
     <!--<xsl:param name="edge_joins_filled_paths.xml" select="'edge_joins_filled_paths.xml'"/>-->
-    <xsl:param name="points2joins.xml" select="'points2joins.xml'"/>
+    <xsl:param name="points2joins.xml" select="concat('points2joins',$plamy_prefix,'.xml')"/>
     <xsl:param name="edge_joins_filled_paths" select="'edge_joins_filled_paths'"/>
     
     <xsl:variable name="PE_candidates_dump" select="doc($edge_paths_with_PE.xml)"/>

SE/dev/php-cli/edge_joins_filled_paths_make.xsl

@@ -5,20 +5,21 @@
     exclude-result-prefixes="xs"
     version="2.0">
     
-    <xsl:param name="ways_as_Text_z_ID_xml.xml" select="'ways_as_Text_z_ID_xml.xml'"/>
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    <xsl:param name="ways_as_Text_z_ID_xml.xml" select="concat('ways_as_Text_z_ID_xml',$plamy_prefix,'.xml')"/>
     <xsl:variable name="ways_asText_z_ID_xml" select="doc($ways_as_Text_z_ID_xml.xml)"/>
     
-    <xsl:param name="joins_asText_xml.xml" select="'joins_asText_xml.xml'"/>
+    <xsl:param name="joins_asText_xml.xml" select="concat('joins_asText_xml',$plamy_prefix,'.xml')"/>
     <xsl:variable name="joins_asText_xml" select="doc($joins_asText_xml.xml)"/>
     
    
-    <xsl:param name="ways2joins.xml" select="'ways2joins.xml'"/>
+    <xsl:param name="ways2joins.xml" select="concat('ways2joins',$plamy_prefix,'.xml')"/>
     <xsl:variable name="ways2joins" select="doc($ways2joins.xml)"/>
     
-    <xsl:param name="joins2ways_z_ID_Way.xml" select="'joins2ways_z_ID_Way.xml'"/>
+    <xsl:param name="joins2ways_z_ID_Way.xml" select="concat('joins2ways_z_ID_Way',$plamy_prefix,'.xml')"/>
     <xsl:variable name="joins2ways_z_ID_Way" select="doc($joins2ways_z_ID_Way.xml)"/>
     
-    <xsl:param name="edge_joins_filled_paths" select="'edge_joins_filled_paths'"/> <!-- katalog do zapisywania sciezek -->
+    <xsl:param name="edge_joins_filled_paths" select="concat('edge_joins_filled_paths',$plamy_prefix)"/> <!-- katalog do zapisywania sciezek -->
     
     <xsl:param name="debug"  select="0" /> <!-- set 1 to debug -->
     

SE/dev/php-cli/edge_paths_with_PE.xsl

@@ -7,7 +7,8 @@
     
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
-    <xsl:param name="joins2ways_z_ID_Way.xml" select="'joins2ways_z_ID_Way.xml'"/>
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    <xsl:param name="joins2ways_z_ID_Way.xml" select="concat('joins2ways_z_ID_Way',$plamy_prefix,'.xml')"/>
     
     <xsl:variable name="joins2ways_z_ID_Way" select="$joins2ways_z_ID_Way.xml"/>
     

SE/dev/php-cli/edge_paths_with_PE_controll.xsl

@@ -11,7 +11,7 @@
     
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
-    
+    <xsl:param name="plamy_prefix" select="'test2'"/>
     <xsl:param name="PE_Price" select="2500"/>
     <xsl:param name="Cable_Price" select="3"/>
     <xsl:param name="max_combinate_groups_elements" select="8"/> <!-- po ile wezlow mamy grupowac do wyliczania kombinacji kosztow -->
@@ -22,10 +22,10 @@
     
     
     <!--<xsl:param name="edge_paths_with_PE.xml"/>-->
-    <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'"/>
+    <xsl:param name="edge_paths_with_PE_controll_temp" select="concat('edge_paths_with_PE_controll_temp',$plamy_prefix)"/> <!-- cache do przekazywani danych z petli-->
+    <xsl:param name="edge_paths_with_PE_controll_temp.alias" select="concat('edge_paths_with_PE_controll_temp.alias',$plamy_prefix)" />
+    <xsl:param name="edge_paths_with_PE_controll_paths_temp" select="concat('edge_paths_with_PE_controll_paths_temp',$plamy_prefix)"/> <!-- do przechowywania calych sciezek do PathCrossed-->
+    <xsl:param name="edge_joins_filled_paths" select="concat('edge_joins_filled_paths',$plamy_prefix)"/>
     <!-- bedziemy od najdluzszej drogi starac sie rozmiescic PE w oparciu o rozmieszczenie klientow oraz odleglosci  -->
     
     

SE/dev/php-cli/edge_paths_with_PE_controll_to_PE_collection.xsl

@@ -7,10 +7,12 @@
     
     <xsl:include href="edge_paths_with_PE_controll_to_PE.xsl"/>
     
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
     
-    <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 -->
+    <xsl:param name="edge_paths_with_PE_controll_paths_temp" select="concat('edge_paths_with_PE_controll_paths_temp',$plamy_prefix)"/> <!-- 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 -->
     

SE/dev/php-cli/joins2ways_z_ID_Way.xsl

@@ -6,9 +6,12 @@
     version="2.0">
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
-    <xsl:param name="ways2drogi.xml"  select="'ways2drogi.xml'"/>
+    
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    
+    <xsl:param name="ways2drogi.xml"  select="concat('ways2drogi',$plamy_prefix,'.xml')"/>
     <xsl:variable name="ways2drogi" select="doc($ways2drogi.xml)"/>
-    <xsl:param name="points2joins.xml"  select="'points2joins.xml'"/>
+    <xsl:param name="points2joins.xml"  select="concat('points2joins',$plamy_prefix,'.xml')"/>
     <xsl:variable name="points2joins" select="doc($points2joins.xml)"/>
     <xsl:param name="joins2ways_z_ID_Way_tempdir" select="'joins2ways_z_ID_Way'"/>
     
@@ -65,7 +68,7 @@
         </xsl:for-each-group>
         </xsl:variable>
         <xsl:copy-of select="$items_grouped"/>
-        <!--<xsl:result-document href="{$joins2ways_z_ID_Way_tempdir}/joins2ways_z_ID_Way.{@id}.{@ID_Way}.xml">
+        <!--<xsl:result-document href="{$joins2ways_z_ID_Way_tempdir}{$plamy_prefix}/joins2ways_z_ID_Way.{@id}.{@ID_Way}.xml">
             <joins2ways_z_ID_Way>
                 <xsl:attribute name="id" select="@id"/>
                 <xsl:copy-of select="$items_grouped"/>

SE/dev/php-cli/joins_asText_xml.xsl

@@ -7,7 +7,9 @@
     
     <xsl:import href="asText.xsl"/>
     
-    <xsl:param name="points2joins.xml"  select="'points2joins.xml'"/>
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    
+    <xsl:param name="points2joins.xml"  select="concat('points2joins',$plamy_prefix,'.xml')"/>
     <xsl:variable name="points2joins" select="doc($points2joins.xml)"/>
     
     <xsl:output indent="yes"/>

SE/dev/php-cli/ways_as_Text_z_ID_xml.xsl

@@ -6,10 +6,12 @@
     version="2.0">
      
     <xsl:import href="asText.xsl"/>
-    <xsl:param name="ways2drogi.xml" select="'ways2drogi.xml'"/>
+    <xsl:param name="plamy_prefix" select="'test2'"/>
+    
+    <xsl:param name="ways2drogi.xml" select="concat('ways2drogi',$plamy_prefix,'.xml')"/>
     <xsl:variable name="ways2drogi" select="doc($ways2drogi.xml)"/>
     
-    <xsl:param name="waysLengths.xml" select="'waysLengths.xml'"/>
+    <xsl:param name="waysLengths.xml" select="concat('waysLengths',$plamy_prefix,'.xml')"/>
     <xsl:variable name="waysLengths" select="doc($waysLengths.xml)"/>