|
@@ -159,10 +159,12 @@ public static function _class($type, $sens)
|
|
|
try {
|
|
|
require_once(SYNC_PATH.'/'.$type.'/common.inc.php');
|
|
|
} catch(Throwable $e) {
|
|
|
- var_dump($e);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($e);
|
|
|
sync_error("Could not load common sync class for type ".$type, $e);
|
|
|
} catch(Exception $e) {
|
|
|
- var_dump($e);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($e);
|
|
|
sync_error("Could not load common sync class for type ".$type, $e);
|
|
|
}
|
|
|
|
|
@@ -170,10 +172,12 @@ public static function _class($type, $sens)
|
|
|
try {
|
|
|
require_once(SYNC_PATH.'/'.$type.'/'.$sens.'.inc.php');
|
|
|
} catch(Throwable $e) {
|
|
|
- var_dump($e);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($e);
|
|
|
sync_error("Could not load controller sync class for type ".$type.', sens '.$sens, $e);
|
|
|
} catch(Exception $e) {
|
|
|
- var_dump($e);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($e);
|
|
|
sync_error("Could not load controller sync class for type ".$type.', sens '.$sens, $e);
|
|
|
}
|
|
|
|
|
@@ -190,8 +194,12 @@ public static function _action($type, $sens, $action, $otype, $oid)
|
|
|
$method = 'execute_'.$action;
|
|
|
$r = $controller->$method($otype, $oid);
|
|
|
} catch(Throwable $e) {
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($e);
|
|
|
sync_error('Error executing controller '.$classname.'::'.$method.'('.$otype.','.$oid.')', $e);
|
|
|
} catch(Exception $e) {
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($e);
|
|
|
sync_error('Error executing controller '.$classname.'::'.$method.'('.$otype.','.$oid.')', $e);
|
|
|
}
|
|
|
|
|
@@ -334,7 +342,8 @@ public static function _d_ref_nb($tablename, $fieldname, $str, $length=6, $date_
|
|
|
$nb = 0;
|
|
|
}
|
|
|
|
|
|
- var_dump($nb);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump(nb);
|
|
|
return $nb;
|
|
|
}
|
|
|
public static function d_ref_nb()
|
|
@@ -372,7 +381,8 @@ public static function _dp_map_fk($modelname, $tablename, $id)
|
|
|
if (!($o = static::d_o_oid($modelname, $tablename, $id))) {
|
|
|
$o = static::_action($modelname, 'dp', 'create', $tablename, $id);
|
|
|
}
|
|
|
- var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
if (empty($o))
|
|
|
return;
|
|
|
return $o['p_oid'];
|
|
@@ -385,7 +395,8 @@ public static function _pd_map_fk($modelname, $tablename, $id)
|
|
|
if (!($o = static::p_o_oid($modelname, $tablename, $id))) {
|
|
|
$o = static::_action($modelname, 'pd', 'create', $tablename, $id);
|
|
|
}
|
|
|
- var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
if (empty($o))
|
|
|
return;
|
|
|
return $o['d_oid'];
|
|
@@ -414,7 +425,8 @@ public function pd_execute_osync($otype, $oid)
|
|
|
// Vérif lien existant
|
|
|
// Récupère lien
|
|
|
$o = $this->p_o_oid(static::MODEL_NAME, $otype, $oid);
|
|
|
- var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
|
|
|
//die();
|
|
|
|
|
@@ -430,7 +442,8 @@ public function dp_execute_osync($otype, $oid)
|
|
|
// Vérif lien existant
|
|
|
// Récupère lien
|
|
|
$o = $this->d_o_oid(static::MODEL_NAME, $otype, $oid);
|
|
|
- var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
|
|
|
//die();
|
|
|
|
|
@@ -454,7 +467,8 @@ public function pd_create($otype, $oid)
|
|
|
|
|
|
// Récupère données source
|
|
|
$p_data = $this->p_data($otype, $oid);
|
|
|
- var_dump($p_data);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($p_data);
|
|
|
if (empty($p_data[$otype])) {
|
|
|
sync_error("ERROR ".__METHOD__."($otype, $oid) : Source data does not exists");
|
|
|
return;
|
|
@@ -467,9 +481,11 @@ public function pd_create($otype, $oid)
|
|
|
}
|
|
|
$d_data_map_update = $this->pd_map_update($o, $p_data);
|
|
|
static::_array_merge_recursive($d_data_map, $d_data_map_update);
|
|
|
- var_dump($d_data_map);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($d_data_map);
|
|
|
|
|
|
- echo '<p>CREATION OBJETS</p>';
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ echo '<p>CREATION OBJETS</p>';
|
|
|
|
|
|
// insert main row
|
|
|
if (!($id = DB::d_insert_row($o['d_tref'], $d_data_map[$o['d_tref']]))) {
|
|
@@ -512,11 +528,13 @@ public function dp_create($otype, $oid)
|
|
|
'd_tref'=>$otype,
|
|
|
'd_oid'=>$oid,
|
|
|
];
|
|
|
- var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
|
|
|
// Récupère données source
|
|
|
$d_data = $this->d_data($otype, $oid);
|
|
|
- var_dump($d_data);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($d_data);
|
|
|
if (empty($d_data[$otype])) {
|
|
|
sync_error("ERROR ".__METHOD__."($otype, $oid) : Source data does not exists");
|
|
|
return;
|
|
@@ -527,11 +545,13 @@ public function dp_create($otype, $oid)
|
|
|
sync_error("ERROR ".__METHOD__."($otype, $oid) : map_create()");
|
|
|
$p_data_map_update = $this->dp_map_update($o, $d_data);
|
|
|
static::_array_merge_recursive($p_data_map, $p_data_map_update);
|
|
|
- var_dump($p_data_map);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($p_data_map);
|
|
|
|
|
|
//die();
|
|
|
|
|
|
- echo '<p>CREATION OBJETS</p>';
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ echo '<p>CREATION OBJETS</p>';
|
|
|
|
|
|
// insert main row
|
|
|
if (!($id = DB::p_insert_row($o['p_tref'], $p_data_map[$o['p_tref']]))) {
|
|
@@ -570,11 +590,13 @@ public function dp_map_create(&$o, &$d_data)
|
|
|
// OSYNC
|
|
|
public function pd_osync($o)
|
|
|
{
|
|
|
- var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
|
|
|
// Récupère données source
|
|
|
$p_data = $this->p_data($o['p_tref'], $o['p_oid']);
|
|
|
- var_dump($p_data);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($p_data);
|
|
|
if (empty($p_data[$o['p_tref']])) {
|
|
|
sync_error("ERROR ".__METHOD__."($o[p_tref], $o[p_oid]) : Source data does not exists");
|
|
|
return;
|
|
@@ -582,13 +604,15 @@ public function pd_osync($o)
|
|
|
|
|
|
// Récupère données actuelles en comparaison
|
|
|
$d_data = $this->d_data($o['d_tref'], $o['d_oid']);
|
|
|
- var_dump($d_data);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($d_data);
|
|
|
|
|
|
//die();
|
|
|
|
|
|
// Construit update
|
|
|
$d_data_map = $this->pd_map_update($o, $p_data, $d_data);
|
|
|
- var_dump($d_data_map);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($d_data_map);
|
|
|
|
|
|
// Construit create
|
|
|
$d_data_map_create = $this->pd_map_create($o, $p_data);
|
|
@@ -614,11 +638,13 @@ public function pd_map_update(&$o, &$p_data, &$d_data=[])
|
|
|
|
|
|
public function dp_osync($o)
|
|
|
{
|
|
|
- var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
|
|
|
// Récupère données source
|
|
|
$d_data = $this->d_data($o['d_tref'], $o['d_oid']);
|
|
|
- var_dump($d_data);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($d_data);
|
|
|
if (empty($d_data[static::D_TABLE_MAIN])) {
|
|
|
sync_error("ERROR ".__METHOD__."($o[d_tref], $o[d_oid]) : Source data does not exists");
|
|
|
return;
|
|
@@ -626,20 +652,25 @@ public function dp_osync($o)
|
|
|
|
|
|
// Récupère données actuelles en comparaison
|
|
|
$p_data = $this->p_data($o['p_tref'], $o['p_oid']);
|
|
|
- var_dump($p_data);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($p_data);
|
|
|
|
|
|
//die();
|
|
|
//var_dump('dp_osync()'); var_dump($o);
|
|
|
|
|
|
// Construit update
|
|
|
$p_data_map = $this->dp_map_update($o, $d_data, $p_data);
|
|
|
- var_dump($p_data_map);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($p_data_map);
|
|
|
|
|
|
// Construit create
|
|
|
$p_data_map_create = $this->dp_map_create($o, $d_data);
|
|
|
|
|
|
// Update base
|
|
|
- var_dump('before base sync::p_update_row()'); var_dump($o);
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump('before base sync::p_update_row()');
|
|
|
+ if (DEBUG_AFF)
|
|
|
+ var_dump($o);
|
|
|
static::p_update_row($o['p_tref'], [static::P_TABLE_ID[$o['p_tref']]=>$o['p_oid']], $p_data_map, $p_data_map_create, $p_data);
|
|
|
|
|
|
// Update more
|