diff options
| author | Ted Ross <tross@apache.org> | 2009-09-15 17:45:51 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2009-09-15 17:45:51 +0000 |
| commit | 3f0838479df2a5678a6093f34276b9e336af3ded (patch) | |
| tree | ecceca23bb8b0d37701bb7678cb1d232a8fb4bfc /cpp/bindings/qmf/python | |
| parent | 3cf100216bc1e9c7207a3c963d984665d7a5b9a1 (diff) | |
| download | qpid-python-3f0838479df2a5678a6093f34276b9e336af3ded.tar.gz | |
QMF Console updated to the point where query (get_object) is supported.
The Ruby binding continues to track the c++ engine progress.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@815416 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/bindings/qmf/python')
| -rw-r--r-- | cpp/bindings/qmf/python/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/bindings/qmf/python/qmf.py | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cpp/bindings/qmf/python/Makefile.am b/cpp/bindings/qmf/python/Makefile.am index f51d26bfad..55d9079fb7 100644 --- a/cpp/bindings/qmf/python/Makefile.am +++ b/cpp/bindings/qmf/python/Makefile.am @@ -29,7 +29,7 @@ EXTRA_DIST = python.i BUILT_SOURCES = $(generated_file_list) $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i - swig -python -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(srcdir)/python.i + swig -c++ -python -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(srcdir)/python.i pylibdir = $(PYTHON_LIB) diff --git a/cpp/bindings/qmf/python/qmf.py b/cpp/bindings/qmf/python/qmf.py index 265f204852..4800b327f1 100644 --- a/cpp/bindings/qmf/python/qmf.py +++ b/cpp/bindings/qmf/python/qmf.py @@ -30,6 +30,8 @@ from qmfengine import (TYPE_ABSTIME, TYPE_ARRAY, TYPE_BOOL, TYPE_DELTATIME, TYPE_INT8, TYPE_LIST, TYPE_LSTR, TYPE_MAP, TYPE_OBJECT, TYPE_REF, TYPE_SSTR, TYPE_UINT16, TYPE_UINT32, TYPE_UINT64, TYPE_UINT8, TYPE_UUID) +from qmfengine import (O_EQ, O_NE, O_LT, O_LE, O_GT, O_GE, O_RE_MATCH, O_RE_NOMATCH, + E_NOT, E_AND, E_OR, E_XOR) ##============================================================================== @@ -404,11 +406,16 @@ class Arguments: class Query: - def __init__(self, i=None): + def __init__(self, i=None, package="", cls=None, oid=None): if i: self.impl = i else: - self.impl = qmfengine.Query() + if cls: + self.impl = qmfengine.Query(cls, package) + elif oid: + self.impl = qmfengine.Query(oid) + else: + raise "Argument error" def package_name(self): return self.impl.getPackage() @@ -419,9 +426,6 @@ class Query: return ObjectId(_objid) else: return None - OPER_AND = qmfengine.Query.OPER_AND - OPER_OR = qmfengine.Query.OPER_OR - ##============================================================================== |