diff options
| author | Detlev Casanova <detlev.casanova@gmail.com> | 2010-07-09 15:31:23 +0200 |
|---|---|---|
| committer | Detlev Casanova <detlev.casanova@gmail.com> | 2010-07-09 15:31:23 +0200 |
| commit | 650c79cb75b4b09257ce0e489c5e20707d8758e0 (patch) | |
| tree | ac82519281043d6bbbf843aee9e99d81ee9b037d /src/dbbase.c | |
| parent | 593766766d7d892b469acda29bdb8d848a68dd3b (diff) | |
| download | layman-650c79cb75b4b09257ce0e489c5e20707d8758e0.tar.gz layman-650c79cb75b4b09257ce0e489c5e20707d8758e0.tar.bz2 layman-650c79cb75b4b09257ce0e489c5e20707d8758e0.zip | |
Add a C <-> Python Dict class and fix DbBase to take a Dict fo it's
config argument
Diffstat (limited to 'src/dbbase.c')
| -rw-r--r-- | src/dbbase.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/dbbase.c b/src/dbbase.c index c617326..dbff007 100644 --- a/src/dbbase.c +++ b/src/dbbase.c @@ -1,6 +1,7 @@ -#include "config.h" +//#include "config.h" #include "dbbase.h" #include "interpreter.h" +#include "dict.h" #include <Python.h> struct DbBase @@ -8,7 +9,7 @@ struct DbBase PyObject *object; }; -DbBase* createDbBase(const char *paths[], unsigned int pathCount, Config *c, int ignore, int quiet, int ignore_init_read_errors) +DbBase* createDbBase(const char *paths[], unsigned int pathCount, Dict *dict, int ignore, int quiet, int ignore_init_read_errors) { PyObject *pypaths = PyList_New(pathCount); for (unsigned int i = 0; i < pathCount; i++) @@ -16,10 +17,8 @@ DbBase* createDbBase(const char *paths[], unsigned int pathCount, Config *c, int PyObject *path = PyBytes_FromString(paths[i]); PyList_Insert(pypaths, i, path); } - - PyObject *cfg = _object(c); - - PyObject *obj = executeFunction("layman.dbbase", "DbBase", "OOIII", pypaths, cfg, ignore, quiet, ignore_init_read_errors); + + PyObject *obj = executeFunction("layman.dbbase", "DbBase", "OOIII", pypaths, dictToPyDict(dict), ignore, quiet, ignore_init_read_errors); Py_DECREF(pypaths); if (!obj) |