Merge branch 'master' of biuro.biall-net.pl:plabudda/se

SE/se-lib/Core/Database/Pgsql.php

@@ -133,6 +133,9 @@ class Core_Database_Pgsql extends Core_Database {
        ( select cast(replace(pg_catalog.format_type(f.atttypid,f.atttypmod), 'integer', 'int(11)') as char(255)) )
      when pg_catalog.format_type(f.atttypid,f.atttypmod) like '%character varying%'   then 
        ( select cast(replace(pg_catalog.format_type(f.atttypid,f.atttypmod), 'character varying', 'varchar') as char(255)) )
+     when pg_catalog.format_type(f.atttypid,f.atttypmod) like 'character(%'  then 
+       ( select cast(replace(pg_catalog.format_type(f.atttypid,f.atttypmod), 'character', 'varchar') as char(255)) )
+     
      when pg_catalog.format_type(f.atttypid,f.atttypmod) like 'timestamp without time zone' then 'datetime'
      when pg_catalog.format_type(f.atttypid,f.atttypmod) like 'date' then 'date'
      when pg_catalog.format_type(f.atttypid,f.atttypmod) like 'text' then 'text'
@@ -142,7 +145,7 @@ class Core_Database_Pgsql extends Core_Database {
        ( select cast( split_part( lower(replace(replace(pg_catalog.format_type(f.atttypid,f.atttypmod), 'geometry(', ''),')','')) , ',',1) as char(255)) )
 
 
-     else ( select  cast(  'enum('''||string_agg(enumlabel,''',''') || ''')' as char(255))
+     else ( select  cast(  'enum('''||string_agg(enumlabel,''',''') || ''')' as text)
 		FROM pg_enum e
 		JOIN pg_type t ON e.enumtypid = t.oid
 		WHERE t.typname = replace(pg_catalog.format_type(f.atttypid,f.atttypmod ),'\"','' )  ) 
@@ -666,6 +669,9 @@ FROM information_schema.triggers
 	function STRUCTURE_GENERATE_PARSE($config_base_structure_unserialized,$options=array()) {
 		
 		
+		if(!empty($options['CONFIRM_SQL_UPDATE'])) $CONFIRM_SQL_UPDATE=1;
+		
+		
 		//budowa struktur w bazie
 
 					DEBUG_S(-3,'config_base_structure_unserialized',$config_base_structure_unserialized,__FILE__, __FUNCTION__, __LINE__) ;

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1084,8 +1084,8 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/superedit*','/Library/Server/Web/Data/Sites/Default/SE/');  
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/webdav','/Library/Server/Web/Data/Sites/Default/SE/');  
   $cmd[]['rsh']='mkdir -p /Library/Server/Web/Data/Sites/Default/SE/config';
-  $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/.config_base_structure.php || echo PASSED'; 
-  $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/.config_base_structure.php','/Library/Server/Web/Data/Sites/Default/SE/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
+  $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/config/.config_base_structure* || echo PASSED'; 
+  $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/.config_base_structure*','/Library/Server/Web/Data/Sites/Default/SE/config/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
 
 
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/config/.cnf--column_init*','/Library/Server/Web/Data/Sites/Default/SE/config/');  
@@ -1390,11 +1390,11 @@ database=\"SES_USERS2\"
  $cmd[]['rsh']='which mysqladmin && mysqladmin  -f -uroot -p'.$ADMIN_USERNAME_PASSWD.' drop '.$REMOTE_FOLDER_ROOT.' || echo PASSED ';
 
  $cmd[]['rsh']='mysqladmin  -uroot -p'.$ADMIN_USERNAME_PASSWD.' create '.$REMOTE_FOLDER_ROOT.' || echo passed' ; //todo przestawic wczesniej
- $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/.config_base_structure.php','/Library/Server/Web/Data/Sites/Default/SE/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
+ $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/config/.config_base_structure.php','/Library/Server/Web/Data/Sites/Default/SE/config/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
 
  //! inicjalizacja bazy SQIX_STRUCTURE_DB_SYNC
-  $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/.config_base_structure_dump.sql','/Library/Server/Web/Data/Sites/Default/SE/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
-  $cmd[]['rsh']='/opt/local/lib/mysql55/bin/mysql  -uroot -p'.$ADMIN_USERNAME_PASSWD.' '.$REMOTE_FOLDER_ROOT.' < /Library/Server/Web/Data/Sites/Default/SE/.config_base_structure_dump.sql'; //TODO powinno byc osobne miejsce do bazy i struktur bo kasuje to baze zamiast aktualizacji!
+  $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/config/.config_base_structure_dump.sql','/Library/Server/Web/Data/Sites/Default/SE/config/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
+  $cmd[]['rsh']='/opt/local/lib/mysql55/bin/mysql  -uroot -p'.$ADMIN_USERNAME_PASSWD.' '.$REMOTE_FOLDER_ROOT.' < /Library/Server/Web/Data/Sites/Default/SE/config/.config_base_structure_dump.sql'; //TODO powinno byc osobne miejsce do bazy i struktur bo kasuje to baze zamiast aktualizacji!
 
 // TODO @2014-06-16 sprawdzic dodawanie struktur DB_STRUCTURES_CREATE - czy jest potrzebne - imho TAK
  $cmd[]['rsh']='php -r"include(\'/Library/Server/Web/Data/Sites/Default/SE/superedit-DB_PROCEDURES_CREATE.php\') ; DB_PROCEDURES_CREATE(); " '.$SERVER_ADDRESS.' '; 
@@ -1822,7 +1822,7 @@ function INSTALL_SES_PROCESY_A() {
 
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of3/4/2 SYNC_ZASOBY_STRUCTURES_FROM_CONFIG',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);flush();$out="";$exit="";
 
-	 	$exec="/opt/local/bin/mysqldump5 -utest test >{$INSTALL_ROOT}/.config_base_structure_dump.sql"; //TODO piotr - moze jakies lepsze miejsce na tego dumpa
+	 	$exec="/opt/local/bin/mysqldump5 -utest test >{$OPTIONS->SE_config}/config/.config_base_structure_dump.sql"; //TODO piotr - moze jakies lepsze miejsce na tego dumpa
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of4/4 mysqldump',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);$out="";$exit="";
 
 
@@ -1886,17 +1886,22 @@ function INSTALL_SES_PROCESY_A() {
 			
 			{ //@2015-03-21 dogranie konfigow z repozytorium konfigow 
 			$cmd='mkdir '.$INSTALL_ROOT.'/config' ;
-
 			exec($cmd,$out,$exit);	
 			DEBUG_S(-3,'We mkdir Install Root ',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
-			$cmd='cp '.$OPTIONS->SE_config.'/config/.cnf--column_init* '.$INSTALL_ROOT.'/config/' ;
 
+			$cmd='cp '.$OPTIONS->SE_config.'/config/.cnf--column_init* '.$INSTALL_ROOT.'/config/' ;
 			exec($cmd,$out,$exit);
 			DEBUG_S(-3,'We copy Install Root ',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
-			$cmd='cp '.$OPTIONS->SE_config.'/config/.cnf--external_ids.ini.php* '.$INSTALL_ROOT.'/config/' ;
 
+			$cmd='cp '.$OPTIONS->SE_config.'/config/.cnf--external_ids.ini.php* '.$INSTALL_ROOT.'/config/' ;
 			exec($cmd,$out,$exit);
 			DEBUG_S(-3,'We copy Install Root ',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
+
+			$cmd='cp '.$OPTIONS->SE_config.'/config/.config_base_structure* '.$INSTALL_ROOT.'/config/' ;
+			exec($cmd,$out,$exit);
+			DEBUG_S(-3,'We copy config_base_structure*',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
+
+
 			}			
 		}
 	

SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -830,142 +830,7 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
 //		$STRUCT_TABLE['CRM_LISTA_ZASOBOW']='PARENT_ID'; 
   
   }//eof FUNC FROM_ZASOBY_TO_ZASOBY
-  /* function has been moved to DB:: @2014-06-24
-   function STRUCTURE_GENERATE($TABLES,$CONNREMOTE,$TABLES_STRUCTURE_DATA){
-   				//global $CONNREMOTE;
-   				//! try to create info for functions and procedures -> ['__SCHEMA_FUNCTIONS__ARRAY__']
-   				$sql="show function status;";
-   				$result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);       				
-   				while($h=mysql_fetch_object($result)) {	
-   					$sql_="show create function `{$h->Name}`" ;
-   					DEBUG_S(-3,'sql function detail :: ',$sql_,__FILE__,__FUNCTION__,__LINE__)	 ;
-   					$result_=$CONNREMOTE->query($sql_) or die1('\nProblem z '.$sql);       			
-   					while($h_=mysql_fetch_object($result_)) {	
-   					$TABLES_IMPORT['__SCHEMA_FUNCTIONS__ARRAY__']['FUNCTION'][$h->Name]=$h_;
-   					}
-	   			}
-	   			
-	   			
-	   			$sql="show PROCEDURE status;";
-   				$result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);       				
-   				while($h=mysql_fetch_object($result)) {	
-   					$sql_="show create PROCEDURE `{$h->Name}`" ;
-   					DEBUG_S(-3,'sql PROCEDURE detail :: ',$sql_,__FILE__,__FUNCTION__,__LINE__)	 ;
-   					$result_=$CONNREMOTE->query($sql_) or die1('\nProblem z '.$sql);       			
-   					while($h_=mysql_fetch_object($result_)) {	
-   					$TABLES_IMPORT['__SCHEMA_FUNCTIONS__ARRAY__']['PROCEDURE'][$h->Name]=$h_;
-   					}
-	   			}
-	   				DEBUG_S(-3,'struktury funkcji: __SCHEMA_FUNCTIONS__ARRAY__ ',$TABLES_IMPORT['__SCHEMA_FUNCTIONS__ARRAY__'],__FILE__,__FUNCTION__,__LINE__)	 ;
-   				//die1('stop function during dev.');
-   				
-		       		foreach($TABLES as $TABLE ){
-		       				
-		       				$sql="show tables like   '".$TABLE."' ;" ;
-		       				DEBUG_S(-3,'//! Listing possible tables to write to config',$sql,__FILE__,__FUNCTION__,__LINE__);
-		       				$result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);       				
-		       				if(mysql_num_rows($result)==0) {
-		       				// nie ma tabeli - trzeba zapisac
-		       				DEBUG_S(-3," BRAK TABELI ".$TABLE,null,__FILE__,__FUNCTION__,__LINE__);
-		       				//die1();
-		       				if(isset($TABLES_IMPORT[$TABLE])) {
-			       				DEBUG_S(-3," Table already imported - problem in twice declared table ".$TABLE,null,__FILE__,__FUNCTION__,__LINE__);	
-			       				die1();
-		       				}
-		       				} else {
-		       				
-		       				
-		       						$sql="show full tables like   '".$TABLE."' ;" ;
-			   						$result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);     
-			   						while($h=mysql_fetch_object($result)) {		       				
-				   						$TABLES_IMPORT[$TABLE]['Table_type']=$h->{'Table_type'};
-				       					DEBUG_S(-3,'//! Reading to conf if table is WIEV or not :sql/result',array($sql,$h->{'Table_type'}),__FILE__,__FUNCTION__,__LINE__);
-					   				}
-		       				
-		       				
-		       				
-					   				if($TABLES_IMPORT[$TABLE]['Table_type']=='BASE TABLE') {
-				       				
-						       				$sql=" describe  `".$TABLE."` ;" ;
-						       				//echo "\n ".$sql;
-				       				       	$result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);
-						       				while($h=mysql_fetch_object($result)) {		       				
-						       					$TABLES_IMPORT[$TABLE]['FIELDS'][]=$h;
-						       				}
-						       			    $sql=" show index from  `".$TABLE."` ;" ;
-				       				       	$result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);
-											$TMP_KEYNAME=array();
-						       						while($h=mysql_fetch_object($result)) {		
-							       						if(isset($h->Column_name)) { $h->Column_name="`".$h->Column_name."`";       				
-														if(!isset($TMP_KEYNAME[$h->Key_name])) $TMP_KEYNAME[$h->Key_name]=$h->Column_name;
-														else $TMP_KEYNAME[$h->Key_name].=",".$h->Column_name;
-														}
-														//if(isset($TABLES_IMPORT[$TABLE]['INDEX'][$h->Key_name])) {
-														//   $TABLES_IMPORT[$TABLE]['INDEX'][$h->Key_name]->Column_name.=", ".$h->Column_name." ";
-														//} else {
-														//}
-														$TABLES_IMPORT[$TABLE]['INDEX'][$h->Key_name]=$h;
-														$TABLES_IMPORT[$TABLE]['INDEX'][$h->Key_name]->Column_name=$TMP_KEYNAME[$h->Key_name];	
-													}
-						       				if(in_array($TABLE,$TABLES_STRUCTURE_DATA)) { //bedziemy dodawac dane tej tabeli
-						       					 $sql=" select  * from  `".$TABLE."` ;" ;
-				       				       		 $result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);
-				       				       		 while($h=mysql_fetch_object($result)) {
-						       					 	$TABLES_IMPORT[$TABLE]['VALUES'][]=$h;
-						       					 }
-						       				}
-				
-						       				DEBUG_S(-3,"Dane tabeli KOMORKI ".$TABLE." ",$TABLES_IMPORT[$TABLE]['FIELDS'],__FILE__, __FUNCTION__, __LINE__);
-						       				DEBUG_S(-3,"Dane tabeli INDEKSY ".$TABLE." ",$TABLES_IMPORT[$TABLE]['INDEX'],__FILE__, __FUNCTION__, __LINE__);
-						       				if(isset($TABLES_IMPORT[$TABLE]['VALUES'])) DEBUG_S(-3,"Dane tabeli VALUES ".$TABLE." ",$TABLES_IMPORT[$TABLE]['VALUES'],__FILE__, __FUNCTION__, __LINE__);
-							   				
-							   				//! reading triggers to conf -> $TABLES_IMPORT[$TABLE]['TRIGGERS']
-							   			    $sql=" show triggers like '".$TABLE."' ;" ;
-				       				       	$result=$CONNREMOTE->query($sql) or die1('\nProblem z '.$sql);
-						       				while($h=mysql_fetch_object($result)) {		
-						       					 $sql_="show create trigger {$h->Trigger} ;" ;
-							   					 echo $sql_;
-		    		       				         $result_=$CONNREMOTE->query($sql_) or die1('\nProblem z '.$sql_);	
-		    		       				         while($h_=mysql_fetch_object($result_)) {			       					 
-							   					  DEBUG_S(-3,"Dane tabeli h_ ".$TABLE." ",$h_,__FILE__, __FUNCTION__, __LINE__);
-						       					  $TABLES_IMPORT[$TABLE]['TRIGGERS'][$h->Trigger]=$h_; 
-						       					 }
-								   			}
-								   			if(isset($TABLES_IMPORT[$TABLE]['TRIGGERS'])) DEBUG_S(-3,"Dane tabeli TRIGGERS ".$TABLE." ",$TABLES_IMPORT[$TABLE]['TRIGGERS'],__FILE__, __FUNCTION__, __LINE__);
-		
-						       			}  else if($TABLES_IMPORT[$TABLE]['Table_type']=='VIEW') {
-								   		
-							       			 $sql_="show create view `{$TABLE}` ;" ;
-							   					 //echo $sql_;
-		    		       				         $result_=$CONNREMOTE->query($sql_) or die1('\nProblem z '.$sql_);	
-		    		       				         while($h_=mysql_fetch_object($result_)) {			       					 
-							   					  DEBUG_S(-3,"//! trying to fetch create view fom".$TABLE." sql/res",array($sql_,$h_),__FILE__, __FUNCTION__, __LINE__);
-						       					  $TABLES_IMPORT[$TABLE]['VIEW']=$h_; 
-						       					 }
-							       			
-						       			} else { 
-						       			  DEBUG_S(-3,"Unknown table type ! ".$TABLE." ".$TABLES_IMPORT[$TABLE]['Table_type'],$TABLES_IMPORT[$TABLE],__FILE__, __FUNCTION__, __LINE__);
-						       			  die1();
-						       			}
-				       			    	
-						   			}
-		            }
-		            //print_r($TABLES_IMPORT);
-		           
-		           
-		           
-		            function func_sort_tables_import($a,$b){
-		               if($a['Table_type']==$b['Table_type']) return 0;
-		               else if($a['Table_type']=='VIEW') return 1;
-		               else return -1;
-                            }
-                           
-                           uasort($TABLES_IMPORT,'func_sort_tables_import');
-		                                                                                                                                                         
-		           DEBUG_S(-3,'Wygenerowane struktury (TABLES_IMPORT)',$TABLES_IMPORT,__FILE__,__FUNCTION__,__LINE__); 
-		           return($TABLES_IMPORT);
-         	}
-  */
+  
   		//funkcja do usuniecia zasobow ze zdublowanymi nazwami, najlepiej tych, ktore nie maja uzytych procesow
   		function STRUCTURE_SYNC_REMOVE_DUP_RESOURCE_NAMES($DUP_RESOURCE_PARENT_ID,$DUP_RESOURCE_DESC,$CONNREMOTE,$CONFIRM_SQL_UPDATE) {
   				DEBUG_S(-3,'Bede czyscic tabele struktury dla ',array($DUP_RESOURCE_PARENT_ID,$DUP_RESOURCE_DESC,$CONNREMOTE,__FILE__, __FUNCTION__, __LINE__));
@@ -1025,21 +890,22 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
        if($SYNC_OPTIONS=='CREATE_ZASOBY_STRUCTURES_CONFIG') {//budowa struktur w bazie
        
        		$TABLES_IMPORT=$CONNREMOTE->STRUCTURE_GENERATE($TABLES_STRUCTURE,null,$TABLES_STRUCTURE_DATA);
+	   		$CONNREMOTE->STRUCTURE_GENERATE_to_xsd($TABLES_IMPORT,$CONNREMOTE,'/tmp/schema'); //Generujemy XSD dla struktur
 
 //       		$TABLES_IMPORT=STRUCTURE_GENERATE($TABLES_STRUCTURE,$CONNREMOTE,$TABLES_STRUCTURE_DATA);
                     
            // $TABLES_STRUCTURE_DATA
    			$RETURN=serialize($TABLES_IMPORT);
-   			if (is_writable('.config_base_structure.php')) {
+   			if (is_writable('config/.config_base_structure.php')) {
 
-   			$fp = fopen('.config_base_structure.php', 'w');
+   			$fp = fopen('config/.config_base_structure.php', 'w');
    			fwrite($fp, $RETURN);
 			fclose($fp);
-			DEBUG_S(-3,'Zapisano aktualna strukture danych do .config_base_structure.php','',__FILE__,__FUNCTION__,__LINE__);
+			DEBUG_S(-3,'Zapisano aktualna strukture danych do config/.config_base_structure.php','',__FILE__,__FUNCTION__,__LINE__);
    			//print_r($TABLES_IMPORT);
    			//print_r($TABLES_IMPORT);
    			} else {
-   			  echo "\n\n\n Zmienna do przekopiowania do konfiga ".$config_base_structure."  : \n";
+   			  echo "\n\n\n config/.config_base_structure.php - nie jest do zapisu - zatem Zmienna do przekopiowania do konfiga config/".$config_base_structure."  : \n";
 	   			echo $RETURN;
    				echo "\n";
 
@@ -1050,10 +916,10 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
          
        				// ! SYNC_ZASOBY_STRUCTURES_FROM_CONFIG
        }   else    if($SYNC_OPTIONS=='SYNC_ZASOBY_STRUCTURES_FROM_CONFIG') {//budowa struktur w bazie
-					if(!file_exists(APP_PATH_ROOT."/".$config_base_structure)) die1("Brak konfiga w ".APP_PATH_ROOT." / ".$config_base_structure." , wygeneruj go za pomoca opcji CREATE_ZASOBY_STRUCTURES_CONFIG");
+					if(!file_exists(APP_PATH_ROOT."/config/".$config_base_structure)) die1("Brak konfiga w ".APP_PATH_ROOT." /config/".$config_base_structure." , wygeneruj go za pomoca opcji CREATE_ZASOBY_STRUCTURES_CONFIG");
 
-					$handle = fopen(APP_PATH_ROOT."/".$config_base_structure, "r");
-					$config_base_structure_serialized = fread($handle, filesize(APP_PATH_ROOT."/".$config_base_structure));
+					$handle = fopen(APP_PATH_ROOT."/config/".$config_base_structure, "r");
+					$config_base_structure_serialized = fread($handle, filesize(APP_PATH_ROOT."/config/".$config_base_structure));
 					fclose($handle);
 					//echo $config_base_structure_serialized;
 					$config_base_structure_unserialized=unserialize($config_base_structure_serialized);

SE/superedit-SYNC_DATABASES.php

@@ -69,7 +69,7 @@ class SYNC_DATABASES {
 		
 			$struct_rem=$this->gdb->STRUCTURE_GENERATE($this->set_table_to_sync,null,null);
 			DEBUG_S(-3,'Structure rem',$struct_rem,__FILE__,__FUNCTION__,__LINE__);
-			$this->db->STRUCTURE_GENERATE_PARSE($struct_rem,array('SKIP-PROCEDURE','SKIP-FUNCTION','SKIP-VIEW','SKIP-PRIMARY-KEY','getDB'=>$this->local_db_id));
+			$this->db->STRUCTURE_GENERATE_PARSE($struct_rem,array('SKIP-PROCEDURE','SKIP-FUNCTION','SKIP-VIEW','SKIP-PRIMARY-KEY','getDB'=>$this->local_db_id,'CONFIRM_SQL_UPDATE'=>1));
 		
 
 			$struct_loc=$this->db->STRUCTURE_GENERATE($this->set_table_to_sync,null,null);
@@ -115,7 +115,7 @@ class SYNC_DATABASES {
 			  	self::get_current_time();
 			  	$loc_key=$this->db->show_index_value($table);
 			  	$rem_key=$this->gdb->show_index_value($table);
-			  	DEBUG_S(-3,'Last synced for '.$table,array($LAST_SYNCED_loc,$LAST_SYNCED_rem),__FILE__,__FUNCTION__,__LINE__);
+			  	DEBUG_S(-3,'Last synced for (last_sync_loc,last_sync_rem,loc_key,rem_key) '.$table,array($LAST_SYNCED_loc,$LAST_SYNCED_rem,$loc_key,$rem_key),__FILE__,__FUNCTION__,__LINE__);
 			  	$ids_rem=$this->gdb->get_by_data_column($table,'A_RECORD_UPDATE_DATE',$LAST_SYNCED_rem,$this->currtime_rem,$loc_key);
 			  	while($h=$this->gdb->fetch($ids_rem)) {
 				  	$this->ids_rem[$h->$rem_key]=$h;
@@ -223,6 +223,10 @@ $sd->set_remote_db_id(13102);
 
 
 
+//$sd->set_table_to_sync('Rozdzielcza_lokalizacje'); //
+
+//$sd->set_table_to_sync('Rozdzielcza_wezly'); //
+
 $sd->set_table_to_sync('solectwa_poligon'); //
 $sd->set_table_to_sync('Kabel_TPSA_dzierzawa'); //
 $sd->set_table_to_sync('Rozdzielcza_Przeciski_110mm');
@@ -249,7 +253,7 @@ $sd->set_table_to_sync('MK_Rewiry');
 
 $sd->set_table_to_sync('IN7_MK_BAZA_DYSTRYBUCJI');
 
-//$sd->sync_struct();
+$sd->sync_struct();
 
 $sd->sync_data();