Initial integration of distributed monitoring.

Changes 3196:HEAD of branches/distributed


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

1 files changed, 9 insertions, 6 deletions

diff --git a/frontends/php/include/bulkloader.inc.php b/frontends/php/include/bulkloader.inc.php
index 0175c167..1ab5abae 100644
--- a/frontends/php/include/bulkloader.inc.php
+++ b/frontends/php/include/bulkloader.inc.php
@@ -34,11 +34,12 @@ include_once    "include/config.inc.php";
 		{
 			return $row["groupid"];
 		}
+		$groupid = get_dbid("groups","groupid");
 
-		$result=DBexecute("insert into groups (name) values (".zbx_dbstr($group).")");
+		$result=DBexecute("insert into groups (groupid,name) values ($groupid,".zbx_dbstr($group).")");
 		if($result)
 		{
-			return DBinsert_id($result,"groups","name");
+			return $groupid;
 		}
 		else
 		{
@@ -57,10 +58,11 @@ include_once    "include/config.inc.php";
 			return $row["usrgrpid"];
 		}
 
-		$result=DBexecute("insert into usrgrp (name) values ('$group')");
+		$usrgrpid=get_dbid("usrgrp","usrgrpid");
+		$result=DBexecute("insert into usrgrp (usrgrpid,name) values ($usrgrpid,'$group')");
 		if($result)
 		{
-			return DBinsert_id($result,"usrgrp","name");
+			return $usrgrpid;
 		}
 		else
 		{
@@ -76,10 +78,11 @@ include_once    "include/config.inc.php";
 		{
 			return 0;
 		}
-		$result=DBexecute("insert into users_groups (usrgrpid,userid) values ($groupid,$userid)");
+		$id=get_dbid("users_groups","id");
+		$result=DBexecute("insert into users_groups (id,usrgrpid,userid) values ($id,$groupid,$userid)");
 		if($result)
 		{
-			return 1;
+			return $id;
 		}
 		return 0;	
 	}