More changes for DB.

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

3 files changed, 8 insertions, 3 deletions

diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c
index c4aeb9c0..16061519 100644
--- a/src/zabbix_server/actions.c
+++ b/src/zabbix_server/actions.c
@@ -74,7 +74,9 @@ static	void	send_to_user_medias(DB_EVENT *event,DB_ACTION *action, zbx_uint64_t
 	DB_RESULT result;
 	DB_ROW	row;
 
-	result = DBselect("select mediatypeid,sendto,active,severity,period from media where active=%d and userid=%d",MEDIA_STATUS_ACTIVE,userid);
+	zabbix_log( LOG_LEVEL_WARNING, "In send_to_user_medias(triggerid:" ZBX_FS_UI64 ")", event->triggerid);
+
+	result = DBselect("select mediatypeid,sendto,active,severity,period from media where active=%d and userid=" ZBX_FS_UI64,MEDIA_STATUS_ACTIVE,userid);
 
 	while((row=DBfetch(result)))
 	{
diff --git a/src/zabbix_server/events.c b/src/zabbix_server/events.c
index 54804b02..500c1d17 100644
--- a/src/zabbix_server/events.c
+++ b/src/zabbix_server/events.c
@@ -114,6 +114,8 @@ int	process_event(DB_EVENT *event)
 
 	if(event->eventid == 0)
 	{
+		event->eventid = DBget_maxid("event_maxid");
+/*
 		result = DBselect("select event_maxid from nodes where nodeid=%d", CONFIG_NODEID);
 		row = DBfetch(result);
 
@@ -130,6 +132,7 @@ int	process_event(DB_EVENT *event)
 		DBexecute("update nodes set event_maxid=event_maxid+1 where nodeid=%d",
 				CONFIG_NODEID);
 		DBfree_result(result);
+		*/
 	}
 	DBexecute("insert into events(eventid,triggerid,clock,value) values(" ZBX_FS_UI64 "," ZBX_FS_UI64 ",%d,%d)",
 		event->eventid,event->triggerid, event->clock, event->value);
diff --git a/src/zabbix_server/expression.c b/src/zabbix_server/expression.c
index 36082155..35e4209d 100644
--- a/src/zabbix_server/expression.c
+++ b/src/zabbix_server/expression.c
@@ -765,7 +765,7 @@ void	substitute_simple_macros(DB_EVENT *event, DB_ACTION *action, char *data, in
 			/* NOTE: if you make changes for this bloc, don't forgot MVAR_TRIGGER_STATUS block */
 			var_len = strlen(MVAR_TRIGGER_ID);
 
-			zbx_snprintf(replace_to, sizeof(replace_to), "%d", event->triggerid);
+			zbx_snprintf(replace_to, sizeof(replace_to), ZBX_FS_UI64, event->triggerid);
 		}
 		else if(macro_type & (MACRO_TYPE_MESSAGE_SUBJECT | MACRO_TYPE_MESSAGE_BODY) &&
 			strncmp(pr, MVAR_TRIGGER_URL, strlen(MVAR_TRIGGER_URL)) == 0)
@@ -781,7 +781,7 @@ void	substitute_simple_macros(DB_EVENT *event, DB_ACTION *action, char *data, in
 			/* NOTE: if you make changes for this bloc, don't forgot MVAR_TRIGGER_STATUS block */
 			var_len = strlen(MVAR_EVENT_ID);
 
-			zbx_snprintf(replace_to, sizeof(replace_to), "%d", event->eventid);
+			zbx_snprintf(replace_to, sizeof(replace_to), ZBX_FS_UI64, event->eventid);
 		}
 		else if(macro_type & (MACRO_TYPE_MESSAGE_SUBJECT | MACRO_TYPE_MESSAGE_BODY) && 
 			strncmp(pr, MVAR_TRIGGER_SEVERITY, strlen(MVAR_TRIGGER_SEVERITY)) == 0)