Changeset 52215d7 in nscp

Timestamp:

02/02/08 20:59:13 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

035c51f

Parents:

bf6e9b4

Message:

+ Added %count% parameter to syntax which (when used with unique) will display the numbe of hits for each message displayed.

Files:

• changelog (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (4 diffs)

changelog

@@ -8 +8 @@
 2008-02-02 MickeM
  * Might have fixed the "missing eventlog messages" problem.
+ + Added %count% parameter to syntax which (when used with unique) will display the numbe of hits for each message displayed.
 
 2008-01-27 MickeM

modules/CheckEventLog/CheckEventLog.cpp

@@ -312 +312 @@
   WORD category;
 public:
+  std::wstring message;
   uniq_eventlog_record(EVENTLOGRECORD *pevlr) : ID(pevlr->EventID&0xffff), type(pevlr->EventType), category(pevlr->EventCategory) {}
   bool operator< (const uniq_eventlog_record &other) const { 
@@ -320 +321 @@
   }
 };
-typedef std::map<uniq_eventlog_record,bool> uniq_eventlog_map;
+typedef std::map<uniq_eventlog_record,unsigned int> uniq_eventlog_map;
 
 
@@ -514 +515 @@
         }
         if (match&&unique) {
-          uniq_eventlog_record record = pevlr;
-          uniq_eventlog_map::const_iterator cit = uniq_records.find(record);
-          if (cit != uniq_records.end()) {
-            match = false;
+          match = false;
+          uniq_eventlog_record uniq_record = pevlr;
+          uniq_eventlog_map::iterator it = uniq_records.find(uniq_record);
+          if (it != uniq_records.end()) {
+            (*it).second ++;
+            //match = false;
           }
-          else
-            uniq_records[record] = true;
-        }
-
-        if (match) {
+          else {
+            if (!syntax.empty()) {
+              uniq_record.message = record.render(bShowDescriptions, syntax);
+            } else if (!bShowDescriptions) {
+              uniq_record.message = record.eventSource();
+            } else {
+              uniq_record.message = record.eventSource();
+              uniq_record.message += _T("(") + EventLogRecord::translateType(record.eventType()) + _T(", ") + 
+                strEx::itos(record.eventID()) + _T(", ") + EventLogRecord::translateSeverity(record.severity()) + _T(")");
+              uniq_record.message += _T("[") + record.enumStrings() + _T("]");
+              uniq_record.message += _T("{%count%}");
+            }
+            uniq_records[uniq_record] = 1;
+          }
+          hit_count++;
+        } else if (match) {
           if (!syntax.empty()) {
             strEx::append_list(message, record.render(bShowDescriptions, syntax));
@@ -542 +556 @@
     } 
     CloseEventLog(hLog);
+    for (uniq_eventlog_map::const_iterator cit = uniq_records.begin(); cit != uniq_records.end(); ++cit) {
+      std::wstring msg = (*cit).first.message;
+      strEx::replace(msg, _T("%count%"), strEx::itos((*cit).second));
+      strEx::append_list(message, msg);
+    }
   }