From f54c56f5ea1cd8a2f175ec0c5d8f15208290e4de Mon Sep 17 00:00:00 2001
From: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
Date: Thu, 24 Oct 2013 15:11:59 +0200
Subject: [PATCH] Take snmp_query_id into account when previewing Report Data
 Items

---
 autom8_utilities.php | 4 ++--
 setup.php            | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autom8_utilities.php b/autom8_utilities.php
index d6a71f3..3af71d6 100644
--- a/autom8_utilities.php
+++ b/autom8_utilities.php
@@ -70,12 +70,12 @@ function display_ds_list($rule) {
 LEFT JOIN reportit_data_items AS rdi 
 	ON( dtd.local_data_id = rdi.id AND rdi.report_id = %d ) 
 JOIN data_local AS dl 
-	ON( dl.id = dtd.local_data_id ) 
+	ON( dl.id = dtd.local_data_id AND dl.snmp_query_id = %d ) 
 JOIN ' . $database_idquote . 'host' . $database_idquote .' 
 	ON( host.id = dl.host_id ) 
 JOIN host_template 
 	ON ( host.host_template_id = host_template.id )	
-', $report['id'] );
+', $report['id'], $rule['snmp_query_id'] );
 	
 	// build SQL query SELECT part
 	$sql_select = '
diff --git a/setup.php b/setup.php
index 5e2e0ec..a53bf20 100644
--- a/setup.php
+++ b/setup.php
@@ -305,12 +305,12 @@ function autom8reportit_data_source_action($selected_items){
 LEFT JOIN reportit_data_items AS rdi 
 	ON( dtd.local_data_id = rdi.id AND rdi.report_id = %d ) 
 JOIN data_local AS dl 
-	ON( dl.id = dtd.local_data_id ) 
+	ON( dl.id = dtd.local_data_id AND dl.snmp_query_id = %d ) 
 JOIN ' . $database_idquote . 'host' . $database_idquote .' 
 	ON( host.id = dl.host_id ) 
 JOIN host_template 
 	ON ( host.host_template_id = host_template.id )	
-', $report_rule['report_id'] );
+', $report_rule['report_id'], $report_rule['snmp_query_id'] );
 	
 		// build SQL query SELECT part
 		$sql_select = '
@@ -433,12 +433,12 @@ function autom8reportit_autorrdlist($report_settings){
 LEFT JOIN reportit_data_items AS rdi 
 	ON( dtd.local_data_id = rdi.id AND rdi.report_id = %d ) 
 JOIN data_local AS dl 
-	ON( dl.id = dtd.local_data_id ) 
+	ON( dl.id = dtd.local_data_id AND dl.snmp_query_id = %d ) 
 JOIN ' . $database_idquote . 'host' . $database_idquote .' 
 	ON( host.id = dl.host_id ) 
 JOIN host_template 
 	ON ( host.host_template_id = host_template.id )	
-', $report_rule['report_id'] );
+', $report_rule['report_id'], $report_rule['snmp_query_id'] );
 	
 		// build SQL query SELECT part
 		$sql_select = '