smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update android jni wrapper to new API.

This commit is contained in:
Matthieu Gautier 2017-04-07 12:25:05 +02:00
parent 9abdc6ce02
commit 44a77f5846
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/android/kiwix.cpp
View File

@ -9,7 +9,7 @@
#include "unicode/putil.h" #include "unicode/putil.h"
#include "reader.h" #include "reader.h"
#include "xapianSearcher.h" #include "searcher.h"
#include "common/base64.h" #include "common/base64.h"
#include <android/log.h> #include <android/log.h>
@ -23,7 +23,7 @@
/* global variables */ /* global variables */
kiwix::Reader *reader = NULL; kiwix::Reader *reader = NULL;
kiwix::XapianSearcher *searcher = NULL; kiwix::Searcher *searcher = NULL;
static pthread_mutex_t readerLock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t readerLock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t searcherLock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t searcherLock = PTHREAD_MUTEX_INITIALIZER;
@ -445,7 +445,7 @@ JNIEXPORT jboolean JNICALL Java_org_kiwix_kiwixlib_JNIKiwix_loadFulltextIndex(JN
searcher = NULL; searcher = NULL;
try { try {
if (searcher != NULL) delete searcher; if (searcher != NULL) delete searcher;
searcher = new kiwix::XapianSearcher(cPath, NULL); searcher = new kiwix::Searcher(reader);
} catch (...) { } catch (...) {
searcher = NULL; searcher = NULL;
retVal = JNI_FALSE; retVal = JNI_FALSE;
@ -460,7 +460,7 @@ JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwix_indexedQuery
(JNIEnv *env, jclass obj, jstring query, jint count) { (JNIEnv *env, jclass obj, jstring query, jint count) {
std::string cQuery = jni2c(query, env); std::string cQuery = jni2c(query, env);
unsigned int cCount = jni2c(count); unsigned int cCount = jni2c(count);
Result *p_result; kiwix::Result *p_result;
std::string result; std::string result;
pthread_mutex_lock(&searcherLock); pthread_mutex_lock(&searcherLock);