tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

python module: return bytes not bytearray in binurl as python file open takes a bytes object. Fix misc small problems seen while implementing tests

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-10-30 16:57:39 +01:00
parent 27584674d5
commit 4b12c0d06c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/python/recoll/pyrecoll.cpp
View File

@ -17,7 +17,7 @@
#include <Python.h> #include <Python.h>
#include <structmember.h> #include <structmember.h>
#include <bytearrayobject.h> #include <bytesobject.h>
#include <strings.h> #include <strings.h>
@ -344,8 +344,8 @@ Doc_getbinurl(recoll_DocObject *self)
PyErr_SetString(PyExc_AttributeError, "doc"); PyErr_SetString(PyExc_AttributeError, "doc");
return 0; return 0;
} }
return PyByteArray_FromStringAndSize(self->doc->url.c_str(), return PyBytes_FromStringAndSize(self->doc->url.c_str(),
self->doc->url.size()); self->doc->url.size());
} }
PyDoc_STRVAR(doc_Doc_setbinurl, PyDoc_STRVAR(doc_Doc_setbinurl,
@ -761,7 +761,7 @@ typedef struct {
Rcl::Query *query; Rcl::Query *query;
int next; // Index of result to be fetched next or -1 if uninit int next; // Index of result to be fetched next or -1 if uninit
int rowcount; // Number of records returned by last execute int rowcount; // Number of records returned by last execute
string *sortfield; string *sortfield; // Need to allocate in here, main program is C.
int ascending; int ascending;
int arraysize; // Default size for fetchmany int arraysize; // Default size for fetchmany
recoll_DbObject* connection; recoll_DbObject* connection;
@ -899,8 +899,8 @@ Query_execute(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
PyMem_Free(sstemlang); PyMem_Free(sstemlang);
} }
LOGDEB(("Query_execute: [%s] dostem %d stemlang [%s]\n", sutf8, dostem, LOGDEB(("Query_execute: [%s] dostem %d stemlang [%s]\n", utf8.c_str(),
stemlang.c_str())); dostem, stemlang.c_str()));
if (self->query == 0 || if (self->query == 0 ||
the_queries.find(self->query) == the_queries.end()) { the_queries.find(self->query) == the_queries.end()) {
@ -999,7 +999,7 @@ Query_fetchone(PyObject *_self)
return 0; return 0;
} }
if (self->next >= self->rowcount) { if (self->next >= self->rowcount) {
PyErr_SetString(PyExc_StopIteration, "End of list reached"); PyErr_SetNone(PyExc_StopIteration);
return 0; return 0;
} }
if (!self->query->getDoc(self->next, *result->doc)) { if (!self->query->getDoc(self->next, *result->doc)) {
@ -1089,12 +1089,13 @@ Query_scroll(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
isrelative = 0; isrelative = 0;
} else { } else {
PyErr_SetString(PyExc_ValueError, "bad mode value"); PyErr_SetString(PyExc_ValueError, "bad mode value");
return 0;
} }
} }
if (self->query == 0 || if (self->query == 0 ||
the_queries.find(self->query) == the_queries.end()) { the_queries.find(self->query) == the_queries.end()) {
PyErr_SetString(PyExc_AttributeError, "query"); PyErr_SetString(PyExc_AttributeError, "null query");
return 0; return 0;
} }
int newpos = isrelative ? self->next + pos : pos; int newpos = isrelative ? self->next + pos : pos;
@ -1291,7 +1292,7 @@ PyDoc_STRVAR(doc_Query_getxquery,
static PyObject * static PyObject *
Query_getxquery(recoll_QueryObject* self, PyObject *, PyObject *) Query_getxquery(recoll_QueryObject* self, PyObject *, PyObject *)
{ {
LOGDEB(("Query_getxquery\n")); LOGDEB(("Query_getxquery self->query %p\n"));
if (self->query == 0 || if (self->query == 0 ||
the_queries.find(self->query) == the_queries.end()) { the_queries.find(self->query) == the_queries.end()) {
@ -1587,6 +1588,7 @@ Db_query(recoll_DbObject* self)
Py_INCREF(self); Py_INCREF(self);
the_queries.insert(result->query); the_queries.insert(result->query);
Py_INCREF(result);
return (PyObject *)result; return (PyObject *)result;
} }