|
|
@@ -123,23 +123,23 @@ function dig_next($hist_loop,$prev_tbl,$prev_dig,$loop) {
|
|
|
foreach($z_rel_and_name as $z_rel_and_name_cur=>$z_rel_and_name_col_to) {
|
|
|
if(isset($prev_dig->$z_rel_and_name_cur)) {
|
|
|
$rel_and_ok=2;
|
|
|
- echo "<br>121 rel_and OK for tbl ".$Z." z_rel_and_name_col_to: ".$z_rel_and_name_col_to." value:".$prev_dig->$z_rel_and_name_cur." rel_and_ok=".$rel_and_ok;
|
|
|
+ // echo "<br>121 rel_and OK for tbl ".$Z." z_rel_and_name_col_to: ".$z_rel_and_name_col_to." value:".$prev_dig->$z_rel_and_name_cur." rel_and_ok=".$rel_and_ok;
|
|
|
}
|
|
|
else {
|
|
|
- echo "<br> #127 UNSET ".$prev_dig->$z_rel_and_name_cur." / ".$z_rel_and_name_col_to." ";
|
|
|
+ // echo "<br> #127 UNSET ".$prev_dig->$z_rel_and_name_cur." / ".$z_rel_and_name_col_to." ";
|
|
|
$rel_and_ok=1;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if($rel_and_ok==2) {
|
|
|
- echo "<br>#133 Z=".$Z."/z=".$z." ok rel_and_ok=".$rel_and_ok;
|
|
|
+ //echo "<br>#133 Z=".$Z."/z=".$z." ok rel_and_ok=".$rel_and_ok;
|
|
|
foreach($z_rel_and_name as $z_rel_and_name_cur=>$z_rel_and_name_col_to) {
|
|
|
- echo "<br> 135... ok. Z=".$Z."/ z_rel_and_name=".$z_rel_and_name_cur."/ z_rel_and_name_col_to=".$z_rel_and_name_col_to."/ prev_dig-z_rel_and_name_cur=".$prev_dig->$z_rel_and_name_cur;
|
|
|
+ // echo "<br> 135... ok. Z=".$Z."/ z_rel_and_name=".$z_rel_and_name_cur."/ z_rel_and_name_col_to=".$z_rel_and_name_col_to."/ prev_dig-z_rel_and_name_cur=".$prev_dig->$z_rel_and_name_cur;
|
|
|
$sql_rel_and[$Z][$z_rel_and][$z_rel_and_name_col_to]=$prev_dig->$z_rel_and_name_cur;
|
|
|
|
|
|
}
|
|
|
} else {
|
|
|
- echo "<br>#137 error rel_and_ok=".$rel_and_ok;
|
|
|
+ // echo "<br>#137 error rel_and_ok=".$rel_and_ok;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -159,6 +159,11 @@ function dig_next($hist_loop,$prev_tbl,$prev_dig,$loop) {
|
|
|
if( isset($sql_rel_and_sql[$T][$z_rel_and_name])) $sql_rel_and_sql[$T][$z_rel_and_name].=" and `".$z_rel_and_name_cur."` like '%.".$z_rel_and_name_col_to."%'" ;
|
|
|
else $sql_rel_and_sql[$T][$z_rel_and_name]=" `".$z_rel_and_name_cur."` like '%.".$z_rel_and_name_col_to."%'" ;
|
|
|
}
|
|
|
+ if( isset($hist_loop[$T])) {
|
|
|
+ foreach($hist_loop[$T] as $hist_rec) {
|
|
|
+ $sql_rel_and_sql[$T][$z_rel_and_name].=" and ID!='".$hist_rec->ID."' ";
|
|
|
+ }
|
|
|
+ }
|
|
|
$sql_rel_and_sql[$T][$z_rel_and_name].=" ; " ;
|
|
|
}
|
|
|
}
|