Improve query errors

src/AndingFilter.cc

@@ -112,6 +112,8 @@ void AndingFilter::combineFilters(int count, int andor)
     if (count > (int)_subfilters.size()) {
         logger(LG_INFO, "Cannot combine %d filters with '%s': only %d are on stack",
                 count, andor == ANDOR_AND ? "AND" : "OR", _subfilters.size());
+        this->setError(400, "Cannot combine %d filters with '%s': only %d are on stack",
+                count, andor == ANDOR_AND ? "AND" : "OR", _subfilters.size());
         return;
     }
 
@@ -126,4 +128,3 @@ void AndingFilter::combineFilters(int count, int andor)
     }
     addSubfilter(andorfilter);
 }
-

src/EmptyColumn.cc

@@ -23,9 +23,15 @@
 // Boston, MA 02110-1301 USA.
 
 #include "EmptyColumn.h"
+#include "EmptyFilter.h"
 #include "Query.h"
 
 void EmptyColumn::output(void *data __attribute__ ((__unused__)), Query *query)
 {
     query->outputString("");
 }
+
+Filter *EmptyColumn::createFilter(int operator_id, char *value)
+{
+    return new EmptyFilter(this, operator_id, value);
+}

src/EmptyColumn.h

@@ -36,6 +36,7 @@ class EmptyColumn : public Column
         Column(name, description, -1) {}
     int type() { return COLTYPE_STRING; }
     void output(void *data, Query *);
+    Filter *createFilter(int operator_id, char *value);
 };
 
 #endif // EmptyColumn_h

src/EmptyFilter.cc

@@ -0,0 +1,28 @@
+#include <stdlib.h>
+#include "EmptyFilter.h"
+#include "EmptyColumn.h"
+#include "opids.h"
+#include "logger.h"
+#include "OutputBuffer.h"
+    EmptyFilter::EmptyFilter(Column *column, int opid, char *value)
+    : _column(column)
+    , _opid(abs(opid))
+{
+}
+
+EmptyFilter::~EmptyFilter()
+{
+}
+
+
+bool EmptyFilter::accepts(void *data)
+{
+    bool pass = false;
+
+    return pass != _negate;
+}
+
+void *EmptyFilter::indexFilter(const char *column)
+{
+    return 0;
+}

src/EmptyFilter.h

@@ -0,0 +1,24 @@
+#ifndef EmptyFilter_h
+#define EmptyFilter_h
+
+#include "config.h"
+
+using namespace std;
+
+#include "Filter.h"
+class EmptyColumn;
+
+class EmptyFilter : public Filter
+{
+    Column *_column;
+    int _opid;
+    bool _negate;
+public:
+    EmptyFilter(Column *_column, int opid, char *value);
+    ~EmptyFilter();
+    bool accepts(void *data);
+    void *indexFilter(const char *column);
+};
+
+
+#endif // EmptyFilter_h

src/Makefile.am

@@ -56,7 +56,7 @@ livestatus_la_SOURCES = \
 	HostlistDependencyColumn.cc HostlistDependencyColumnFilter.cc \
 	ServicelistDependencyColumn.cc ServicelistDependencyColumnFilter.cc \
 	ContactgroupsColumn.cc RowSortedSet.cc HostServiceState.cc opids.cc auth.cc \
-	ContactgroupsObjectlistColumn.cc CommandsMemberColumn.cc
+	ContactgroupsObjectlistColumn.cc CommandsMemberColumn.cc EmptyFilter.cc
 
 if HAVE_DIET
 	diet -v $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^

src/Makefile.manual

@@ -12,10 +12,10 @@
 # |                                                                  |
 # | Copyright Mathias Kettner 2009             [email protected] |
 # +------------------------------------------------------------------+
-# 
+#
 # This file is part of check_mk 1.1.0beta17.
 # The official homepage is at http://mathias-kettner.de/check_mk.
-# 
+#
 # check_mk is free software;  you can redistribute it and/or modify it
 # under the  terms of the  GNU General Public License  as published by
 # the Free Software Foundation in version 2.  check_mk is  distributed
@@ -34,7 +34,7 @@ CFLAGS = -O2 -fPIC -I..
 #endif
 CXXFLAGS = $(CFLAGS)
 
-   
+
 OBJECTS      = TableServices.o TableHosts.o Table.o Query.o StringColumn.o \
 	       OffsetStringColumn.o Store.o store.o logger.o strutil.o \
 	       Filter.o IntColumn.o OffsetIntColumn.o \
@@ -51,7 +51,7 @@ OBJECTS      = TableServices.o TableHosts.o Table.o Query.o StringColumn.o \
 	       ServicegroupsColumn.o HostgroupsColumn.o EmptyColumn.o \
 	       OutputBuffer.o DoubleColumn.o DoubleColumnFilter.o \
 	       OffsetDoubleColumn.o ClientQueue.o InputBuffer.o \
-	       HostSpecialIntColumn.o
+	       HostSpecialIntColumn.o EmptyFilter.o
 
 
 
@@ -75,5 +75,3 @@ deps:
 	gcc -MM *.cc > .deps
 
 -include .deps
-
-

src/Query.cc

@@ -290,10 +290,17 @@ void Query::parseAndOrLine(char *line, int andor, bool filter)
                 andor == ANDOR_OR ? "Or" : "And");
         return;
     }
-    if (filter)
+    if (filter) {
         _filter.combineFilters(number, andor);
-    else
+        if (_filter.hasError()) {
+            _output->setError(_filter.errorCode(), "error in %s header: %s", andor == ANDOR_OR ? "Or" : "And", _filter.errorMessage().c_str());
+        }
+    } else {
         _wait_condition.combineFilters(number, andor);
+        if (_wait_condition.hasError()) {
+            _output->setError(_wait_condition.errorCode(), "error in WaitCondition%s header: %s", andor == ANDOR_OR ? "Or" : "And", _filter.errorMessage().c_str());
+        }
+    }
 }
 
 void Query::parseNegateLine(char *line, bool filter)