--- trunk/tntnet/dynamic/critical.ecpp	2007/12/02 16:56:14	122
+++ trunk/tntnet/dynamic/critical.ecpp	2007/12/05 10:47:51	156
@@ -4,19 +4,6 @@
 #include <tntdb/result.h>
 #include <tntdb/row.h>
 
-//#include <vector>
-#include <sstream>
-
-/*
-class CriticalInstallation
-{
-public:
-	CriticalInstallation() {}
-	CriticalInstallation(int i, std::string m) : id(i), message(m) {}
-	int id;
-	std::string message;
-};*/
-
 </%pre>
 
 <%config>
@@ -29,21 +16,13 @@
 
 <{
 
-
-//std::vector<CriticalInstallation> criticals;
+reply.setHeader("Refresh", "120");
 
 tntdb::Connection conn = tntdb::connect(dburl); 
 
-/*
-tntdb::Result res = conn.select("SELECT id FROM installation WHERE commerror = true");
-for (int i=0; i<res.size(); ++i)
-{
-	criticals.push_back(CriticalInstallation(res[i].getInt(0), std::string("Communication Error")));
-}*/
-
 
 std::string query1;
-query1 += "SELECT c.name, i.description, i.id ";
+query1 += "SELECT c.name, i.description, i.id, i.commerror ";
 query1 += "FROM installation i INNER JOIN customer c ";
 query1 += "ON i.customerid = c.id";
 
@@ -51,21 +30,21 @@
 tntdb::Result inst_res = conn.select(query1);
 
 
-
 std::string query2;
-query2 += "SELECT commerror,temperature,flamedetector,conveyorerror,powerfailure ";
+query2 += "SELECT temperature,flamedetector,conveyorerror,powerfailure ";
 query2 += "FROM logtable ";
-query2 += "INNER JOIN installation ";
-query2 += "ON logtable.installationnr = installation.id ";
 query2 += "WHERE installationnr = :v1 ";
 query2 += "ORDER BY messagenr DESC ";
 query2 += "LIMIT 1";
 
+
 tntdb::Statement st = conn.prepare(query2);
 
 std::ostream& out = reply.out();
 
-for (int i=0; i<inst_res.size(); i++)
+bool hasCritical = false;
+
+for (unsigned i=0; i<inst_res.size(); i++)
 {
 	int id = inst_res[i].getInt(2);
 	st.clear();
@@ -73,41 +52,51 @@
 	st.setInt("v1", id);
 	tntdb::Result res = st.select();
 
+	bool commerror = inst_res[i].getBool(3);
+	int temperature = 50;
+	bool flameDetector = true;
+	bool conveyorError = false;
+	bool powerFailure = false;
+
 	if (res.size() > 0)
 	{
-		bool commerror = res[0].getBool(0);
-		int temperature = res[0].getInt(1);
-		bool flameDetector = res[0].getBool(2);
-		bool conveyorError = res[0].getBool(3);
-		bool powerFailure = res[0].getBool(4);
+		temperature = res[0].getInt(0);
+		flameDetector = res[0].getBool(1);
+		conveyorError = res[0].getBool(2);
+		powerFailure = res[0].getBool(3);
+	}
 
-		if (commerror || temperature > 90 || flameDetector == false || conveyorError || powerFailure)
-		{
-			out << "<a href='installationdetails?id=" << id << "'><b>" << inst_res[i].getString(0) << "</b> : " << inst_res[i].getString(1) << "<br></a>\n";
-			out << "<ul>";
+	if (commerror || temperature > 90 || flameDetector == false || conveyorError || powerFailure)
+	{
+		out << "<a href='installationdetails?id=" << id << "'><b>" << inst_res[i].getString(0) << "</b> : " << inst_res[i].getString(1) << "<br></a>\n";
+		out << "<ul>";
 
-			if (temperature > 90)
-				out << "<li>High temperature</li>\n";
+		if (temperature > 90)
+			out << "<li>High temperature</li>\n";
 
-			if (commerror)
-				out << "<li>Communication error</li>\n";
+		if (commerror)
+			out << "<li>Communication error</li>\n";
 
-			if (flameDetector == false)
-				out << "<li>No flames</li>\n";
+		if (flameDetector == false)
+			out << "<li>No flames</li>\n";
 
-			if (conveyorError)
-				out << "<li>Conveyor error</li>\n";
+		if (conveyorError)
+			out << "<li>Conveyor error</li>\n";
 
-			if (powerFailure)
-				out << "<li>Power failure</li>\n";
+		if (powerFailure)
+			out << "<li>Power failure</li>\n";
 
-			out << "</ul>\n";
+		out << "</ul>\n";
 
-			
-		}
+		hasCritical = true;
 	}
 }
 
+if (hasCritical == false)
+{
+	out << "<i>No critical installations found</i>\n";
+}
+
 }>
 
 <&footer>