Просмотр исходного кода

Merge branch 'master' of bn.git:plabudda/se

Piotr Labudda 9 лет назад
Родитель
Сommit
6c5b90ef9d

+ 7 - 2
SE/dev/php-cli/biale_put_PE_to_mysql.php

@@ -90,11 +90,13 @@ foreach($edge_paths_with_PE->children() as $child)  {
 	   foreach($child->attributes() as $a=>$b) {
 		   //	echo "#87Child";print_r($b[0]);
 		   if($a=='ID_Way') $ID_Way=$b[0];
+
 		   //if($a=='Count') $Count=$b[0];
 	   }
 	  //echo $child->getName() . ": " . " ID_Way: ".$ID_Way. " : ";
 	
 	   settype($ID_Way, "integer");
+
 	   //$ID_Way=var_dump($ID_Way);
 	 //  echo "#88Child:"; print_r($ID_Way);
 	   //$edge_joins_path['ID_Way'][$attrs['ID_Way']]=array();
@@ -107,6 +109,8 @@ foreach($edge_paths_with_PE->children() as $child)  {
 		   $Path_Point['Pos']=$Path_Point['Pos'][0]; settype($Path_Point['Pos'], "integer");
 		   $Path_Point['X']=$Path_Point['X'][0]; settype($Path_Point['X'], "string");
 		   $Path_Point['Y']=$Path_Point['Y'][0]; settype($Path_Point['Y'], "string");
+		   $Path_Point['ID_Join']=$Path_Point['ID_Join'][0]; settype($Path_Point['ID_Join'], "integer");
+
 		   $edge_paths_with_PE_arr[$ID_Way][$id_j]=$Path_Point;
 	   }
 }
@@ -123,8 +127,9 @@ $edge_joins_filled_paths=array();
 foreach($edge_paths_with_PE_arr as $ID_Way=>$Path_Point) {
 		
 		foreach($Path_Point as $Path_Point_val) {
-		$sql_Path_Point_val="insert into Rozdzielcza_test_bzyk_PE (the_geom,ID_Way)
-		     values (ST_GeomFromText('POINT(".$Path_Point_val['X']." ".$Path_Point_val['Y'].")'),'".$ID_Way."'   )   ";
+		$sql_Path_Point_val="insert into Rozdzielcza_test_bzyk_PE (the_geom,ID_Way,ID_Join)
+		     values (ST_GeomFromText('POINT(".$Path_Point_val['X']." ".$Path_Point_val['Y'].")'),'".$ID_Way."' ,
+		      '".$Path_Point_val['ID_Join']."'   )   ";
 		    echo "#216Query path ins:: ".$sql_Path_Point_val."  ";
 		    //if(strlen($edge_joins_filled_paths[$ID_Way]['asText'])>2)
 		   if( strlen($Path_Point_val['X'])>1 and   strlen($Path_Point_val['Y'])>1 ) DB::getPDO()->query($sql_Path_Point_val);

+ 1 - 1
SE/schema/ant-tool/SyncResourcesYed/build.xml

@@ -17,7 +17,7 @@
     </target>
    
    
-   <target name="first_save_data" depends="do zapisania wynikow od uzytkownika do WFS"></target>
+   <target name="first_save_data" description="do zapisania wynikow od uzytkownika do WFS"></target>
    
     <target name="http_first_output">
         <echo message="${uuid}"/>