- [NTT-66] merged rev. 5100:5102 of branches/1.4.j/ (Artem) [tuning performance for "Status of Triggers";changes in SCHEMA, index events_1 now: {object,objectid,eventid}]

git-svn-id: svn://svn.zabbix.com/trunk@5103 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 5 insertions, 13 deletions

diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index d862ffb3..cce6627c 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -2245,19 +2245,9 @@
 		return $result;
 	}
 	
-	function get_row_for_nofalseforb($row,$cond){
-
-		$sql = 'SELECT e.eventid, e.value '.
-//				' FROM events e LEFT JOIN triggers t ON e.objectid=t.triggerid AND e.object='.EVENT_OBJECT_TRIGGER.
-//				' WHERE '.zbx_sql_mod('e.object',1000).'='.EVENT_OBJECT_TRIGGER.
-				' FROM events e '.
-					' INNER JOIN triggers t ON e.objectid=t.triggerid '.
-						' AND '.zbx_sql_mod('e.object',1000).'='.EVENT_OBJECT_TRIGGER.
-				' WHERE e.objectid='.$row['triggerid'].
-					' AND t.triggerid=e.objectid '.$cond.
-				' ORDER by e.eventid DESC';
-
+	function get_row_for_nofalseforb($row,$sql){
 		$res_events = DBSelect($sql,1);
+
 		if(!$e_row=DBfetch($res_events)){
 			return false;
 		}
@@ -2266,7 +2256,9 @@
 		}
 
 		if(($row['value']!=TRIGGER_VALUE_TRUE) && (!event_initial_time($row))){
-			if(!$eventid = first_initial_eventid($row,0)) return false;
+			if(!$eventid = first_initial_eventid($row,0)){
+				return false;
+			}
 
 			$sql = 'SELECT e.eventid, e.value'.
 					' FROM events e '.