mhs-xapian 1.0.18a

data/java/native/Document.cc

@@ -0,0 +1,173 @@
+/**
+ Copyright (c) 2003, Technology Concepts & Design, Inc.
+ Copyright (c) 2008, Olly Betts
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted
+ provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+ and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ - Neither the name of Technology Concepts & Design, Inc. nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+ **/
+ 
+#include "xapian_jni.h"
+
+using namespace std;
+using namespace Xapian;
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_document_1new__ (JNIEnv *env, jclass clazz) {
+    TRY
+        Document *doc = new Document();
+        return _document->put(doc);
+    CATCH(-1)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_document_1new__J (JNIEnv *env, jclass clazz, jlong docid) {
+    TRY
+        Document *existing = _document->get(docid);
+        Document *new_doc = new Document(*existing);
+        return _document->put(new_doc);
+    CATCH(-1)
+}
+
+
+JNIEXPORT jstring JNICALL Java_org_xapian_XapianJNI_docment_1get_1value (JNIEnv *env, jclass clazz, jlong docid, jint value_index) {
+    TRY
+        Document *doc = _document->get(docid);
+        string value = doc->get_value(value_index);
+        if (value.c_str()) {
+            return env->NewStringUTF(value.c_str());
+        } else {
+            return 0;
+        }
+    CATCH(NULL)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1add_1value (JNIEnv *env, jclass clazz, jlong docid, jint value_index, jstring value) {
+    TRY
+        Document *doc = _document->get(docid);
+        const char *c_value = env->GetStringUTFChars(value, 0);
+	string cpp_value(c_value, env->GetStringUTFLength(value));
+        doc->add_value(value_index, cpp_value);
+        env->ReleaseStringUTFChars(value, c_value);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1remove_1value (JNIEnv *env, jclass clazz, jlong docid, jint value_index) {
+    TRY
+        Document *doc = _document->get(docid);
+        doc->remove_value(value_index);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1clear_1values (JNIEnv *env, jclass clazz, jlong docid) {
+    TRY
+        Document *doc = _document->get(docid);
+        doc->clear_values();
+    CATCH(;)
+}
+
+JNIEXPORT jstring JNICALL Java_org_xapian_XapianJNI_document_1get_1data (JNIEnv *env, jclass clazz, jlong docid) {
+    TRY
+        Document *doc = _document->get(docid);
+        return env->NewStringUTF(doc->get_data().c_str());
+    CATCH(NULL)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1set_1data (JNIEnv *env, jclass clazz, jlong docid, jstring data) {
+    TRY
+        Document *doc = _document->get(docid);
+        const char *c_data = env->GetStringUTFChars(data, 0);
+	string cpp_data(c_data, env->GetStringUTFLength(data));
+        doc->set_data(cpp_data);
+        env->ReleaseStringUTFChars(data, c_data);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1add_1posting (JNIEnv *env, jclass clazz, jlong docid, jstring term, jint position) {
+    TRY
+        Document *doc = _document->get(docid);
+        const char *c_term = env->GetStringUTFChars(term, 0);
+	string cpp_term(c_term, env->GetStringUTFLength(term));
+        doc->add_posting(cpp_term, position);
+        env->ReleaseStringUTFChars(term, c_term);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1add_1term (JNIEnv *env, jclass clazz, jlong docid, jstring term) {
+    TRY
+        Document *doc = _document->get(docid);
+        const char *c_term = env->GetStringUTFChars(term, 0);
+	string cpp_term(c_term, env->GetStringUTFLength(term));
+        doc->add_term(cpp_term);
+        env->ReleaseStringUTFChars(term, c_term);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1remove_1posting (JNIEnv *env, jclass clazz, jlong docid, jstring term, jint position) {
+    TRY
+        Document *doc = _document->get(docid);
+        const char *c_term = env->GetStringUTFChars(term, 0);
+	string cpp_term(c_term, env->GetStringUTFLength(term));
+        doc->remove_posting(cpp_term, position);
+        env->ReleaseStringUTFChars(term, c_term);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1remove_1term (JNIEnv *env, jclass clazz, jlong docid, jstring term) {
+    TRY
+        Document *doc = _document->get(docid);
+        const char *c_term = env->GetStringUTFChars(term, 0);
+	string cpp_term(c_term, env->GetStringUTFLength(term));
+        doc->remove_term(cpp_term);
+        env->ReleaseStringUTFChars(term, c_term);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1clear_1terms (JNIEnv *env, jclass clazz, jlong docid) {
+    TRY
+        Document *doc = _document->get(docid);
+        doc->clear_terms();
+    CATCH(;)
+}
+
+JNIEXPORT jint JNICALL Java_org_xapian_XapianJNI_document_1termlist_1count (JNIEnv *env, jclass clazz, jlong docid) {
+    TRY
+        Document *doc = _document->get(docid);
+        return doc->termlist_count();
+    CATCH(-1)
+}
+
+JNIEXPORT jint JNICALL Java_org_xapian_XapianJNI_document_1values_1count (JNIEnv *env, jclass clazz, jlong docid) {
+    TRY
+        Document *doc = _document->get(docid);
+        return doc->values_count();
+    CATCH(-1)
+}
+
+JNIEXPORT jstring JNICALL Java_org_xapian_XapianJNI_document_1get_1description (JNIEnv *env, jclass clazz, jlong docid) {
+    TRY
+        Document *doc = _document->get(docid);
+        return env->NewStringUTF(doc->get_description().c_str());
+    CATCH(NULL)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_document_1finalize (JNIEnv *env, jclass clazz, jlong docid) {
+    Document *doc = _document->remove(docid);
+    if (doc) delete doc;
+}

data/java/native/ESet.cc

@@ -0,0 +1,79 @@
+/**
+ Copyright (c) 2003, Technology Concepts & Design, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted
+ provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+ and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ - Neither the name of Technology Concepts & Design, Inc. nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+ **/
+ 
+#include "xapian_jni.h"
+
+using namespace std;
+using namespace Xapian;
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_eset_1new (JNIEnv *env, jclass clazz) {
+    TRY
+        ESet *eset = new ESet();
+        return _eset->put(eset);
+    CATCH(-1)
+}
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_eset_1get_1ebound (JNIEnv *env, jclass clazz, jlong esetid) {
+    TRY    
+        ESet *eset = _eset->get(esetid);
+        return eset->get_ebound();
+    CATCH(-1)
+}
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_eset_1size (JNIEnv *env, jclass clazz, jlong esetid) {
+    TRY
+        ESet *eset = _eset->get(esetid);
+        return eset->size();
+    CATCH(-1)
+}
+JNIEXPORT jboolean JNICALL Java_org_xapian_XapianJNI_eset_1empty (JNIEnv *env, jclass clazz, jlong esetid) {
+    TRY    
+        ESet *eset = _eset->get(esetid);
+        return eset->empty();
+    CATCH(false)
+}
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_eset_1begin (JNIEnv *env, jclass clazz, jlong esetid) {
+    TRY
+        ESet *eset = _eset->get(esetid);
+        ESetIterator *itr = new ESetIterator(eset->begin());
+        return _esetiterator->put(itr);
+    CATCH(-1)
+}
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_eset_1end (JNIEnv *env, jclass clazz, jlong esetid) {
+    TRY
+        ESet *eset = _eset->get(esetid);
+        ESetIterator *itr = new ESetIterator(eset->end());
+        return _esetiterator->put(itr);
+    CATCH(-1)
+}
+JNIEXPORT jstring JNICALL Java_org_xapian_XapianJNI_eset_1get_1description (JNIEnv *env, jclass clazz, jlong esetid) {
+    TRY
+        ESet *eset = _eset->get(esetid);
+        return env->NewStringUTF(eset->get_description().c_str());
+    CATCH(NULL)
+}
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_eset_1finalize (JNIEnv *env, jclass clazz, jlong esetid) {
+    ESet *eset = _eset->remove(esetid);
+    if (eset) delete eset;
+}

data/java/native/ESetIterator.cc

@@ -0,0 +1,82 @@
+/**
+ Copyright (c) 2003, Technology Concepts & Design, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted
+ provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+ and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ - Neither the name of Technology Concepts & Design, Inc. nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+ **/
+ 
+#include "xapian_jni.h"
+
+using namespace std;
+using namespace Xapian;
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_esetiterator_1new (JNIEnv *env, jclass clazz) {
+    TRY
+        ESetIterator *itr = new ESetIterator();
+        return _esetiterator->put(itr);
+    CATCH(-1)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_esetiterator_1next (JNIEnv *env, jclass clazz, jlong esetiteratorid) {
+    TRY
+        ESetIterator *itr = _esetiterator->get(esetiteratorid);
+        ++(*itr);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_esetiterator_1prev (JNIEnv *env, jclass clazz, jlong esetiteratorid) {
+    TRY
+        ESetIterator *itr = _esetiterator->get(esetiteratorid);
+        --(*itr);
+    CATCH(;)
+}
+
+JNIEXPORT jboolean JNICALL Java_org_xapian_XapianJNI_esetiterator_1equals (JNIEnv *env, jclass clazz, jlong aid, jlong bid) {
+    TRY
+        ESetIterator *a = _esetiterator->get(aid);
+        ESetIterator *b = _esetiterator->get(bid);
+    
+        return (*a) == (*b);
+    CATCH(false)
+}
+JNIEXPORT jstring JNICALL Java_org_xapian_XapianJNI_esetiterator_1get (JNIEnv *env, jclass clazz, jlong esetiteratorid) {
+    TRY
+        ESetIterator *itr = _esetiterator->get(esetiteratorid);
+        return env->NewStringUTF((*(*itr)).c_str());
+    CATCH(NULL)
+}
+JNIEXPORT jdouble JNICALL Java_org_xapian_XapianJNI_esetiterator_1get_1weight (JNIEnv *env, jclass clazz, jlong esetiteratorid) {
+    TRY
+        ESetIterator *itr = _esetiterator->get(esetiteratorid);
+        return itr->get_weight();
+    CATCH(-1.0)
+}
+JNIEXPORT jstring JNICALL Java_org_xapian_XapianJNI_esetiterator_1get_1description (JNIEnv *env, jclass clazz, jlong esetiteratorid) {
+    TRY
+        ESetIterator *itr = _esetiterator->get(esetiteratorid);
+        return env->NewStringUTF(itr->get_description().c_str());
+    CATCH(NULL)
+}
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_esetiterator_1finalize (JNIEnv *env, jclass clazz, jlong esetiteratorid) {
+    ESetIterator *itr = _esetiterator->remove(esetiteratorid);
+    if (itr) delete itr;
+}

data/java/native/Enquire.cc

@@ -0,0 +1,271 @@
+/**
+ Copyright (c) 2003, Technology Concepts & Design, Inc.
+ Copyright (c) 2006, Olly Betts
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted
+ provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+ and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ - Neither the name of Technology Concepts & Design, Inc. nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+ **/
+ 
+#include "xapian_jni.h"
+
+using namespace std;
+using namespace Xapian;
+
+class JavaMatchDecider : public Xapian::MatchDecider {
+    private:
+        JNIEnv *env;
+        jclass clazz;
+
+        jobject _obj;
+        jclass _deciderclass;
+        jmethodID _acceptmethod;
+    public:
+        JavaMatchDecider(JNIEnv *xenv, jclass xclazz, jobject &obj) : MatchDecider() {
+            env = xenv;
+            clazz = xclazz;
+            _obj = obj;
+            TRY
+                _deciderclass = env->GetObjectClass(obj);
+                if (!_deciderclass) goto on_error;
+
+                _acceptmethod = env->GetMethodID(_deciderclass, "accept", "(Lorg/xapian/Document;)Z");
+                if (!_acceptmethod) goto on_error;
+
+on_error:
+            CATCH(;)
+        }
+
+    bool operator() (const Xapian::Document &doc) const {
+        TRY
+            jmethodID ctorid;
+            jobject document;
+            long docid = _document->put(new Document(doc));
+
+            jclass documentclass = env->FindClass("org/xapian/Document");
+            if (!documentclass) goto on_error;
+
+            ctorid = env->GetMethodID(documentclass, "<init>", "(J)V");
+            if (!ctorid) goto on_error;
+
+            document = env->NewObject(documentclass, ctorid, docid);
+            if (!document) goto on_error;
+
+            return env->CallBooleanMethod(_obj, _acceptmethod, document);
+
+on_error:       // I can also "program" in VisualBasic
+        CATCH(-1)
+    }
+};
+
+class JavaExpandDecider : public Xapian::ExpandDecider {
+    private:
+        JNIEnv *env;
+        jclass clazz;
+
+        jobject _obj;
+        jclass _deciderclass;
+        jmethodID _acceptmethod;
+    public:
+        JavaExpandDecider(JNIEnv *xenv, jclass xclazz, jobject &obj) : ExpandDecider() {
+            env = xenv;
+            clazz = xclazz;
+            _obj = obj;
+            TRY
+                _deciderclass = env->GetObjectClass(obj);
+                if (!_deciderclass) goto on_error;
+
+                _acceptmethod = env->GetMethodID(_deciderclass, "accept", "(Ljava/lang/String;)Z");
+                if (!_acceptmethod) goto on_error;
+
+on_error:
+            CATCH(;)
+        }
+
+    bool operator() (const std::string &tname) const {
+        TRY
+            return env->CallBooleanMethod(_obj, _acceptmethod, env->NewStringUTF(tname.c_str()));
+        CATCH(-1)
+    }
+};
+
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1new (JNIEnv *env, jclass clazz, jlong dbid) {
+    TRY
+        Database *db = (Database *) _database->get(dbid);
+        Enquire *e = new Enquire(*db);
+        return _enquire->put(e);
+    CATCH(-1)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1set_1query (JNIEnv *env, jclass clazz, jlong eid, jlong qid) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        Query *q = _query->get(qid);
+        e->set_query(*q);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1set_1query (JNIEnv *env, jclass clazz, jlong eid, jlong qid, jint qlen) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        Query *q = _query->get(qid);
+        e->set_query(*q, qlen);
+    CATCH(;)
+}
+
+// We don't need this wrapped by the JNI - we just handle it at the Java level
+// instead.
+#if 0
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1query (JNIEnv *env, jclass clazz, jlong eid) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        Query q = e->get_query();
+	// Insert magic here!
+        return q.getMyID();
+    CATCH(-1)
+}
+#endif
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1set_1collapse_1key (JNIEnv *env, jclass clazz, jlong eid, jlong collapse_key) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        e->set_collapse_key(collapse_key);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1set_1sort_1forward (JNIEnv *env, jclass clazz, jlong eid, jboolean forward) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        e->set_docid_order(forward ? Xapian::Enquire::ASCENDING : Xapian::Enquire::DESCENDING);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1set_1cutoff (JNIEnv *env, jclass clazz, jlong eid, jint percent_cutoff, jdouble cutoff) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        e->set_cutoff(percent_cutoff, cutoff);
+    CATCH(;)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1set_1sorting (JNIEnv *env, jclass clazz, jlong eid, jlong sortkey, jint bands) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        if (bands) {
+            e->set_sort_by_value(sortkey);
+        } else {
+            e->set_sort_by_relevance();
+        }
+    CATCH(;)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1mset (JNIEnv *env, jclass clazz, jlong eid, jlong first, jlong maxitems, jlong rsetid, jobject md) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        RSet *rset;
+	MatchDecider *mdecider;
+        MSet *mset;
+
+	rset = rsetid > -1 ?_rset->get(rsetid) : NULL;
+
+	if (md) {
+	    JavaMatchDecider mdecider(env, clazz, md);
+	    mset = new MSet (e->get_mset(first, maxitems, rset, &mdecider));
+	} else {
+	    mset = new MSet (e->get_mset(first, maxitems, rset));
+	}
+
+        return _mset->put(mset);
+    CATCH(-1)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1eset__JJJIDLorg_xapian_ExpandDecider_2 (JNIEnv *env, jclass clazz, jlong eid, jlong maxitems, jlong rsetid, jint flags, jdouble k, jobject ed) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        RSet *rset = _rset->get(rsetid);
+        ESet *eset = new ESet (e->get_eset(maxitems, *rset, flags, k, ed ? new JavaExpandDecider(env, clazz, ed) : NULL));
+        return _eset->put(eset);
+    CATCH(-1)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1eset__JJJLorg_xapian_ExpandDecider_2 (JNIEnv *env, jclass clazz, jlong eid, jlong maxitems, jlong rsetid, jobject ed) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        RSet *rset = _rset->get(rsetid);
+        ESet *eset = new ESet(e->get_eset(maxitems, *rset, ed ? new JavaExpandDecider(env, clazz, ed) : NULL));
+        return _eset->put(eset);
+    CATCH(-1)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1matching_1terms_1begin (JNIEnv *env, jclass clazz, jlong eid, jlong dbdocid) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        TermIterator *itr = new TermIterator (e->get_matching_terms_begin(dbdocid));
+        return _termiterator->put(itr);
+    CATCH(-1)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1matching_1terms_1end (JNIEnv *env, jclass clazz, jlong eid, jlong dbdocid) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        TermIterator *itr = new TermIterator (e->get_matching_terms_end(dbdocid));
+        return _termiterator->put(itr);
+    CATCH(-1)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1matching_1terms_1begin_1by_1msetiterator (JNIEnv *env, jclass clazz, jlong eid, jlong msetiteratorid) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        MSetIterator *msetitr = _msetiterator->get(msetiteratorid);
+        TermIterator *itr = new TermIterator (e->get_matching_terms_begin(*msetitr));
+        return _termiterator->put(itr);
+    CATCH(-1)
+}
+
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1matching_1terms_1end_1by_1msetiterator (JNIEnv *env, jclass clazz, jlong eid, jlong msetiteratorid) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        MSetIterator *msetitr = _msetiterator->get(msetiteratorid);
+        TermIterator *itr = new TermIterator (e->get_matching_terms_end(*msetitr));
+        return _termiterator->put(itr);
+    CATCH(-1)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1register_1match_1decider (JNIEnv *env, jclass clazz, jlong eid, jstring name, jobject md) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        const char *c_name = env->GetStringUTFChars(name, 0);
+        e->register_match_decider(c_name, md ? new JavaMatchDecider(env, clazz, md) : NULL);
+        env->ReleaseStringUTFChars(name, c_name);
+    CATCH(;)
+}
+
+JNIEXPORT jstring JNICALL Java_org_xapian_XapianJNI_enquire_1get_1description (JNIEnv *env, jclass clazz, jlong eid) {
+    TRY
+        Enquire *e = _enquire->get(eid);
+        return env->NewStringUTF(e->get_description().c_str());
+    CATCH(NULL)
+}
+
+JNIEXPORT void JNICALL Java_org_xapian_XapianJNI_enquire_1finalize (JNIEnv *env, jclass clazz, jlong eid) {
+    Enquire *e = _enquire->remove(eid);
+    if (e) delete e;
+}