a.binder 8 gadi atpakaļ
vecāks
revīzija
35846aedd0
1 mainītis faili ar 14 papildinājumiem un 8 dzēšanām
  1. 14 8
      SE/dev/audit_krs_con_digger/audit_krs_con_digger.php

+ 14 - 8
SE/dev/audit_krs_con_digger/audit_krs_con_digger.php

@@ -174,23 +174,29 @@ function sql($hist_loop,$prev_tbl,$prev_dig,$loop,$hist_time,$last_tbl,$path,$ta
 						 	$rel_and_ok=1;
 		
 						 	foreach($z_rel_and_name as $z_rel_and_name_cur=>$z_rel_and_name_col_to) {
-							 	if(isset($prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur]) and ( strlen($prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur])) > 0  ) {//and ( strlen($prev_dig->$z_rel_and_name_cur) > 2) 
+							 	if(isset($prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur]) and ( strlen($prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur])) = 0  ) {//and ( strlen($prev_dig->$z_rel_and_name_cur) > 2) 
+									//warunek - nie ma elementu - nie szukamy po nim
+								} else 	if(isset($prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur]) and ( strlen($prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur])) > 0  ) {//and ( strlen($prev_dig->$z_rel_and_name_cur) > 2) 
 								 	if($rel_and_ok<>0) $rel_and_ok=2;
 								 //	echo "\n<br>121 rel_and from:".$last_tbl." name: ".$z_rel_and_name_cur." OK for tbl ".$Z." z_rel_and_name_col_to: ".$z_rel_and_name_col_to." value:".$prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur]." rel_and_ok=".$rel_and_ok;
 								} else {
-							 	echo "<br>\n #127 UNSET rel_and from:".$last_tbl." name ".$z_rel_and_name_cur." / ".$z_rel_and_name_col_to." ";
-								// 	$rel_and_ok=0;
+							 //	echo "<br>\n #127 UNSET rel_and from:".$last_tbl." name ".$z_rel_and_name_cur." / ".$z_rel_and_name_col_to." ";
+								 	$rel_and_ok=0;
 								}
 						 	}
 
 						  if($rel_and_ok==2) {
 							  $path_rel_and = array();
 						//	  echo "\n<br>#133 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 "\n<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->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur];
-							  	$path_rel_and[]="(".$z_rel_and_name_col_to.")";
-							  }
+								  foreach($z_rel_and_name as $z_rel_and_name_cur=>$z_rel_and_name_col_to) {
+							//		  echo "\n<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;
+									  	if(strlen($prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur]) = 0 ) {
+										  	//warunek nie szukamy po tym elemencie
+									  	} else {
+										  	$sql_rel_and[$Z][$z_rel_and][$z_rel_and_name_col_to]=$prev_dig->$prev_tbl['rel_and'][$z_rel_and][$z_rel_and_name_cur];
+										  	$path_rel_and[]="(".$z_rel_and_name_col_to.")";
+										}
+								  }
 						  } else {
 							//  echo "<br>#137 error rel_and_ok=".$rel_and_ok;
 						  }