svnno****@sourc*****
svnno****@sourc*****
2008年 12月 22日 (月) 18:01:04 JST
Revision: 10
http://svn.sourceforge.jp/view?root=senna-java&view=rev&rev=10
Author: mir
Date: 2008-12-22 18:01:03 +0900 (Mon, 22 Dec 2008)
Log Message:
-----------
* src/test/senna/SnippetTest.java: add logging
* src/test/senna/IndexTest.java: add logging
* src/jni/senna_SennaLogger.c (Java_senna_SennaLogger_write): works now
* src/jni/senna_SennaLogger.c (Java_senna_SennaLogger_open): refactorying
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/jni/Makefile
trunk/src/jni/senna_SennaLogger.c
trunk/src/test/senna/IndexTest.java
trunk/src/test/senna/SnippetTest.java
-------------- next part --------------
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-22 06:49:01 UTC (rev 9)
+++ trunk/ChangeLog 2008-12-22 09:01:03 UTC (rev 10)
@@ -1,4 +1,10 @@
2008-12-22 Tetsuro IKEDA <ikdtt****@gmail*****>
+ * src/test/senna/SnippetTest.java: add logging
+ * src/test/senna/IndexTest.java: add logging
+ * src/jni/senna_SennaLogger.c (Java_senna_SennaLogger_write): works now
+ * src/jni/senna_SennaLogger.c (Java_senna_SennaLogger_open): refactorying
+
+2008-12-22 Tetsuro IKEDA <ikdtt****@gmail*****>
* src/java/senna/SennaLogger.java: add write method
* src/jni/senna_SennaLogger.h: add write method
* src/jni/senna_SennaLogger.c: add write method
Modified: trunk/src/jni/Makefile
===================================================================
--- trunk/src/jni/Makefile 2008-12-22 06:49:01 UTC (rev 9)
+++ trunk/src/jni/Makefile 2008-12-22 09:01:03 UTC (rev 10)
@@ -24,7 +24,7 @@
senna_Snippet.o: senna_Snippet.c senna_Snippet.h
$(CC) $(OPT) $(INCLUDES) -o $@ -g -c $<
-senna_Logger.o: senna_SennaLogger.c senna_SennaLogger.h
+senna_SennaLogger.o: senna_SennaLogger.c senna_SennaLogger.h
$(CC) $(OPT) $(INCLUDES) -o $@ -g -c $<
clean:
Modified: trunk/src/jni/senna_SennaLogger.c
===================================================================
--- trunk/src/jni/senna_SennaLogger.c 2008-12-22 06:49:01 UTC (rev 9)
+++ trunk/src/jni/senna_SennaLogger.c 2008-12-22 09:01:03 UTC (rev 10)
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <string.h>
#include "senna_java.h"
#include "senna_SennaLogger.h"
@@ -49,14 +50,14 @@
JNIEXPORT void JNICALL
Java_senna_SennaLogger_open(JNIEnv *env, jclass clazz, jstring path_str, jint level)
{
- log_file_path = (*env)->GetStringUTFChars(env, path_str, NULL);
- log_level = level;
-
if (!fp)
{
+ log_file_path = (*env)->GetStringUTFChars(env, path_str, NULL);
fp = fopen(log_file_path, "a");
+ (*env)->ReleaseStringUTFChars(env, path_str, log_file_path);
}
+ log_level = level;
senna_logger.max_level = (sen_log_level) log_level;
sen_logger_info_set(&senna_logger);
}
@@ -106,7 +107,12 @@
*/
JNIEXPORT void JNICALL
Java_senna_SennaLogger_write(JNIEnv *env, jclass clazz,
- jint level, jstring message)
+ jint level, jstring str)
{
- SEN_LOG(level, message);
+ char buf[1024];
+ const char *msg;
+ msg = (*env)->GetStringUTFChars(env, str, NULL);
+ strncpy(buf, msg, 1024);
+ SEN_LOG((sen_log_level) level, buf);
+ (*env)->ReleaseStringUTFChars(env, str, msg);
}
Modified: trunk/src/test/senna/IndexTest.java
===================================================================
--- trunk/src/test/senna/IndexTest.java 2008-12-22 06:49:01 UTC (rev 9)
+++ trunk/src/test/senna/IndexTest.java 2008-12-22 09:01:03 UTC (rev 10)
@@ -28,13 +28,16 @@
protected void setUp() throws Exception {
Senna.init();
+ SennaLogger.open("senna.log",Senna.SEN_LOG_DEBUG);
}
protected void tearDown() throws Exception {
+ SennaLogger.close();
Senna.fin();
}
public void testCreate() throws Exception {
+ SennaLogger.write(Senna.SEN_LOG_DEBUG, "=== IndexTest#testCreate() ===");
// create
Index index = Index.create("tests/testindex");
assertNotNull(index);
@@ -50,7 +53,8 @@
}
public void testInsert() throws Exception {
- Index index = Index.create("tests/testindex");
+ SennaLogger.write(Senna.SEN_LOG_DEBUG, "=== IndexTest#testInsert() ===");
+ Index index = Index.create("tests/testindex",0,0,0,Senna.SEN_ENC_UTF8);
index.printInfo();
index.insert("ほげ", "東京都");
Records records = index.sel("東京");
Modified: trunk/src/test/senna/SnippetTest.java
===================================================================
--- trunk/src/test/senna/SnippetTest.java 2008-12-22 06:49:01 UTC (rev 9)
+++ trunk/src/test/senna/SnippetTest.java 2008-12-22 09:01:03 UTC (rev 10)
@@ -28,13 +28,16 @@
protected void setUp() throws Exception {
Senna.init();
+ SennaLogger.open("senna.log",Senna.SEN_LOG_DEBUG);
}
protected void tearDown() throws Exception {
+ SennaLogger.close();
Senna.fin();
}
public void testSnippet() throws Exception {
+ SennaLogger.write(Senna.SEN_LOG_DEBUG,"== SnippetTest#testSnippet() ==");
Snippet snip = new Snippet(Senna.SEN_ENC_UTF8,
Senna.SEN_SNIP_NORMALIZE, 60, 1, "{", "}", 0);
assertNotNull(snip);