Explorar el Código

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

Piotr Labudda hace 9 años
padre
commit
d74e49aee5
Se han modificado 3 ficheros con 81 adiciones y 2 borrados
  1. 1 1
      SE/superedit-STATYSTYKA_TABELE.php
  2. 1 1
      SE/superedit-ZLECENIE_BADAN_1.php
  3. 79 0
      SE/test-sync.php

+ 1 - 1
SE/superedit-STATYSTYKA_TABELE.php

@@ -247,7 +247,7 @@ function STATYSTYKA_TABELE() {
 			////@2012-04-24 aktualizacja ADM_COMPANY z BUILDINGS
 			////@2012-04-24 aktualizacja ADM_COMPANY z BUILDINGS
 
 
             $sqlList[]="UPDATE USERS2_MARKETING AS USERS2_MARKETING , BUILDINGS AS BUILDINGS 
             $sqlList[]="UPDATE USERS2_MARKETING AS USERS2_MARKETING , BUILDINGS AS BUILDINGS 
-            			SET USERS2_MARKETING.A_ADM_COMPANY=BUILDINGS.A_ADM_COMPANY 
+            			SET USERS2_MARKETING.A_ADM_COMPANY=BUILDINGS.A_ADM_COMPANY , USERS2_MARKETING.A_CLASSIFIED=BUILDINGS.A_CLASSIFIED 
 						WHERE USERS2_MARKETING.T_TELBOX_BUILDING_IN=BUILDINGS.S_ADDRESS_STREET;";
 						WHERE USERS2_MARKETING.T_TELBOX_BUILDING_IN=BUILDINGS.S_ADDRESS_STREET;";
                   
                   
 		}
 		}

+ 1 - 1
SE/superedit-ZLECENIE_BADAN_1.php

@@ -106,7 +106,7 @@ if($_GET['ZLECENIE_DYSTRYBUCJI_1_CZY_SWOI']) $ZLECENIE_DYSTRYBUCJI_1_CZY_SWOI_SQ
 
 
 
 
  }
  }
-if($_GET['ZLECENIE_DYSTRYBUCJI_1_WYKLUCZ_APPOITMENTS']) $ZLECENIE_DYSTRYBUCJI_1_CZY_SWOI_SQL.=" and ( unix_timestamp(t1.L_APPOITMENT_DATE)<unix_timestamp(now()) or t1.L_APPOITMENT_TYPE='' )  ";
+if($_GET['ZLECENIE_DYSTRYBUCJI_1_WYKLUCZ_APPOITMENTS']) $ZLECENIE_DYSTRYBUCJI_1_CZY_SWOI_SQL.=" and ( unix_timestamp(t1.L_APPOITMENT_DATE)<unix_timestamp(now())  )  ";
 
 
 
 
 
 

+ 79 - 0
SE/test-sync.php

@@ -0,0 +1,79 @@
+<?php
+	
+	
+		define('DS', DIRECTORY_SEPARATOR);
+		define('APP_PATH_ROOT', dirname(__FILE__));
+		define('APP_PATH_WWW', dirname(__FILE__));
+		define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
+
+
+		require_once APP_PATH_ROOT . DS . 'se-lib' . DS . 'Lib.php';
+		Lib::loadClass('V');
+		Lib::loadClass('Config');
+		Lib::loadClass('DB');
+		Lib::loadClass('User');
+	    session_start();
+                include_once(APP_PATH_CONFIG.'/.config-'.$_SERVER['SERVER_NAME'].'.php');
+
+		include('superedit-DEBUG_S.php');
+
+$CONNREMOTE = DB::getDB('default_db');
+
+echo "test";
+	
+	// aktualizujemy PARAM_OUT dla zaimportowanych zasobow:
+		//@2015-05-15 TODO-test obejscie typespecial PARAM_OUT dla przekazywanych parametrów np. &ZASOB_ID=4095 - trzeba tutaj tez podmienić na właściwy numer zasobu.
+		$sql="select `ID`,`DESC` from CRM_LISTA_ZASOBOW where `TYPE`='PARAM_OUT'
+		-- and SYNC_SQIX_STATUS not like '%FIX_ZASOB%' and SYNC_SQIX_STATUS not like '' 
+		and ID='12951'";
+		echo "sql:".$sql;
+		echo "<pre>";
+		$result=$CONNREMOTE->query($sql) or DEBUG_S(-3,'Problem ze sql ',$sql,__FILE__, __FUNCTION__, __LINE__) or die1(''); 
+			while($h=mysql_fetch_object($result)) {
+				print_r($h);
+
+						if(strstr($h->DESC, '&ZASOB_ID=')) {
+							
+							
+							echo "<br>debug38!<br>\n";
+							
+							$zas_id_param_out_repl=explode('&ZASOB_ID=', $h->DESC);
+							$zas_id_param_out_repl=explode('#', $zas_id_param_out_repl[1]);
+							$id_zas_oryg_h_DESC=$h->DESC; //oryginalna wartosc opisu
+							
+							
+							$zas_id_param_out_repl_2=explode('&ZASOB_ID=', $h->DESC);
+							$zas_id_param_out_repl_2=explode('&', $zas_id_param_out_repl_2[1]);
+							
+							echo "<br>debug48! zas_id_param_out_repl<br>\n";
+							print_r($zas_id_param_out_repl);
+							echo "<br>debug50! zas_id_param_out_repl_2<br>\n";
+							print_r($zas_id_param_out_repl_2);
+							
+							$sql_to_find_parent="select DST_TABLE_ID from CRM_IMPORT_TRANSLATE where REM_TABLE='CRM_LISTA_ZASOBOW' and SRC_TABLE_ID='".$zas_id_param_out_repl[0]."' ;" ;
+							$res_to_find_parent_param=$CONNREMOTE->query($sql_to_find_parent) or DEBUG_S(-3,'Problem ze sql ',$sql_to_find_parent,__FILE__, __FUNCTION__, __LINE__) or die1(''); 
+							//proba 1 dla warunku ID_ZASOB=xxx#
+							while($h_res_to_find_TS=mysql_fetch_object($res_to_find_parent_param)) {
+								$h->DESC=preg_replace('/&ZASOB_ID='.$zas_id_param_out_repl[0].'#/', '&ZASOB_ID='.$h_res_to_find_TS->DST_TABLE_ID.'#', $id_zas_oryg_h_DESC);
+								if(strlen($h->DESC)>0) { $sql_upd="update CRM_LISTA_ZASOBOW set `DESC`='".$CONNREMOTE->_($h->DESC)."' where ID=".$h->ID." ; ";
+							//	$CONNREMOTE->query($sql_upd) or die('Error with upd TYPESPECIAL PARAM_OUT line: 709 ');
+								DEBUG_S(-3,'Nadpisuje TYPESPECIAL PARAM_OUT, ktory ma uzyty URL z ID_ZASOB',$sql_upd,__FILE__,__FUNCTION__,__LINE__);	
+								}							
+							}
+							//proba 2 dla warunku ID_ZASOB=xxx&
+							$res_to_find_parent_param=$CONNREMOTE->query($sql_to_find_parent) or DEBUG_S(-3,'Problem ze sql ',$sql_to_find_parent,__FILE__, __FUNCTION__, __LINE__) or die1(''); 
+							//proba 1 dla warunku ID_ZASOB=xxx#
+							while($h_res_to_find_TS=mysql_fetch_object($res_to_find_parent_param)) {
+								$h->DESC=preg_replace('/&ZASOB_ID='.$zas_id_param_out_repl_2[0].'&/', '&ZASOB_ID='.$h_res_to_find_TS->DST_TABLE_ID.'&', $id_zas_oryg_h_DESC);
+								if(strlen($h->DESC)>0) { $sql_upd="update CRM_LISTA_ZASOBOW set `DESC`='".$CONNREMOTE->_($h->DESC)."' where ID=".$h->ID." ; ";
+							//	$CONNREMOTE->query($sql_upd) or die('Error with upd TYPESPECIAL PARAM_OUT line: 709 ');
+								DEBUG_S(-3,'Nadpisuje TYPESPECIAL PARAM_OUT, ktory ma uzyty URL z ID_ZASOB',$sql_upd,__FILE__,__FUNCTION__,__LINE__);
+								}								
+							}							
+							
+						}
+					
+			}
+					echo "</pre>";
+			
+			?>