a first select

git-svn-id: svn+ssh://gitlab/srv/svn-repos/pdb-redo/trunk@451 a1961a4f-ab94-4bcc-80e8-33b5a54de466

include/cif++/Cif++.h

@@ -767,6 +767,21 @@ struct anyMatchesConditionImpl : public ConditionImpl
 	std::regex mRx;
 };
 
+struct allConditionImpl : public ConditionImpl
+{
+	allConditionImpl() {}
+	
+	virtual bool test(const Category& c, const Row& r) const
+    {
+        return true;
+    }
+
+	virtual std::string str() const
+	{
+		return "ALL";
+	}
+};
+
 struct andConditionImpl : public ConditionImpl
 {
 	andConditionImpl(Condition&& a, Condition&& b)
@@ -837,6 +852,37 @@ struct orConditionImpl : public ConditionImpl
 	ConditionImpl* mB;
 };
 
+struct notConditionImpl : public ConditionImpl
+{
+	notConditionImpl(Condition&& a)
+		: mA(nullptr)
+	{
+		std::swap(mA, a.mImpl);
+	}
+	
+	~notConditionImpl()
+	{
+		delete mA;
+	}
+	
+	virtual void prepare(const Category& c)
+	{
+		mA->prepare(c);
+	}
+	
+	virtual bool test(const Category& c, const Row& r) const
+	{
+		return not mA->test(c, r);
+	}
+		
+	virtual std::string str() const
+	{
+		return "NOT (" + mA->str() + ")";
+	}
+	
+	ConditionImpl* mA;
+};
+
 }
 
 inline Condition operator&&(Condition&& a, Condition&& b)
@@ -961,6 +1007,16 @@ Condition any::operator==(const std::regex& rx) const
 	return Condition(new detail::anyMatchesConditionImpl(rx));
 }
 
+inline Condition All()
+{
+    return Condition(new detail::allConditionImpl());
+}
+
+inline Condition Not(Condition&& cond)
+{
+    return Condition(new detail::notConditionImpl(std::move(cond)));
+}
+
 // --------------------------------------------------------------------
 // class RowSet is used to return find results. Use it to re-order the results
 // or to group them 
@@ -1113,6 +1169,7 @@ class Category
 
 	// return index for known column, or the next available column index
 	size_t getColumnIndex(const string& name) const;
+    bool hasColumn(const string& name) const;
 	const string& getColumnName(size_t columnIndex) const;
 	vector<string> getColumnNames() const;
 

src/Cif++.cpp

@@ -1175,6 +1175,11 @@ void Category::setValidator(Validator* v)
 		mCatValidator = nullptr;
 }
 
+bool Category::hasColumn(const string& name) const
+{
+    return getColumnIndex(name) < mColumns.size();
+}
+
 size_t Category::getColumnIndex(const string& name) const
 {
 	size_t result;