Changeset 9661f81 in nscp for include/parsers/where.cpp

Timestamp:

05/10/10 22:17:31 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

f40d813

Parents:

d1029bd

Message:

2010-05-10 MickeM - 0.3.8 RC2

• Fixed issue with listpdh and debugpdh (not works again) + Fixed issue and added support for IN ( ... ) and NOT IN ( ... ) operators (CheckEventLog)

2010-05-08 MickeM

+ Added new "script templating" thing to simplify adding scripts:

Two new sections: [Script Wrappings] for adding templates and [Wrapped Scripts] for adding the scripts.

%SCRIPT% is replaced with the script name
%ARGS% is replaced with arguments.

vbs=cscript.exe T:30 NoLogo scripts\wrapper.vbs %SCRIPT% %ARGS%

and

w_vbs=check_test.vbs /arg1:1 /arg2:1 /variable:1

is the same as:

w_vbs=cscript.exe T:30 NoLogo scripts\wrapper.vbs check_test.vbs /arg1:1 /arg2:1 /variable:1

• Added correct syntax for VB scripts
• Added correct syntax for powershell scripts
• Cleaned up scripts folder + Added new "NagiosPlugin? library" from op5 + Added check_no_rdp.vbs (Checks that no RDP connection is online) + Added check_battery.vbs which checks batterys via WMI + Added check_printer.vbs to check printers via WMI

File:

• include/parsers/where.cpp (modified) (6 diffs)

include/parsers/where.cpp

@@ -37 +37 @@
 
       value_type operator()(expression_ast<THandler> & ast) {
+        //std::wcout << _T(">>>Setting type: ") << ast.to_string() << _T(" to: ") << ast.get_type() << std::endl;
         value_type type = ast.get_type();
+        //std::wcout << _T("!!!Setting type: ") << ast.to_string() << _T(" to: ") << type << std::endl;
         if (type != type_tbd)
           return type;
         type = boost::apply_visitor(*this, ast.expr);
         ast.set_type(type);
+        //std::wcout << _T("<<<Setting type: ") << ast.to_string() << _T(" to: ") << ast.get_type() << std::endl;
         return type;
       }
@@ -71 +74 @@
           return type_tbd;
         if (handler.can_convert(rt, lt)) {
-          std::wcout << _T("FORCE 001") << std::endl;
+          //std::wcout << _T("FORCE 001") << std::endl;
           right.force_type(lt);
           return lt;
         }
         if (handler.can_convert(lt, rt)) {
-          std::wcout << _T("FORCE 002") << std::endl;
+          //std::wcout << _T("FORCE 002") << std::endl;
           left.force_type(rt);
           return rt;
         }
         if (can_convert(rt, lt)) {
-          std::wcout << _T("FORCE 003") << std::endl;
+          //std::wcout << _T("FORCE 003") << std::endl;
           right.force_type(lt);
           return rt;
         }
         if (can_convert(lt, rt)) {
-          std::wcout << _T("FORCE 004") << std::endl;
+          //std::wcout << _T("FORCE 004") << std::endl;
           left.force_type(rt);
           return lt;
@@ -110 +113 @@
 
       value_type operator()(list_value<THandler> & expr) {
+        BOOST_FOREACH(expression_ast<THandler> &e, expr.list) {
+          operator()(e);
+        }
         return type_tbd;
       }
@@ -171 +177 @@
 
       bool operator()(list_value<THandler> & expr) {
-        // TODO: this is incorrect!
+        BOOST_FOREACH(expression_ast<THandler> e, expr.list) {
+          operator()(e);
+        }
         return true;
       }
@@ -218 +226 @@
 
       bool operator()(list_value<THandler> & expr) {
-        BOOST_FOREACH(expression_ast<THandler> e, expr.list) {
+        BOOST_FOREACH(expression_ast<THandler> &e, expr.list) {
           operator()(e);
         }
@@ -242 +250 @@
     bool parser<THandler>::parse(std::wstring expr) {
       constants::reset();
-      std::wcout << _T("Current time is: ") << constants::get_now() << std::endl;
+      //std::wcout << _T("Current time is: ") << constants::get_now() << std::endl;
       typedef std::wstring::const_iterator iterator_type;
       typedef where_grammar<THandler, iterator_type> grammar;