typo in sortby test

This commit is contained in:
Jean-Francois Dockes 2012-12-20 20:11:08 +01:00
parent 826edb3e50
commit 6245b24367
2 changed files with 9 additions and 6 deletions

View File

@ -763,7 +763,7 @@ Query_init(recoll_QueryObject *self, PyObject *, PyObject *)
} }
PyDoc_STRVAR(doc_Query_sortby, PyDoc_STRVAR(doc_Query_sortby,
"sortby(field=fieldname, ascending=true)\n" "sortby(field=fieldname, ascending=True)\n"
"Sort results by 'fieldname', in ascending or descending order.\n" "Sort results by 'fieldname', in ascending or descending order.\n"
"Only one field can be used, no subsorts for now.\n" "Only one field can be used, no subsorts for now.\n"
"Must be called before executing the search\n" "Must be called before executing the search\n"
@ -775,16 +775,17 @@ Query_sortby(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
LOGDEB(("Query_sortby\n")); LOGDEB(("Query_sortby\n"));
static const char *kwlist[] = {"field", "ascending", NULL}; static const char *kwlist[] = {"field", "ascending", NULL};
PyObject *ascobj = 0; PyObject *ascobj = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i", (char**)kwlist, if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|O", (char**)kwlist,
&self->sortfield, &self->sortfield,
&ascobj)) &ascobj))
return 0; return 0;
if (ascobj != 0 && !PyObject_IsTrue(ascobj)) if (ascobj == 0) {
self->ascending = false;
else
self->ascending = true; self->ascending = true;
} else {
self->ascending = PyObject_IsTrue(ascobj);
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }

View File

@ -45,6 +45,8 @@ def extractofile(doc, outfilename=""):
def doquery(db, q): def doquery(db, q):
# Get query object # Get query object
query = db.query() query = db.query()
query.sortby("dmtime", ascending=True)
# Parse/run input query string # Parse/run input query string
nres = query.execute(q, stemming = 0, stemlang="english") nres = query.execute(q, stemming = 0, stemlang="english")
qs = u"Xapian query: [%s]" % query.getxquery() qs = u"Xapian query: [%s]" % query.getxquery()