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

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

@@ -997,7 +997,7 @@ class Core_Database_Mysql extends Core_Database {
 																			  if($src_char_len[1]>$dst_char_len[1]) {
 																			      $sql=" alter table `".$TABLE."` CHANGE `".$FIELD_TO_CHK."` `".$FIELD_TO_CHK."` ".$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type." ; ";
 																				  DEBUG_S(-3,'Aktualizacja rozszerzajaca zakres pola INT ma byc ='.$src_char_len[1]." byla dest=".$dst_char_len[1] ,$sql,__FILE__, __FUNCTION__, __LINE__);
-																				 // 	$result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__)  or die1('\nProblem z '.$sql);
+																				  	$result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__)  or die1('\nProblem z '.$sql);
 																			  } else {
 																				  DEBUG_S(-3,'Pominieta Aktualizacja zawiezajaca zakres pola INT ma byc ='.$src_char_len[1]." byla dest=".$dst_char_len[1] ,array($sql,$src_char_len,$dst_char_len,$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type),__FILE__, __FUNCTION__, __LINE__);
 																			  }
@@ -1012,12 +1012,25 @@ class Core_Database_Mysql extends Core_Database {
 																			  if($src_char_len[1]>$dst_char_len[1] and $src_char_len_com[1]>=$dst_char_len_com[1]) {
 																			      $sql=" alter table `".$TABLE."` CHANGE `".$FIELD_TO_CHK."` `".$FIELD_TO_CHK."` ".$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type." ; ";
 																				  DEBUG_S(-3,'Aktualizacja rozszerzajaca zakres pola Double ma byc ='.$src_char_len[1]." byla dest=".$dst_char_len[1] ,$sql,__FILE__, __FUNCTION__, __LINE__);
-																				 // 	$result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__)  or die1('\nProblem z '.$sql);
+																				 	$result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__)  or die1('\nProblem z '.$sql);
 																			  } else {
 																				  DEBUG_S(-3,'Pominieta Aktualizacja zawiezajaca zakres pola Double ma byc ='.$src_char_len[1]." byla dest=".$dst_char_len[1] ,array($sql,$src_char_len,$dst_char_len,$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type),__FILE__, __FUNCTION__, __LINE__);
 																			  }
 																	      
 																	      
+																	      
+																	      } else if(strstr($VAL->Type, 'geometry') && (    strstr($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type, 'polygon'  ) or   strstr($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type, 'point'  )    or strstr($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type, 'linestring'  )   )       ) {
+																	         
+																	       $sql=" alter table `".$TABLE."` CHANGE `".$FIELD_TO_CHK."` `".$FIELD_TO_CHK."` ".$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type." ; ";
+																		   DEBUG_S(-3,'Aktualizacja zmieniajaca zakres pola geometrycznego' ,$sql,__FILE__, __FUNCTION__, __LINE__);
+																		   $result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__)  or die1('\nProblem z '.$sql);
+																	      
+																	      }  else if(strstr($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type, 'geometry') && (    strstr($VAL->Type, 'polygon'  ) or   strstr($VAL->Type, 'point'  )    or strstr($VAL->Type, 'linestring'  )   )       ) {
+																	         
+																	       $sql=" alter table `".$TABLE."` CHANGE `".$FIELD_TO_CHK."` `".$FIELD_TO_CHK."` ".$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type." ; ";
+																		   DEBUG_S(-3,'Aktualizacja zmieniajaca zakres pola geometrycznego pominieta' ,$sql,__FILE__, __FUNCTION__, __LINE__);
+																		  // $result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__)  or die1('\nProblem z '.$sql);
+																	      
 																	      } else if( ( strstr($VAL->Type, 'char(') || strstr($VAL->Type, 'varchar(')  ) && strstr($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type, 'text'  )
 																	      			|| ( strstr($VAL->Type, 'bigint(')  ) && strstr($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type, 'longblob'  )
 																	      			|| ( strstr($VAL->Type, 'mediumtext')  ) && strstr($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Type, 'longblob'  )

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1128,11 +1128,11 @@ function INSTALL_GETCOMMANDS_WMS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERN
  $cmd[]['rsh']='echo "RewriteEngine on
 RewriteBase /wms/
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule (.*) /wms/mapserv.cgi?map=/Library/Server/Web/Data/Sites/Default/PLIKI/WMS_LAYERS/.maps/\$1.map [QSA]" > /Library/Server/Web/Data/Sites/Default/wms/.htaccess';
+RewriteRule (.*) /wms/mapserv.cgi?map=/Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WMS_LAYERS/.maps/\$1.map [QSA]" > /Library/Server/Web/Data/Sites/Default/wms/.htaccess';
  $cmd[]['rsh']='echo "RewriteEngine on
 RewriteBase /wms/qgis/
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule (.*) /wms/qgis/qgis_mapserv.cgi?MAP=/Library/Server/Web/Data/Sites/Default/PLIKI/WMS_LAYERS/.maps/.single/\$1.qgs [QSA]" > /Library/Server/Web/Data/Sites/Default/wms/qgis/.htaccess';
+RewriteRule (.*) /wms/qgis/qgis_mapserv.cgi?MAP=/Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WMS_LAYERS/.maps/.single/\$1.qgs [QSA]" > /Library/Server/Web/Data/Sites/Default/wms/qgis/.htaccess';
  $cmd[]['rsh']='[ -f /Library/Server/Web/Data/Sites/Default/wms/mapserv.cgi ] || ln -s /Library/WebServer/CGI-Executables/mapserv /Library/Server/Web/Data/Sites/Default/wms/mapserv.cgi';
  $cmd[]['rsh']='[ -f /Library/Server/Web/Data/Sites/Default/wms/qgis/qgis_mapserv.cgi ] || ln -s /Applications/QGIS.app/Contents/MacOS/fcgi-bin/qgis_mapserv.fcgi /Library/Server/Web/Data/Sites/Default/wms/qgis/qgis_mapserv.cgi';
  $cmd[]['rsh']='mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO \\`CRM_CONFIG\\` (\\`CONF_KEY\\`,\\`CONF_VAL\\`) VALUES (\'module_WMS\',\'on\')"';
@@ -1883,7 +1883,7 @@ www_share_point=\"SKANY\"
 
 [WMS_LAYERS_COLUMN]
 mount_point=\"WMS_LAYERS\"
-share_point=\"//biuro.biall-net.pl/WMS_LAYERS\"
+share_point=\"WMS_LAYERS\"
 www_share_point=\"WMS_LAYERS\"
 LOOKAT_FOLDER_LOOK_GLOB=\"<VARNAME>\"
 LOOKAT_FOLDER_VARNAME=\"ID\"
@@ -2396,7 +2396,7 @@ function INSTALL_SES_PROCESY_A() {
 
 	 	$exec='php -r"include(\''.$INSTALL_ROOT.'/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'test_db\',\'test_db\',0,\'WYSLIJ_DO_BAZY\',\'CREATE_ZASOBY_DATABASE_DESC\',\'3\'); " '.$_SERVER['SERVER_NAME'].' FILTR'; //@2013-10-15 staje recznie ?
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of2/3 CREATE_ZASOBY_DATABASE_DESC',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);flush();$out="";$exit="";
-	 	$exec='php -r"include(\''.$INSTALL_ROOT.'/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'default_db\',\'test_db\',0,\'WYSLIJ_DO_BAZY\',\'FROM_ZASOBY_TO_ZASOBY\',\'3\'); " '.$_SERVER['SERVER_NAME'].' %PISM%,%zasob%,%ADMINISTRACJA%,%wyposazenie%,%global%,%WMS%'; //import procesow z tagami PISMO
+	 	$exec='php -r"include(\''.$INSTALL_ROOT.'/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'default_db\',\'test_db\',0,\'WYSLIJ_DO_BAZY\',\'FROM_ZASOBY_TO_ZASOBY\',\'3\'); " '.$_SERVER['SERVER_NAME'].' %PISM%,%zasob%,%ADMINISTRACJA%,%wyposazenie%,%global%,%WMS%,%ISP%'; //import procesow z tagami PISMO
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of3/4/1 FROM_ZASOBY_TO_ZASOBY',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);flush();$out="";$exit="";
 	 	//tutaj bedzie TODO mysqldump do katalogu installera i komendy z tym zwiazane musza byc jakies - przekopiuj dumpa, odpal go w bazie glownej
 	 	$exec='php -r"include(\''.$INSTALL_ROOT.'/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'test_db\',\'test_db\',0,\'WYSLIJ_DO_BAZY\',\'SYNC_ZASOBY_STRUCTURES_FROM_CONFIG\'); " '.$_SERVER['SERVER_NAME'].' FILTR'; //todo pare razy trzaba powtarzac bo sa bledy