- added value mapping for e-mail content (Eugene)

 - fixed frontend (Eugene)


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

1 files changed, 2 insertions, 1 deletions

diff --git a/include/db.h b/include/db.h
index 09a52719..b602da22 100644
--- a/include/db.h
+++ b/include/db.h
@@ -113,7 +113,7 @@ extern	int	CONFIG_DBPORT;
 #define ACTION_SUBJECT_LEN		255
 #define ACTION_SUBJECT_LEN_MAX		ACTION_SUBJECT_LEN+1
 
-#define ZBX_SQL_ITEM_SELECT	"i.itemid,i.key_,h.host,h.port,i.delay,i.description,i.nextcheck,i.type,i.snmp_community,i.snmp_oid,h.useip,h.ip,i.history,i.lastvalue,i.prevvalue,i.hostid,h.status,i.value_type,h.errors_from,i.snmp_port,i.delta,i.prevorgvalue,i.lastclock,i.units,i.multiplier,i.snmpv3_securityname,i.snmpv3_securitylevel,i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.formula,h.available,i.status,i.trapper_hosts,i.logtimefmt from hosts h, items i"
+#define ZBX_SQL_ITEM_SELECT	"i.itemid,i.key_,h.host,h.port,i.delay,i.description,i.nextcheck,i.type,i.snmp_community,i.snmp_oid,h.useip,h.ip,i.history,i.lastvalue,i.prevvalue,i.hostid,h.status,i.value_type,h.errors_from,i.snmp_port,i.delta,i.prevorgvalue,i.lastclock,i.units,i.multiplier,i.snmpv3_securityname,i.snmpv3_securitylevel,i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.formula,h.available,i.status,i.trapper_hosts,i.logtimefmt,i.valuemapid from hosts h, items i"
 
 DB_HOST
 {
@@ -201,6 +201,7 @@ DB_ITEM
 	char	*eventlog_source;
 
 	char	*logtimefmt;
+	int	valuemapid;
 };
  
 DB_FUNCTION