From 5348c75c310acdebda488da0aba0c9da58eb5550 Mon Sep 17 00:00:00 2001
From: kelson42 <kelson42@users.sourceforge.net>
Date: Wed, 3 Apr 2013 10:51:24 +0200
Subject: [PATCH] + few improvements.

---
 JNIKiwix.java | 15 ++++++++++++++-
 kiwix.c       | 24 ++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/JNIKiwix.java b/JNIKiwix.java
index 03764aa8f..b0ace64c1 100644
--- a/JNIKiwix.java
+++ b/JNIKiwix.java
@@ -1,6 +1,6 @@
 public class JNIKiwix {    
     public native boolean nativeLoadZIM(String path);    
-    public native String nativeGetContent(String url);
+    public native byte[] nativeGetContent(String url, JNIKiwixString mimeType, JNIKiwixInt size);
 
     static {
         System.loadLibrary("kiwix");
@@ -11,6 +11,11 @@ public class JNIKiwix {
 
 	try {
 	    self.nativeLoadZIM("test.zim");
+	    
+	    JNIKiwixString mimeTypeObj = new JNIKiwixString();
+	    JNIKiwixInt sizeObj = new JNIKiwixInt();
+	    self.nativeGetContent("/A/Wikipedia.html", mimeTypeObj, sizeObj);
+	    System.out.println(mimeTypeObj.value);
 	}
 	catch (Exception e) {
 	    System.out.println("Message " + e.getMessage());
@@ -19,4 +24,12 @@ public class JNIKiwix {
 
 	return;
     }
+}
+
+class JNIKiwixString {
+    String value;
+}
+
+class JNIKiwixInt {
+    int value;
 }
\ No newline at end of file
diff --git a/kiwix.c b/kiwix.c
index e7c6ba289..5141b3669 100644
--- a/kiwix.c
+++ b/kiwix.c
@@ -13,6 +13,14 @@ jstring c2jni(const std::string &val, JNIEnv *env) {
   return env->NewStringUTF(val.c_str());
 }
 
+jint c2jni(const int val) {
+  return (jint)val;
+}
+
+jint c2jni(const unsigned val) {
+  return (unsigned)val;
+}
+
 /* jni2c type conversion functions */
 bool jni2c(const jboolean &val) {
   return val == JNI_TRUE;
@@ -22,11 +30,23 @@ std::string jni2c(const jstring &val, JNIEnv *env) {
   return std::string(env->GetStringUTFChars(val, 0));
 }
 
+int jni2c(const jint val) {
+  return (int)val;
+}
+
+/* Method to deal with variable passed by reference */
+void setStringObjValue(const std::string &value, const jobject obj, JNIEnv *env) {
+  jclass objClass = env->GetObjectClass(obj);
+  jfieldID objFid = env->GetFieldID(objClass, "value", "Ljava/lang/String;");
+  env->SetObjectField(obj, objFid, c2jni(value, env));
+}
+
 /* Kiwix library functions */
 JNIEXPORT jboolean JNICALL Java_JNIKiwix_nativeLoadZIM(JNIEnv *env, jobject obj, jstring path) {
   return c2jni(true);
 }
 
-JNIEXPORT jstring JNICALL Java_JNIKiwix_nativeGetContent(JNIEnv *env, jobject obj, jstring url) {
+JNIEXPORT jbyteArray JNICALL Java_JNIKiwix_nativeGetContent(JNIEnv *env, jobject obj, jstring url, 
+							    jobject mimeTypeObj, jobject sizeObj) {
+  setStringObjValue("42", mimeTypeObj, env);
 }
-