--- trunk/tntnet/dynamic/critical.ecpp	2007/12/02 16:56:14	122
+++ trunk/tntnet/dynamic/critical.ecpp	2007/12/04 13:29:21	145
@@ -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,18 +16,10 @@
 
 <{
 
-
-//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 ";
@@ -51,7 +30,6 @@
 tntdb::Result inst_res = conn.select(query1);
 
 
-
 std::string query2;
 query2 += "SELECT commerror,temperature,flamedetector,conveyorerror,powerfailure ";
 query2 += "FROM logtable ";
@@ -65,7 +43,9 @@
 
 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();
@@ -103,11 +83,16 @@
 
 			out << "</ul>\n";
 
-			
+			hasCritical = true;
 		}
 	}
 }
 
+if (hasCritical == false)
+{
+	out << "<i>No critical installations found</i>\n";
+}
+
 }>
 
 <&footer>