|
|
@@ -117,15 +117,16 @@ function dig_next($hist_loop,$prev_tbl,$prev_dig,$loop) {
|
|
|
//search addr
|
|
|
if(isset($z['rel_and'])) {
|
|
|
foreach($z['rel_and'] as $z_rel_and=>$z_rel_and_name) {
|
|
|
- $rel_and_ok=false;
|
|
|
+ $rel_and_ok=1;
|
|
|
foreach($z_rel_and_name as $z_rel_and_name=>$z_rel_and_name_col_to) {
|
|
|
if(isset($prev_dig->$z_rel_and_name)) {
|
|
|
- $rel_and_ok=true;
|
|
|
+ $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;
|
|
|
}
|
|
|
- else $rel_and_ok=false;
|
|
|
+ else $rel_and_ok=1;
|
|
|
}
|
|
|
- if($rel_and_ok) {
|
|
|
+
|
|
|
+ if($rel_and_ok==2) {
|
|
|
foreach($z_rel_and_name as $z_rel_and_name=>$z_rel_and_name_col_to) {
|
|
|
$sql_rel_and[$Z][$z_rel_and_name][$z_rel_and_name_col_to]=$prev_dig->$z_rel_and_name;
|
|
|
}
|
