From: arjen <arjen>
Date: Sat, 16 Aug 2003 15:28:45 +0000 (+0000)
Subject: Fixed a namespace problem
X-Git-Tag: V0_0_8~23
X-Git-Url: http://www.andromeda.nl/gitweb/?p=gnucomo.git;a=commitdiff_plain;h=734da396cd875d70a588054839790c5f9a9e74ce

Fixed a namespace problem
---

diff --git a/src/gcm_input/message.cpp b/src/gcm_input/message.cpp
index 2c5d3f4..93560a3 100644
--- a/src/gcm_input/message.cpp
+++ b/src/gcm_input/message.cpp
@@ -8,7 +8,7 @@
 ***********************
 **      FILE NAME      : message.cpp
 **      SYSTEM NAME    : Gnucomo - Gnu Computer Monitoring
-**      VERSION NUMBER : $Revision: 1.12 $
+**      VERSION NUMBER : $Revision: 1.13 $
 **
 **  DESCRIPTION      :  Implementation of the message handling classes
 **
@@ -26,7 +26,10 @@
 
 /*****************************
    $Log: message.cpp,v $
-   Revision 1.12  2003-08-11 16:56:16  arjen
+   Revision 1.13  2003-08-16 15:28:45  arjen
+   Fixed a namespace problem
+
+   Revision 1.12  2003/08/11 16:56:16  arjen
    Different kinds of log files are parsed by a collection of objects
    of different classes, derived from the base class line_cooker
    Depending on the message content or the message_type element in
@@ -80,7 +83,7 @@
 
 *****************************/
 
-static const char *RCSID = "$Id: message.cpp,v 1.12 2003-08-11 16:56:16 arjen Exp $";
+static const char *RCSID = "$Id: message.cpp,v 1.13 2003-08-16 15:28:45 arjen Exp $";
 
 #include <algorithm>
 #include <libxml/xpath.h>
@@ -154,17 +157,11 @@ client_message::client_message(std::istream *in, gnucomo_database db)
    certainty      = 0.0;
 }
 
-static const String syslog_date_re("[[:alpha:]]{3} [ 123][0-9] [0-9]{2}:[0-9]{2}:[0-9]{2}");
 static const String mail_date_re("[[:alpha:]]{3}, [ 123]?[0-9] [[:alpha:]]{3} [0-9]{4} [0-9]{2}:[0-9]{2}:[0-9]{2} [+-][0-9]{4}");
 static const String unix_date_re("[[:alpha:]]{3} [[:alpha:]]{3} [ 123][0-9] [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]{4}");
-static const String email_address_re("[[:alnum:]_.-]+@[[:alnum:]_.-]+");
 
-static const regex re_syslog(syslog_date_re + " [[:alnum:]]+ [[:alpha:]]+.*:.+");
-static const regex re_syslog_irix(syslog_date_re + " [0-7][A-T]:[[:alnum:]]+ [[:alpha:]]+.*:.+");
 static const regex re_PGP("-----BEGIN PGP MESSAGE-----");
 static const regex re_dump("^ *DUMP: Date of this level");
-static const regex re_accesslog("(GET|POST) .+ HTTP");
-static const regex re_errorlog("^\\[" + unix_date_re + "\\] \\[(error|notice)\\] .+");
 static const regex re_rpm("[[:alnum:]+-]+-[0-9][[:alnum:].-]");
 
 static const regex re_uxmail_from("^From [^ \t]+[ ]+" + unix_date_re);
@@ -238,7 +235,7 @@ int client_message::readXMLinput(String first_line)
 #ifdef DEBUG
       std::cout << "Looking for a line cooker for " << item->content << "\n";
 #endif
-      list<line_cooker *>::iterator lci = kitchen.begin();
+      std::list<line_cooker *>::iterator lci = kitchen.begin();
       pan = 0;
       while (pan == 0 && lci != kitchen.end())
       {
@@ -412,7 +409,7 @@ double client_message::classify(String host, UTC arriv, String serv)
       {
          //  Scan the list of line cookers if there is anything familiar.
 
-         list<line_cooker *>::iterator lci = kitchen.begin();
+         std::list<line_cooker *>::iterator lci = kitchen.begin();
          pan = 0;
          while (pan == 0 && lci != kitchen.end())
          {