[liblouis-liblouisxml] [liblouisutdml] 6 new revisions pushed by mwhapples on 2014-06-06 08:42 GMT
- From: liblouisutdml@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Fri, 06 Jun 2014 08:42:47 +0000
6 new revisions:
Revision: c36c57ca2748
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 07:26:46 2014 UTC
Log: Improvements to Java bindings including some logging functions
http://code.google.com/p/liblouisutdml/source/detail?r=c36c57ca2748
Revision: 5fa522225bdf
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 08:25:01 2014 UTC
Log: Added new files to Makefile.am and more separation of liblouis
and lib...
http://code.google.com/p/liblouisutdml/source/detail?r=5fa522225bdf
Revision: f83d6a0348e2
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 11:29:28 2014 UTC
Log: Added liblouis logging callback functions to Java bindings and
some re...
http://code.google.com/p/liblouisutdml/source/detail?r=f83d6a0348e2
Revision: 0a3dd1d00624
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 16:25:54 2014 UTC
Log: More refactoring of liblouisutdml Java bindings
http://code.google.com/p/liblouisutdml/source/detail?r=0a3dd1d00624
Revision: c37cc478bd28
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 16:48:54 2014 UTC
Log: Correct a type to remove warnings.
http://code.google.com/p/liblouisutdml/source/detail?r=c37cc478bd28
Revision: 041052b3526d
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 16:52:41 2014 UTC
Log: Another type change
http://code.google.com/p/liblouisutdml/source/detail?r=041052b3526d
==============================================================================
Revision: c36c57ca2748
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 07:26:46 2014 UTC
Log: Improvements to Java bindings including some logging functions
http://code.google.com/p/liblouisutdml/source/detail?r=c36c57ca2748
Added:
/java/src/org/liblouis/LibLouis.java
/java/src/org/liblouis/LibLouisUTDML.java
Deleted:
/java/src/org/liblouis/liblouisutdml.java
Modified:
/java/Jliblouisutdml.c
/java/Jliblouisutdml.h
=======================================
--- /dev/null
+++ /java/src/org/liblouis/LibLouis.java Thu Jun 5 07:26:46 2014 UTC
@@ -0,0 +1,44 @@
+package org.liblouis;
+
+import java.io.File;
+
+public final class LibLouis
+{
+ private static LibLouis singleInstance = null;
+ private static boolean libraryLoaded = false;
+ public static void loadLibrary(String libraryPath, String librarySuffix)
+ {
+ if (libraryLoaded)
+ {
+ return;
+ }
+ if ((libraryPath == null) || (librarySuffix == null))
+ {
+ // Throw an exception
+ }
+ System.load(new File(libraryPath, "liblouis" +
librarySuffix).getAbsolutePath());
+ libraryLoaded = true;
+ }
+ private LibLouis()
+ {
+ }
+ public static LibLouis getInstance()
+ {
+ if (singleInstance == null)
+ singleInstance = new LibLouis();
+ return singleInstance;
+ }
+ /**
+ * Set the path for which liblouis will look for tables.
+ */
+ public native void setDataPath(String path);
+ /**
+ * Set the log file for liblouis.
+ */
+ public native void setLogFile(String fileName);
+ /**
+ * End the liblouis log file.
+ */
+ public native void logEnd();
+}
+
=======================================
--- /dev/null
+++ /java/src/org/liblouis/LibLouisUTDML.java Thu Jun 5 07:26:46 2014 UTC
@@ -0,0 +1,278 @@
+/* liblouisutdml Braille Transcription Library
+
+ This file may contain code borrowed from the Linux screenreader
+ BRLTTY, copyright (C) 1999-2006 by
+ the BRLTTY Team
+
+ Copyright (C) 2004, 2005, 2006
+ ViewPlus Technologies, Inc. www.viewplus.com
+ and
+ Abilitiessoft, Inc. www.abilitiessoft.com
+ All rights reserved
+
+ This file is free software; you can redistribute it and/or modify it
+ under the terms of the Lesser or Library GNU General Public License
+ as published by the
+ Free Software Foundation; either version 3, or (at your option) any
+ later version.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ Library GNU General Public License for more details.
+
+ You should have received a copy of the Library GNU General Public
+ License along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+
+ Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxxx
+ */
+
+package org.liblouis;
+
+import java.io.File;
+
+public final class LibLouisUTDML {
+/**
+* Bindings for the liblouisutdml and liblouis C libraries.
+* These bindings include enough functionality so that it should never
+* be necessary to call liblouis directly. This saves the hassle of
+* dealing with two sets of bindings. liblouisutdml can produce a variety
+* of output types according to the value of the formatFor configuration
+* setting. To get UTDML formatFor is set to utd.
+*/
+
+/**
+* Definitions of mode bits
+*
+* The bits for liblouis are included because it is sometimes necessary
+* to pass a liblouis mode to a liblouisutdml function. The liblouis bits
+* take up the low-order bits of the mode integer, while the
+* liblouisutdml bits take up the high-order bits, except that the
+* sign bit is skipped.
+*/
+public static final int NoContractions = 1;
+public static final int CompbrlAtCursor = 1<<1;
+public static final int DotsIO = 1<<2;
+public static final int Comp8Dots = 1<<3;
+public static final int Pass1Only = 1<<4;
+public static final int CompbrlLeftCursor = 1<<5;
+public static final int OtherTrans = 1<<6;
+public static final int UcBrl = 1<<7;
+public static final int DontInit = 1<<30;
+public static final int HtmlDoc = 1<<29;
+public static final int notUC = 1<<28;
+
+public static final int LOG_ALL = -2147483648;
+public static final int LOG_DEBUG = 10000;
+public static final int LOG_INFO = 20000;
+public static final int LOG_WARN = 30000;
+public static final int LOG_ERROR = 40000;
+public static final int LOG_FATAL = 50000;
+public static final int LOG_OFF = 2147483647;
+
+/**
+* This class is a singleton.
+*/
+
+private static LibLouisUTDML singleInstance = new LibLouisUTDML();
+private static boolean libraryLoaded = false;
+
+ private LibLouisUTDML () {
+ }
+
+ public static LibLouisUTDML getInstance()
+ {
+ return singleInstance;
+ }
+
+ public static native void initialize (String dataPath, String
+ writeablePath, String logFile);
+
+ public static void loadLibrary (String libraryPath, String
+ librarySuffix) throws Exception {
+ if (libraryLoaded)
+ return;
+ if (libraryPath == null || librarySuffix == null)
+ throw new Exception (
+ "Could not load libraries. libraryPath or librarySuffix undefined.");
+ LibLouis.loadLibrary(libraryPath, librarySuffix);
+ // System.load (libraryPath + "/liblouis" + librarySuffix);
+ System.load (new File(libraryPath, "liblouisutdml" +
librarySuffix).getAbsolutePath());
+ libraryLoaded = true;
+ }
+
+
+ /** Return a string giving the versions of both liblouisutdml and
+ * liblouis */
+ public native String version ();
+
+/** Make a braille translation of the UTF-8 characters in inbuf
+according to configuration settings to UTF-8 characters in outbuf. The
+latter will be in Unicode braille. The return value is true if the
+translation is successful and false if not. Any errors are recorded in
+logFile. If this is null, they are printed on stderr. There may be
+errors even if the return value is true. If there are none, the log file
+will be empty. settingsstring may be used to pass in configuration
+settings. */
+
+ public native boolean translateString (String configFileList,
+ byte[]inbuf,
+ byte[]outbuf, int[]outlen,
+ String logFilename,
+ String settingsSrting, int mode);
+
+ /** the brf characters in inbuf are translated to print characters in
+ outbuf according to the settings in the configuration files and
+ setingsStrring. The translation will be in UTF-8.
+ */
+
+ public native boolean backTranslateString (String configFileList,
+ byte[]inbuf,
+ byte[]outbuf,
+ int[]outlen,
+ String logFilename,
+ String settingsSrting,
+ int mode);
+
+ /** The xml document in inputFile is translated into braille and the
+ translation is placed
+ in outputFile. The return value and log file are as described above.
+ */
+
+ public native boolean translateFile (String configFileList,
+ String inputFileName,
+ String outputFileName,
+ String logFileName,
+ String settingsString, int mode);
+
+ /** The plain-text file in inFile is translated to braille and the
+ translation placed in outputFile as described for the previous
method.
+ If the text contains blank lines they are treated as paragraph
breaks.
+ */
+
+ public native boolean translateTextFile (String configFileList,
+ String inputFileName,
+ String outputFileName,
+ String logFileName,
+ String settingsString,
+ int mode);
+
+/* Back-translate the brf file in inFile into braille in outFile
+according to configuration specifications.
+*/
+
+ public native boolean backTranslateFile (String configFileList,
+ String inputFileName,
+ String outputFileName,
+ String logFileName,
+ String settingsString,
+ int mode);
+
+/** Convert the utf8 character string in inbuf to Unicode braille dot
+patterns and place the result as a utf8 string in outbuf. */
+
+public native boolean
+charToDots (String tableList, byte[]inbuf,
+ byte[]outbuf, String logFile,
+ int mode);
+
+/** Convert the utf8 string of dot patterns in inbuf to characters and
+place the result as a utf8 string in outbuf. */
+
+public native boolean
+dotsToChar (String tableList, byte[]inbuf,
+ byte[]outbuf, String logFile,
+ int mode);
+
+/** See if the table in tableList exists and is valid. If no errors are
+found logFile will be empty. */
+
+public native boolean
+checkTable (String tableList, String logFile, int mode);
+
+/**
+* Add a new entrry to a table.
+*/
+public native boolean compileString (String tableList, String newEntry,
+String logFile);
+
+/**
+* Path on which liblouis tables and liblouisutdml files can be found.
+*/
+
+public void setDataPath(String path)
+{
+ LibLouis.getInstance().setDataPath(path);
+}
+
+/** Return the character size used internally by liblouis and
+liblouisutdml. */
+
+public native int charSize ();
+
+/**
+* This method performs the functions of the file2brl program in a more
+* contrrolled environment.
+*/
+
+public native boolean file2brl (String[] args);
+
+/**
+* Set the path to which temporary files will be written.
+*/
+public native void setWriteablePath (String path);
+
+/** You must call free at the end of your application to free all
+memory used by liblouisutdml and liblouis. Do NOT call it after every
+call to a liblouisutdml method. This will result in great
+inefficiency. The memory used by liblouisutdml for each document is
+freed wen the method completes, but some memory holding configuration
+settings is held. The memory used by liblouis is freed only when the
+free method is called.
+*/
+
+ public native void free ();
+
+/**
+ * The following methods call liblouis functions. inbuf, outbuf and
+ * typeform must be encoded in UTF-8. Thus it does not matter if
+ * liblouis is compiled for 16-bit or 32-bit Unicodee.
+ */
+public native boolean louisTranslateString
+ (String tableList,
+ byte[]inbuf,
+ int[]inlen,
+ byte[] outbuf,
+ int[]outlen, byte[]typeform, String logFileName, int mode);
+
+ public native boolean louisTranslate (String tableList, byte[]inbuf,
+ int[]inlen, byte[] outbuf, int[]outlen,
+ byte[]typeform, int[]outputPos, int[]inputPos,
+int[]cursorPos, String logFileName, int mode);
+
+public native boolean hyphenate (String tableList, byte[]inbuf,
+ int inlen, byte[]hyphens, String logFileName, int mode);
+
+ public native boolean louisBackTranslateString (String tableList,
+ byte[]inbuf,
+ int[]inlen,
+ byte[] outbuf,
+ int[]outlen, byte[]typeform,
+ String logFileName, int mode);
+
+ public native boolean louisBackTranslate (String tableList,
+byte[]inbuf,
+ int[]inlen, byte[] outbuf, int[]outlen,
+byte[]typeform, int[]outputPos, int[]inputPos, int[]cursorPos, String
+logFileName, int mode);
+
+public native void setLogFile (String fileName);
+
+public native void logEnd();
+
+public native void registerLogCallback(LogCallback cb);
+
+public native void setLogLevel(int level);
+}
=======================================
--- /java/src/org/liblouis/liblouisutdml.java Tue May 13 11:48:53 2014 UTC
+++ /dev/null
@@ -1,272 +0,0 @@
-/* liblouisutdml Braille Transcription Library
-
- This file may contain code borrowed from the Linux screenreader
- BRLTTY, copyright (C) 1999-2006 by
- the BRLTTY Team
-
- Copyright (C) 2004, 2005, 2006
- ViewPlus Technologies, Inc. www.viewplus.com
- and
- Abilitiessoft, Inc. www.abilitiessoft.com
- All rights reserved
-
- This file is free software; you can redistribute it and/or modify it
- under the terms of the Lesser or Library GNU General Public License
- as published by the
- Free Software Foundation; either version 3, or (at your option) any
- later version.
-
- This file is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- Library GNU General Public License for more details.
-
- You should have received a copy of the Library GNU General Public
- License along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxxx
- */
-
-package org.liblouis;
-
-public final class liblouisutdml {
-/**
-* Bindings for the liblouisutdml and liblouis C libraries.
-* These bindings include enough functionality so that it should never
-* be necessary to call liblouis directly. This saves the hassle of
-* dealing with two sets of bindings. liblouisutdml can produce a variety
-* of output types according to the value of the formatFor configuration
-* setting. To get UTDML formatFor is set to utd.
-*/
-
-/**
-* Definitions of mode bits
-*
-* The bits for liblouis are included because it is sometimes necessary
-* to pass a liblouis mode to a liblouisutdml function. The liblouis bits
-* take up the low-order bits of the mode integer, while the
-* liblouisutdml bits take up the high-order bits, except that the
-* sign bit is skipped.
-*/
-public static final int NoContractions = 1;
-public static final int CompbrlAtCursor = 1<<1;
-public static final int DotsIO = 1<<2;
-public static final int Comp8Dots = 1<<3;
-public static final int Pass1Only = 1<<4;
-public static final int CompbrlLeftCursor = 1<<5;
-public static final int OtherTrans = 1<<6;
-public static final int UcBrl = 1<<7;
-public static final int DontInit = 1<<30;
-public static final int HtmlDoc = 1<<29;
-public static final int notUC = 1<<28;
-
-public static final int LOG_ALL = -2147483648;
-public static final int LOG_DEBUG = 10000;
-public static final int LOG_INFO = 20000;
-public static final int LOG_WARN = 30000;
-public static final int LOG_ERROR = 40000;
-public static final int LOG_FATAL = 50000;
-public static final int LOG_OFF = 2147483647;
-
-/**
-* This class is a singleton.
-*/
-
-private static liblouisutdml singleInstance = new liblouisutdml();
-private static boolean libraryLoaded = false;
-
- private liblouisutdml () {
- }
-
- public static liblouisutdml getInstance()
- {
- return singleInstance;
- }
-
- public static native void initialize (String dataPath, String
- writeablePath, String logFile);
-
- public static void loadLibrary (String libraryPath, String
- librarySuffix) throws Exception {
- if (libraryLoaded)
- return;
- if (libraryPath == null || librarySuffix == null)
- throw new Exception (
- "Could not load libraries. libraryPath or librarySuffix undefined.");
- System.load (libraryPath + "/liblouis" + librarySuffix);
- System.load (libraryPath + "/liblouisutdml" + librarySuffix);
- libraryLoaded = true;
- }
-
-
- /** Return a string giving the versions of both liblouisutdml and
- * liblouis */
- public native String version ();
-
-/** Make a braille translation of the UTF-8 characters in inbuf
-according to configuration settings to UTF-8 characters in outbuf. The
-latter will be in Unicode braille. The return value is true if the
-translation is successful and false if not. Any errors are recorded in
-logFile. If this is null, they are printed on stderr. There may be
-errors even if the return value is true. If there are none, the log file
-will be empty. settingsstring may be used to pass in configuration
-settings. */
-
- public native boolean translateString (String configFileList,
- byte[]inbuf,
- byte[]outbuf, int[]outlen,
- String logFilename,
- String settingsSrting, int mode);
-
- /** the brf characters in inbuf are translated to print characters in
- outbuf according to the settings in the configuration files and
- setingsStrring. The translation will be in UTF-8.
- */
-
- public native boolean backTranslateString (String configFileList,
- byte[]inbuf,
- byte[]outbuf,
- int[]outlen,
- String logFilename,
- String settingsSrting,
- int mode);
-
- /** The xml document in inputFile is translated into braille and the
- translation is placed
- in outputFile. The return value and log file are as described above.
- */
-
- public native boolean translateFile (String configFileList,
- String inputFileName,
- String outputFileName,
- String logFileName,
- String settingsString, int mode);
-
- /** The plain-text file in inFile is translated to braille and the
- translation placed in outputFile as described for the previous
method.
- If the text contains blank lines they are treated as paragraph
breaks.
- */
-
- public native boolean translateTextFile (String configFileList,
- String inputFileName,
- String outputFileName,
- String logFileName,
- String settingsString,
- int mode);
-
-/* Back-translate the brf file in inFile into braille in outFile
-according to configuration specifications.
-*/
-
- public native boolean backTranslateFile (String configFileList,
- String inputFileName,
- String outputFileName,
- String logFileName,
- String settingsString,
- int mode);
-
-/** Convert the utf8 character string in inbuf to Unicode braille dot
-patterns and place the result as a utf8 string in outbuf. */
-
-public native boolean
-charToDots (String tableList, byte[]inbuf,
- byte[]outbuf, String logFile,
- int mode);
-
-/** Convert the utf8 string of dot patterns in inbuf to characters and
-place the result as a utf8 string in outbuf. */
-
-public native boolean
-dotsToChar (String tableList, byte[]inbuf,
- byte[]outbuf, String logFile,
- int mode);
-
-/** See if the table in tableList exists and is valid. If no errors are
-found logFile will be empty. */
-
-public native boolean
-checkTable (String tableList, String logFile, int mode);
-
-/**
-* Add a new entrry to a table.
-*/
-public native boolean compileString (String tableList, String newEntry,
-String logFile);
-
-/**
-* Path on which liblouis tables and liblouisutdml files can be found.
-*/
-
-public native void setDataPath(String path);
-
-/** Return the character size used internally by liblouis and
-liblouisutdml. */
-
-public native int charSize ();
-
-/**
-* This method performs the functions of the file2brl program in a more
-* contrrolled environment.
-*/
-
-public native boolean file2brl (String[] args);
-
-/**
-* Set the path to which temporary files will be written.
-*/
-public native void setWriteablePath (String path);
-
-/** You must call free at the end of your application to free all
-memory used by liblouisutdml and liblouis. Do NOT call it after every
-call to a liblouisutdml method. This will result in great
-inefficiency. The memory used by liblouisutdml for each document is
-freed wen the method completes, but some memory holding configuration
-settings is held. The memory used by liblouis is freed only when the
-free method is called.
-*/
-
- public native void free ();
-
-/**
- * The following methods call liblouis functions. inbuf, outbuf and
- * typeform must be encoded in UTF-8. Thus it does not matter if
- * liblouis is compiled for 16-bit or 32-bit Unicodee.
- */
-public native boolean louisTranslateString
- (String tableList,
- byte[]inbuf,
- int[]inlen,
- byte[] outbuf,
- int[]outlen, byte[]typeform, String logFileName, int mode);
-
- public native boolean louisTranslate (String tableList, byte[]inbuf,
- int[]inlen, byte[] outbuf, int[]outlen,
- byte[]typeform, int[]outputPos, int[]inputPos,
-int[]cursorPos, String logFileName, int mode);
-
-public native boolean hyphenate (String tableList, byte[]inbuf,
- int inlen, byte[]hyphens, String logFileName, int mode);
-
- public native boolean louisBackTranslateString (String tableList,
- byte[]inbuf,
- int[]inlen,
- byte[] outbuf,
- int[]outlen, byte[]typeform,
- String logFileName, int mode);
-
- public native boolean louisBackTranslate (String tableList,
-byte[]inbuf,
- int[]inlen, byte[] outbuf, int[]outlen,
-byte[]typeform, int[]outputPos, int[]inputPos, int[]cursorPos, String
-logFileName, int mode);
-
-public native void setLogFile (String fileName);
-
-public native void logEnd();
-
-public native void registerLogCallback(LogCallback cb);
-
-public native void setLogLevel(int level);
-}
=======================================
--- /java/Jliblouisutdml.c Wed May 28 22:09:22 2014 UTC
+++ /java/Jliblouisutdml.c Thu Jun 5 07:26:46 2014 UTC
@@ -32,11 +32,11 @@
#define EMPTY -1000
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: initialize
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_initialize
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_initialize
(JNIEnv *env, jclass class, jstring dataPath, jstring
writeablePath, jstring logfile)
{
@@ -68,23 +68,23 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: version
* Signature: ()Ljava/lang/String;
*/
-JNIEXPORT jstring JNICALL Java_org_liblouis_liblouisutdml_version
+JNIEXPORT jstring JNICALL Java_org_liblouis_LibLouisUTDML_version
(JNIEnv * env, jobject obj)
{
return (*env)->NewStringUTF (env, lbu_version ());
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: translateString
* Signature:
(Ljava/lang/String;[B[B[ILjava/lang/String;Ljava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
-Java_org_liblouis_liblouisutdml_translateString (JNIEnv * env,
+Java_org_liblouis_LibLouisUTDML_translateString (JNIEnv * env,
jobject obj,
jstring
configFileList,
@@ -167,12 +167,12 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: backTranslateString
* Signature:
(Ljava/lang/String;[B[B[ILjava/lang/String;Ljava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
-Java_org_liblouis_liblouisutdml_backTranslateString (JNIEnv * env,
+Java_org_liblouis_LibLouisUTDML_backTranslateString (JNIEnv * env,
jobject obj,
jstring
configFileList,
@@ -265,11 +265,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: translateFile
* Signature:
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_translateFile
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_translateFile
(JNIEnv * env, jobject obj, jstring configFileList, jstring
inputFileName,
jstring outputFileName, jstring logFile, jstring settingsString, jint
mode)
{
@@ -316,12 +316,12 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: translateTextFile
* Signature:
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
-Java_org_liblouis_liblouisutdml_translateTextFile (JNIEnv * env,
+Java_org_liblouis_LibLouisUTDML_translateTextFile (JNIEnv * env,
jobject obj,
jstring
configFileList,
@@ -376,12 +376,12 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: backTranslateFile
* Signature:
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
-Java_org_liblouis_liblouisutdml_backTranslateFile (JNIEnv * env,
+Java_org_liblouis_LibLouisUTDML_backTranslateFile (JNIEnv * env,
jobject obj,
jstring
configFileList,
@@ -436,11 +436,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: charToDots
* Signature: (Ljava/lang/String;[B[BLjava/lang/String;I)V
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_charToDots
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_charToDots
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf,
jbyteArray outbuf, jstring logFile, jint mode)
{
@@ -483,11 +483,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: dotsToChar
* Signature: (Ljava/lang/String;[B[BLjava/lang/String;I)V
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_dotsToChar
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_dotsToChar
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf,
jbyteArray outbuf, jstring logFile, jint mode)
{
@@ -529,11 +529,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: checkTable
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_checkTable
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_checkTable
(JNIEnv * env, jobject obj, jstring tableList, jstring logFile, jint
mode)
{
const jbyte *tableListX = NULL;
@@ -558,11 +558,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: compileString
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_compileString
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_compileString
(JNIEnv * env, jobject obj, jstring tableList, jstring newEntry,
jstring logFile)
{
@@ -597,11 +597,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouis
* Method: setDataPath
* Signature: (Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setDataPath
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setDataPath
(JNIEnv * env, jclass obj, jstring path)
{
const jbyte *pathX = NULL;
@@ -615,22 +615,49 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org.liblouis.LibLouis
+ * Method: setLogFile
+ * Signature: (Ljava.lang.String)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogFile
+ (JNIEnv * env, jobject obj, jstring fileName)
+{
+ jbyte logf = NULL;
+ logf = (*env)->GetStringUTFChars(env, fileName, NULL);
+ if (logf == NULL)
+ return;
+ lou_logFile(logf);
+ (*env)->ReleaseStringUTFChars(env, fileName, logf);
+}
+
+/*
+ * Class: org.liblouis.LibLouis
+ * Method: logEnd
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_logEnd
+ (JNIEnv * env, jobject obj)
+{
+ lou_logEnd();
+}
+
+/*
+ * Class: org_liblouis_LibLouisUTDML
* Method: charSize
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_org_liblouis_liblouisutdml_charSize
+JNIEXPORT jint JNICALL Java_org_liblouis_LibLouisUTDML_charSize
(JNIEnv * env, jobject this)
{
return CHARSIZE;
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: setWriteablePath
* Signature: (Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setWriteablePath
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_setWriteablePath
(JNIEnv * env, jclass obj, jstring path)
{
const jbyte *pathX = NULL;
@@ -644,11 +671,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: free
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_free
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_free
(JNIEnv * env, jobject this)
{
lbu_free ();
@@ -656,7 +683,7 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: file2brl
* Signature: ([Ljava/lang/String;)Z
*/
@@ -686,7 +713,7 @@
return curArg;
}
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_file2brl
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_file2brl
(JNIEnv * env, jobject obj, jobjectArray args)
{
jint numArgs = (*env)->GetArrayLength (env, args);
@@ -1066,12 +1093,12 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisTranslateString
* Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
-Java_org_liblouis_liblouisutdml_louisTranslateString (JNIEnv * env,
+Java_org_liblouis_LibLouisUTDML_louisTranslateString (JNIEnv * env,
jobject obj,
jstring tableList,
jbyteArray inbuf,
@@ -1087,11 +1114,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisTranslate
* Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_louisTranslate
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_louisTranslate
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf,
jintArray inlen,
jbyteArray outbuf, jintArray outlen,
@@ -1104,11 +1131,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: hyphenate
* Signature: (Ljava/lang/String;[BI[BLjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_hyphenate
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_hyphenate
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf, jint
inlen, jbyteArray hyphens, jstring logFile, jint mode)
{
@@ -1159,12 +1186,12 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisBackTranslateString
* Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
- Java_org_liblouis_liblouisutdml_louisBackTranslateString
+ Java_org_liblouis_LibLouisUTDML_louisBackTranslateString
(JNIEnv * env, jobject obj,
jstring tableList,
jbyteArray
@@ -1179,11 +1206,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisBackTranslate
* Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_liblouisutdml_louisBackTranslate
+JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisBackTranslate
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf,
jintArray inlen,
jbyteArray outbuf, jintArray outlen,
@@ -1196,11 +1223,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: setLogFile
* Signature: (Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setLogFile
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_setLogFile
(JNIEnv * env, jobject obj, jstring logFile)
{
const jbyte *logf = NULL;
@@ -1212,11 +1239,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: logEnd
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_logEnd
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_logEnd
(JNIEnv * env, jobject this)
{
lbu_logEnd ();
@@ -1245,11 +1272,11 @@
(*env)->CallVoidMethod(env, logCBFunc, mid, level, jstrMsg);
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: registerLogCallback
* Signature: (Lorg/liblouis/LogCallback;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_registerLogCallback
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_registerLogCallback
(JNIEnv * env, jobject this, jobject cb)
{
// if not previously set, set the JVM pointer
@@ -1284,11 +1311,11 @@
}
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: setLogLevel
*Signature: (I)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setLogLevel
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_setLogLevel
(JNIEnv * env, jobject this, jint level)
{
lbu_setLogLevel(level);
=======================================
--- /java/Jliblouisutdml.h Tue May 13 11:48:53 2014 UTC
+++ /java/Jliblouisutdml.h Thu Jun 5 07:26:46 2014 UTC
@@ -1,246 +1,273 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
-/* Header for class org_liblouis_liblouisutdml */
+/* Header for class org_liblouis_LibLouis */
-#ifndef _Included_org_liblouis_liblouisutdml
-#define _Included_org_liblouis_liblouisutdml
+#ifndef _Included_org_liblouis_LibLouis
+#define _Included_org_liblouis_LibLouis
#ifdef __cplusplus
extern "C" {
#endif
-#undef org_liblouis_liblouisutdml_NoContractions
-#define org_liblouis_liblouisutdml_NoContractions 1L
-#undef org_liblouis_liblouisutdml_CompbrlAtCursor
-#define org_liblouis_liblouisutdml_CompbrlAtCursor 2L
-#undef org_liblouis_liblouisutdml_DotsIO
-#define org_liblouis_liblouisutdml_DotsIO 4L
-#undef org_liblouis_liblouisutdml_Comp8Dots
-#define org_liblouis_liblouisutdml_Comp8Dots 8L
-#undef org_liblouis_liblouisutdml_Pass1Only
-#define org_liblouis_liblouisutdml_Pass1Only 16L
-#undef org_liblouis_liblouisutdml_CompbrlLeftCursor
-#define org_liblouis_liblouisutdml_CompbrlLeftCursor 32L
-#undef org_liblouis_liblouisutdml_OtherTrans
-#define org_liblouis_liblouisutdml_OtherTrans 64L
-#undef org_liblouis_liblouisutdml_UcBrl
-#define org_liblouis_liblouisutdml_UcBrl 128L
-#undef org_liblouis_liblouisutdml_DontInit
-#define org_liblouis_liblouisutdml_DontInit 1073741824L
-#undef org_liblouis_liblouisutdml_HtmlDoc
-#define org_liblouis_liblouisutdml_HtmlDoc 536870912L
-#undef org_liblouis_liblouisutdml_notUC
-#define org_liblouis_liblouisutdml_notUC 268435456L
-#undef org_liblouis_liblouisutdml_LOG_ALL
-#define org_liblouis_liblouisutdml_LOG_ALL -2147483648L
-#undef org_liblouis_liblouisutdml_LOG_DEBUG
-#define org_liblouis_liblouisutdml_LOG_DEBUG 10000L
-#undef org_liblouis_liblouisutdml_LOG_INFO
-#define org_liblouis_liblouisutdml_LOG_INFO 20000L
-#undef org_liblouis_liblouisutdml_LOG_WARN
-#define org_liblouis_liblouisutdml_LOG_WARN 30000L
-#undef org_liblouis_liblouisutdml_LOG_ERROR
-#define org_liblouis_liblouisutdml_LOG_ERROR 40000L
-#undef org_liblouis_liblouisutdml_LOG_FATAL
-#define org_liblouis_liblouisutdml_LOG_FATAL 50000L
-#undef org_liblouis_liblouisutdml_LOG_OFF
-#define org_liblouis_liblouisutdml_LOG_OFF 2147483647L
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: setDataPath
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setDataPath
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: setLogFile
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogFile
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: logEnd
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_logEnd
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class org_liblouis_LibLouisUTDML */
+
+#ifndef _Included_org_liblouis_LibLouisUTDML
+#define _Included_org_liblouis_LibLouisUTDML
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_liblouis_LibLouisUTDML_NoContractions
+#define org_liblouis_LibLouisUTDML_NoContractions 1L
+#undef org_liblouis_LibLouisUTDML_CompbrlAtCursor
+#define org_liblouis_LibLouisUTDML_CompbrlAtCursor 2L
+#undef org_liblouis_LibLouisUTDML_DotsIO
+#define org_liblouis_LibLouisUTDML_DotsIO 4L
+#undef org_liblouis_LibLouisUTDML_Comp8Dots
+#define org_liblouis_LibLouisUTDML_Comp8Dots 8L
+#undef org_liblouis_LibLouisUTDML_Pass1Only
+#define org_liblouis_LibLouisUTDML_Pass1Only 16L
+#undef org_liblouis_LibLouisUTDML_CompbrlLeftCursor
+#define org_liblouis_LibLouisUTDML_CompbrlLeftCursor 32L
+#undef org_liblouis_LibLouisUTDML_OtherTrans
+#define org_liblouis_LibLouisUTDML_OtherTrans 64L
+#undef org_liblouis_LibLouisUTDML_UcBrl
+#define org_liblouis_LibLouisUTDML_UcBrl 128L
+#undef org_liblouis_LibLouisUTDML_DontInit
+#define org_liblouis_LibLouisUTDML_DontInit 1073741824L
+#undef org_liblouis_LibLouisUTDML_HtmlDoc
+#define org_liblouis_LibLouisUTDML_HtmlDoc 536870912L
+#undef org_liblouis_LibLouisUTDML_notUC
+#define org_liblouis_LibLouisUTDML_notUC 268435456L
+#undef org_liblouis_LibLouisUTDML_LOG_ALL
+#define org_liblouis_LibLouisUTDML_LOG_ALL -2147483648L
+#undef org_liblouis_LibLouisUTDML_LOG_DEBUG
+#define org_liblouis_LibLouisUTDML_LOG_DEBUG 10000L
+#undef org_liblouis_LibLouisUTDML_LOG_INFO
+#define org_liblouis_LibLouisUTDML_LOG_INFO 20000L
+#undef org_liblouis_LibLouisUTDML_LOG_WARN
+#define org_liblouis_LibLouisUTDML_LOG_WARN 30000L
+#undef org_liblouis_LibLouisUTDML_LOG_ERROR
+#define org_liblouis_LibLouisUTDML_LOG_ERROR 40000L
+#undef org_liblouis_LibLouisUTDML_LOG_FATAL
+#define org_liblouis_LibLouisUTDML_LOG_FATAL 50000L
+#undef org_liblouis_LibLouisUTDML_LOG_OFF
+#define org_liblouis_LibLouisUTDML_LOG_OFF 2147483647L
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: initialize
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_initialize
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_initialize
(JNIEnv *, jclass, jstring, jstring, jstring);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: version
* Signature: ()Ljava/lang/String;
*/
-JNIEXPORT jstring JNICALL Java_org_liblouis_liblouisutdml_version
+JNIEXPORT jstring JNICALL Java_org_liblouis_LibLouisUTDML_version
(JNIEnv *, jobject);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: translateString
* Signature:
(Ljava/lang/String;[B[B[ILjava/lang/String;Ljava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_translateString
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_translateString
(JNIEnv *, jobject, jstring, jbyteArray, jbyteArray, jintArray, jstring,
jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: backTranslateString
* Signature:
(Ljava/lang/String;[B[B[ILjava/lang/String;Ljava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_liblouisutdml_backTranslateString
+JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_backTranslateString
(JNIEnv *, jobject, jstring, jbyteArray, jbyteArray, jintArray, jstring,
jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: translateFile
* Signature:
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_translateFile
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_translateFile
(JNIEnv *, jobject, jstring, jstring, jstring, jstring, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: translateTextFile
* Signature:
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_liblouisutdml_translateTextFile
+JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_translateTextFile
(JNIEnv *, jobject, jstring, jstring, jstring, jstring, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: backTranslateFile
* Signature:
(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_liblouisutdml_backTranslateFile
+JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_backTranslateFile
(JNIEnv *, jobject, jstring, jstring, jstring, jstring, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: charToDots
* Signature: (Ljava/lang/String;[B[BLjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_charToDots
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_charToDots
(JNIEnv *, jobject, jstring, jbyteArray, jbyteArray, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: dotsToChar
* Signature: (Ljava/lang/String;[B[BLjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_dotsToChar
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_dotsToChar
(JNIEnv *, jobject, jstring, jbyteArray, jbyteArray, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: checkTable
* Signature: (Ljava/lang/String;Ljava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_checkTable
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_checkTable
(JNIEnv *, jobject, jstring, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: compileString
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_compileString
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_compileString
(JNIEnv *, jobject, jstring, jstring, jstring);
/*
- * Class: org_liblouis_liblouisutdml
- * Method: setDataPath
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setDataPath
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: charSize
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_org_liblouis_liblouisutdml_charSize
+JNIEXPORT jint JNICALL Java_org_liblouis_LibLouisUTDML_charSize
(JNIEnv *, jobject);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: file2brl
* Signature: ([Ljava/lang/String;)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_file2brl
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_file2brl
(JNIEnv *, jobject, jobjectArray);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: setWriteablePath
* Signature: (Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setWriteablePath
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_setWriteablePath
(JNIEnv *, jobject, jstring);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: free
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_free
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_free
(JNIEnv *, jobject);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisTranslateString
* Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_liblouisutdml_louisTranslateString
+JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisTranslateString
(JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisTranslate
* Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_louisTranslate
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_louisTranslate
(JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jintArray, jintArray, jintArray, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: hyphenate
* Signature: (Ljava/lang/String;[BI[BLjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_liblouisutdml_hyphenate
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_hyphenate
(JNIEnv *, jobject, jstring, jbyteArray, jint, jbyteArray, jstring,
jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisBackTranslateString
* Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_liblouisutdml_louisBackTranslateString
+JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisBackTranslateString
(JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: louisBackTranslate
* Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_liblouisutdml_louisBackTranslate
+JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisBackTranslate
(JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jintArray, jintArray, jintArray, jstring, jint);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: setLogFile
* Signature: (Ljava/lang/String;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setLogFile
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_setLogFile
(JNIEnv *, jobject, jstring);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: logEnd
* Signature: ()V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_logEnd
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_logEnd
(JNIEnv *, jobject);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: registerLogCallback
* Signature: (Lorg/liblouis/LogCallback;)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_registerLogCallback
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_registerLogCallback
(JNIEnv *, jobject, jobject);
/*
- * Class: org_liblouis_liblouisutdml
+ * Class: org_liblouis_LibLouisUTDML
* Method: setLogLevel
* Signature: (I)V
*/
-JNIEXPORT void JNICALL Java_org_liblouis_liblouisutdml_setLogLevel
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_setLogLevel
(JNIEnv *, jobject, jint);
#ifdef __cplusplus
==============================================================================
Revision: 5fa522225bdf
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 08:25:01 2014 UTC
Log: Added new files to Makefile.am and more separation of liblouis
and liblouisutdml in Java bindings
http://code.google.com/p/liblouisutdml/source/detail?r=5fa522225bdf
Added:
/java/src/org/liblouis/LogLevel.java
Modified:
/java/Jliblouisutdml.c
/java/Jliblouisutdml.h
/java/src/org/liblouis/LibLouis.java
/java/src/org/liblouis/LibLouisUTDML.java
/java/src/org/liblouis/Makefile.am
=======================================
--- /dev/null
+++ /java/src/org/liblouis/LogLevel.java Thu Jun 5 08:25:01 2014 UTC
@@ -0,0 +1,12 @@
+package org.liblouis;
+
+public final class LogLevel
+{
+ public static int ALL = -2147483648;
+ public static int DEBUG = 10000;
+ public static int INFO = 20000;
+ public static int WARNING = 30000;
+ public static int ERROR = 40000;
+ public static int FATAL = 50000;
+ public static int OFF = 2147483647;
+}
=======================================
--- /java/Jliblouisutdml.c Thu Jun 5 07:26:46 2014 UTC
+++ /java/Jliblouisutdml.c Thu Jun 5 08:25:01 2014 UTC
@@ -642,11 +642,11 @@
}
/*
- * Class: org_liblouis_LibLouisUTDML
+ * Class: org_liblouis_LibLouis
* Method: charSize
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_org_liblouis_LibLouisUTDML_charSize
+JNIEXPORT jint JNICALL Java_org_liblouis_LibLouis_charSize
(JNIEnv * env, jobject this)
{
return CHARSIZE;
=======================================
--- /java/Jliblouisutdml.h Thu Jun 5 07:26:46 2014 UTC
+++ /java/Jliblouisutdml.h Thu Jun 5 08:25:01 2014 UTC
@@ -7,6 +7,14 @@
#ifdef __cplusplus
extern "C" {
#endif
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: charSize
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_liblouis_LibLouis_charSize
+ (JNIEnv *, jobject);
+
/*
* Class: org_liblouis_LibLouis
* Method: setDataPath
@@ -64,20 +72,6 @@
#define org_liblouis_LibLouisUTDML_HtmlDoc 536870912L
#undef org_liblouis_LibLouisUTDML_notUC
#define org_liblouis_LibLouisUTDML_notUC 268435456L
-#undef org_liblouis_LibLouisUTDML_LOG_ALL
-#define org_liblouis_LibLouisUTDML_LOG_ALL -2147483648L
-#undef org_liblouis_LibLouisUTDML_LOG_DEBUG
-#define org_liblouis_LibLouisUTDML_LOG_DEBUG 10000L
-#undef org_liblouis_LibLouisUTDML_LOG_INFO
-#define org_liblouis_LibLouisUTDML_LOG_INFO 20000L
-#undef org_liblouis_LibLouisUTDML_LOG_WARN
-#define org_liblouis_LibLouisUTDML_LOG_WARN 30000L
-#undef org_liblouis_LibLouisUTDML_LOG_ERROR
-#define org_liblouis_LibLouisUTDML_LOG_ERROR 40000L
-#undef org_liblouis_LibLouisUTDML_LOG_FATAL
-#define org_liblouis_LibLouisUTDML_LOG_FATAL 50000L
-#undef org_liblouis_LibLouisUTDML_LOG_OFF
-#define org_liblouis_LibLouisUTDML_LOG_OFF 2147483647L
/*
* Class: org_liblouis_LibLouisUTDML
* Method: initialize
@@ -166,14 +160,6 @@
JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_compileString
(JNIEnv *, jobject, jstring, jstring, jstring);
-/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: charSize
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_liblouis_LibLouisUTDML_charSize
- (JNIEnv *, jobject);
-
/*
* Class: org_liblouis_LibLouisUTDML
* Method: file2brl
=======================================
--- /java/src/org/liblouis/LibLouis.java Thu Jun 5 07:26:46 2014 UTC
+++ /java/src/org/liblouis/LibLouis.java Thu Jun 5 08:25:01 2014 UTC
@@ -7,6 +7,7 @@
private static LibLouis singleInstance = null;
private static boolean libraryLoaded = false;
public static void loadLibrary(String libraryPath, String librarySuffix)
+ throws Exception
{
if (libraryLoaded)
{
@@ -14,7 +15,9 @@
}
if ((libraryPath == null) || (librarySuffix == null))
{
- // Throw an exception
+ throw new Exception(
+ "Could not load liblouis, libraryPath or librarySuffix not
defined."
+ );
}
System.load(new File(libraryPath, "liblouis" +
librarySuffix).getAbsolutePath());
libraryLoaded = true;
@@ -28,6 +31,10 @@
singleInstance = new LibLouis();
return singleInstance;
}
+ /**
+ * Get the size of widechar used by LibLouis.
+ */
+ public native int charSize();
/**
* Set the path for which liblouis will look for tables.
*/
=======================================
--- /java/src/org/liblouis/LibLouisUTDML.java Thu Jun 5 07:26:46 2014 UTC
+++ /java/src/org/liblouis/LibLouisUTDML.java Thu Jun 5 08:25:01 2014 UTC
@@ -64,14 +64,6 @@
public static final int HtmlDoc = 1<<29;
public static final int notUC = 1<<28;
-public static final int LOG_ALL = -2147483648;
-public static final int LOG_DEBUG = 10000;
-public static final int LOG_INFO = 20000;
-public static final int LOG_WARN = 30000;
-public static final int LOG_ERROR = 40000;
-public static final int LOG_FATAL = 50000;
-public static final int LOG_OFF = 2147483647;
-
/**
* This class is a singleton.
*/
@@ -206,11 +198,6 @@
{
LibLouis.getInstance().setDataPath(path);
}
-
-/** Return the character size used internally by liblouis and
-liblouisutdml. */
-
-public native int charSize ();
/**
* This method performs the functions of the file2brl program in a more
=======================================
--- /java/src/org/liblouis/Makefile.am Mon May 26 08:51:33 2014 UTC
+++ /java/src/org/liblouis/Makefile.am Thu Jun 5 08:25:01 2014 UTC
@@ -1,3 +1,5 @@
-EXTRA_DIST = liblouisutdml.java \
- LogCallback.java
+EXTRA_DIST = LibLouisUTDML.java \
+ LogCallback.java \
+ LibLouis.java \
+ LogLevel.java
==============================================================================
Revision: f83d6a0348e2
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 11:29:28 2014 UTC
Log: Added liblouis logging callback functions to Java bindings and
some refactoring of bindings
http://code.google.com/p/liblouisutdml/source/detail?r=f83d6a0348e2
Modified:
/java/Jliblouisutdml.c
/java/Jliblouisutdml.h
/java/src/org/liblouis/LibLouis.java
=======================================
--- /java/Jliblouisutdml.c Thu Jun 5 08:25:01 2014 UTC
+++ /java/Jliblouisutdml.c Thu Jun 5 11:29:28 2014 UTC
@@ -31,6 +31,29 @@
#define EMPTY -1000
+// A pointer to the JVM for callbacks
+static JavaVM *jvm;
+static void execJavaLogCallback(jobject cb, int level, const char *message)
+{
+ JNIEnv *env;
+ jint rs;
+ jstring jstrMsg;
+ jclass cls;
+ jmethodID mid;
+ if ((jvm == NULL) || (cb == NULL))
+ return;
+ rs = (*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL);
+ if (rs != JNI_OK)
+ return;
+ cls = (*env)->GetObjectClass(env, cb);
+ if (cls == NULL)
+ return;
+ mid = (*env)->GetMethodID(env,
cls, "logMessage", "(ILjava/lang/String;)V");
+ if (mid == NULL)
+ return;
+ jstrMsg = (*env)->NewStringUTF(env, message);
+ (*env)->CallVoidMethod(env, cb, mid, level, jstrMsg);
+}
/*
* Class: org_liblouis_LibLouisUTDML
* Method: initialize
@@ -617,7 +640,7 @@
/*
* Class: org.liblouis.LibLouis
* Method: setLogFile
- * Signature: (Ljava.lang.String)V
+ * Signature: (Ljava/lang/String)V
*/
JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogFile
(JNIEnv * env, jobject obj, jstring fileName)
@@ -652,6 +675,57 @@
return CHARSIZE;
}
+/*
+ * Class: org.liblouis.LibLouis
+ * Method: setLogLevel
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogLevel
+ (JNIEnv * env, jobject this, jint level)
+{
+ lou_setLogLevel(level);
+}
+
+static jobject louLogCBFunc;
+static void javaLouLogCallback(int level, const char *message)
+{
+ execJavaLogCallback(louLogCBFunc, level, message);
+}
+/*
+ * Class: org.liblouis.LibLouis
+ * Method: registerLogCallback
+ * Signature: (Lorg/liblouis/LogCallback)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_registerLogCallback
+ (JNIEnv * env, jobject this, jobject cb)
+{
+ // Ensure we have a reference to the JVM
+ if (jvm == NULL)
+ {
+ jint rs = (*env)->GetJavaVM(env, &jvm);
+ if (rs != JNI_OK)
+ return;
+ }
+ // Remove existing references to the callback
+ if (louLogCBFunc != NULL)
+ {
+ (*env)->DeleteGlobalRef(env, louLogCBFunc);
+ louLogCBFunc = NULL;
+ }
+ // Now set the callback according to what is passed in cb
+ if (cb != NULL)
+ {
+ louLogCBFunc = (*env)->NewGlobalRef(env, cb);
+ }
+ if (louLogCBFunc != NULL)
+ {
+ lou_registerLogCallback(javaLouLogCallback);
+ }
+ else
+ {
+ lou_registerLogCallback(NULL);
+ }
+}
/*
* Class: org_liblouis_LibLouisUTDML
* Method: setWriteablePath
@@ -1249,28 +1323,12 @@
lbu_logEnd ();
}
-static JavaVM *jvm;
-static jobject logCBFunc;
-static void javaLogCallbackFunc(int level, const char *message)
+static jobject lbuLogCBFunc;
+static void javaLbuLogCallbackFunc(int level, const char *message)
{
- JNIEnv *env;
- jint rs = (*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL);
- jstring jstrMsg;
- jclass cls;
- jmethodID mid;
- if (rs != JNI_OK)
- {
- return;
- }
- cls = (*env)->GetObjectClass(env, logCBFunc);
- mid = (*env)->GetMethodID(env,
cls, "logMessage", "(ILjava/lang/String;)V");
- if (mid == 0)
- {
- return;
- }
- jstrMsg = (*env)->NewStringUTF(env, message);
- (*env)->CallVoidMethod(env, logCBFunc, mid, level, jstrMsg);
+ execJavaLogCallback(lbuLogCBFunc, level, message);
}
+
/*
* Class: org_liblouis_LibLouisUTDML
* Method: registerLogCallback
@@ -1289,24 +1347,22 @@
}
}
// Remove any existing global reference to callbacks
- if (logCBFunc != NULL)
+ if (lbuLogCBFunc != NULL)
{
- (*env)->DeleteGlobalRef(env, logCBFunc);
- logCBFunc = NULL;
+ (*env)->DeleteGlobalRef(env, lbuLogCBFunc);
+ lbuLogCBFunc = NULL;
}
if (cb != NULL)
{
- logCBFunc = (*env)->NewGlobalRef(env, cb);
+ lbuLogCBFunc = (*env)->NewGlobalRef(env, cb);
}
- if (logCBFunc != NULL)
+ if (lbuLogCBFunc != NULL)
{
- lbu_registerLogCallback(javaLogCallbackFunc);
- lou_registerLogCallback(javaLogCallbackFunc);
+ lbu_registerLogCallback(javaLbuLogCallbackFunc);
}
else
{
lbu_registerLogCallback(NULL);
- lou_registerLogCallback(NULL);
}
}
=======================================
--- /java/Jliblouisutdml.h Thu Jun 5 08:25:01 2014 UTC
+++ /java/Jliblouisutdml.h Thu Jun 5 11:29:28 2014 UTC
@@ -39,6 +39,22 @@
JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_logEnd
(JNIEnv *, jobject);
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: registerLogCallback
+ * Signature: (Lorg/liblouis/LogCallback;)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_registerLogCallback
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: setLogLevel
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogLevel
+ (JNIEnv *, jobject, jint);
+
#ifdef __cplusplus
}
#endif
=======================================
--- /java/src/org/liblouis/LibLouis.java Thu Jun 5 08:25:01 2014 UTC
+++ /java/src/org/liblouis/LibLouis.java Thu Jun 5 11:29:28 2014 UTC
@@ -47,5 +47,13 @@
* End the liblouis log file.
*/
public native void logEnd();
+ /**
+ * Register a callback for liblouis logging.
+ */
+ public native void registerLogCallback(LogCallback cb);
+ /**
+ * Set liblouis logging level.
+ */
+ public native void setLogLevel(int level);
}
==============================================================================
Revision: 0a3dd1d00624
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 16:25:54 2014 UTC
Log: More refactoring of liblouisutdml Java bindings
http://code.google.com/p/liblouisutdml/source/detail?r=0a3dd1d00624
Modified:
/java/Jliblouisutdml.c
/java/Jliblouisutdml.h
/java/src/org/liblouis/LibLouis.java
/java/src/org/liblouis/LibLouisUTDML.java
/liblouisutdml/liblouisutdml.c
/liblouisutdml/logging.c
/liblouisutdml/readconfig.c
=======================================
--- /java/Jliblouisutdml.c Thu Jun 5 11:29:28 2014 UTC
+++ /java/Jliblouisutdml.c Thu Jun 5 16:25:54 2014 UTC
@@ -581,11 +581,11 @@
}
/*
- * Class: org_liblouis_LibLouisUTDML
+ * Class: org_liblouis_LibLouis
* Method: compileString
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_compileString
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_compileString
(JNIEnv * env, jobject obj, jstring tableList, jstring newEntry,
jstring logFile)
{
@@ -890,7 +890,7 @@
getArg (env, obj, args, -1);
}
if (logFileName[0] != 0)
- lou_logFile (logFileName);
+ lbu_logFile (logFileName);
if (whichProc == 0)
whichProc = 'x';
if (configSettings != NULL)
@@ -900,7 +900,7 @@
if (!read_configuration_file (configFileList, logFileName,
configSettings, 0))
{
- lou_logEnd ();
+ lbu_logEnd ();
return JNI_FALSE;
}
if (strcmp (inputFileName, "stdin") != 0)
@@ -908,7 +908,7 @@
if (!(inputFile = fopen (inputFileName, "rb")))
{
logMessage (LOG_ERROR, "Can't open input file '%s'.\n",
inputFileName);
- lou_logEnd ();
+ lbu_logEnd ();
return JNI_FALSE;
}
}
@@ -920,7 +920,7 @@
if (!(tempFile = fopen (tempFileName, "wb")))
{
logMessage (LOG_ERROR, "Can't open temporary file.\n");
- lou_logEnd ();
+ lbu_logEnd ();
return JNI_FALSE;
}
if (whichProc == 'p')
@@ -1014,7 +1014,7 @@
(configFileList, tempFileName, temp2FileName, NULL,
NULL, mode)) != 1)
{
- lou_logEnd ();
+ lbu_logEnd ();
return JNI_FALSE;
}
if (ud->back_text == html)
@@ -1042,7 +1042,7 @@
}
if (configSettings != NULL)
free (configSettings);
- lou_logEnd ();
+ lbu_logEnd ();
return JNI_TRUE;
}
@@ -1167,12 +1167,12 @@
}
/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisTranslateString
+ * Class: org_liblouis_LibLouis
+ * Method: translateString
* Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
-Java_org_liblouis_LibLouisUTDML_louisTranslateString (JNIEnv * env,
+Java_org_liblouis_LibLouis_translateString (JNIEnv * env,
jobject obj,
jstring tableList,
jbyteArray inbuf,
@@ -1188,11 +1188,11 @@
}
/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisTranslate
+ * Class: org_liblouis_LibLouis
+ * Method: translate
* Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_louisTranslate
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_translate
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf,
jintArray inlen,
jbyteArray outbuf, jintArray outlen,
@@ -1205,11 +1205,11 @@
}
/*
- * Class: org_liblouis_LibLouisUTDML
+ * Class: org_liblouis_LibLouis
* Method: hyphenate
* Signature: (Ljava/lang/String;[BI[BLjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_hyphenate
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_hyphenate
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf, jint
inlen, jbyteArray hyphens, jstring logFile, jint mode)
{
@@ -1260,12 +1260,12 @@
}
/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisBackTranslateString
+ * Class: org_liblouis_LibLouis
+ * Method: backTranslateString
* Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
*/
JNIEXPORT jboolean JNICALL
- Java_org_liblouis_LibLouisUTDML_louisBackTranslateString
+ Java_org_liblouis_LibLouis_backTranslateString
(JNIEnv * env, jobject obj,
jstring tableList,
jbyteArray
@@ -1280,11 +1280,11 @@
}
/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisBackTranslate
+ * Class: org_liblouis_LibLouis
+ * Method: backTranslate
* Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
*/
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisBackTranslate
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_backTranslate
(JNIEnv * env, jobject obj, jstring tableList, jbyteArray inbuf,
jintArray inlen,
jbyteArray outbuf, jintArray outlen,
=======================================
--- /java/Jliblouisutdml.h Thu Jun 5 11:29:28 2014 UTC
+++ /java/Jliblouisutdml.h Thu Jun 5 16:25:54 2014 UTC
@@ -55,6 +55,54 @@
JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogLevel
(JNIEnv *, jobject, jint);
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: compileString
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_compileString
+ (JNIEnv *, jobject, jstring, jstring, jstring);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: translateString
+ * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_translateString
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: translate
+ * Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_translate
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jintArray, jintArray, jintArray, jstring, jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: hyphenate
+ * Signature: (Ljava/lang/String;[BI[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_hyphenate
+ (JNIEnv *, jobject, jstring, jbyteArray, jint, jbyteArray, jstring,
jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: backTranslateString
+ * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_backTranslateString
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
+
+/*
+ * Class: org_liblouis_LibLouis
+ * Method: backTranslate
+ * Signature: (Ljava/lang/String;[B[I[B[I[I[I[I[BLjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouis_backTranslate
+ (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jintArray, jintArray, jintArray, jbyteArray, jstring, jint);
+
#ifdef __cplusplus
}
#endif
@@ -168,14 +216,6 @@
JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_checkTable
(JNIEnv *, jobject, jstring, jstring, jint);
-/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: compileString
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_compileString
- (JNIEnv *, jobject, jstring, jstring, jstring);
-
/*
* Class: org_liblouis_LibLouisUTDML
* Method: file2brl
@@ -200,46 +240,6 @@
JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_free
(JNIEnv *, jobject);
-/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisTranslateString
- * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisTranslateString
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
-
-/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisTranslate
- * Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_louisTranslate
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jintArray, jintArray, jintArray, jstring, jint);
-
-/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: hyphenate
- * Signature: (Ljava/lang/String;[BI[BLjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_liblouis_LibLouisUTDML_hyphenate
- (JNIEnv *, jobject, jstring, jbyteArray, jint, jbyteArray, jstring,
jint);
-
-/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisBackTranslateString
- * Signature: (Ljava/lang/String;[B[I[B[I[BLjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisBackTranslateString
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jstring, jint);
-
-/*
- * Class: org_liblouis_LibLouisUTDML
- * Method: louisBackTranslate
- * Signature: (Ljava/lang/String;[B[I[B[I[B[I[I[ILjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL
Java_org_liblouis_LibLouisUTDML_louisBackTranslate
- (JNIEnv *, jobject, jstring, jbyteArray, jintArray, jbyteArray,
jintArray, jbyteArray, jintArray, jintArray, jintArray, jstring, jint);
-
/*
* Class: org_liblouis_LibLouisUTDML
* Method: setLogFile
=======================================
--- /java/src/org/liblouis/LibLouis.java Thu Jun 5 11:29:28 2014 UTC
+++ /java/src/org/liblouis/LibLouis.java Thu Jun 5 16:25:54 2014 UTC
@@ -55,5 +55,14 @@
* Set liblouis logging level.
*/
public native void setLogLevel(int level);
+ /**
+ * Add a new entry to a table.
+ */
+ public native boolean compileString(String tableList, String newEntry,
String logFile);
+ public native boolean translateString(String tableList, byte[] inbuf,
int[] inlen, byte[] outbuf, int[] outlen, byte[]typeform, String
logFileName, int mode);
+ public native boolean translate(String tableList, byte[] inbuf, int[]
inlen, byte[] outbuf, int[] outlen, byte[] typeform, int[] outputPos, int[]
inputPos, int[] cursorPos, String logFileName, int mode);
+ public native boolean hyphenate(String tableList, byte[] inbuf, int
inlen, byte[] hyphens, String logFilename, int mode);
+ public native boolean backTranslateString(String tableList, byte[]
inbuf, int[] inlen, byte[] outbuf, int[] outlen, byte[] typeform, String
logFileName, int mode);
+ public native boolean backTranslate(String tableList, byte[] inbuf,
int[] inlen, byte[] outbuf, int[] outlen, int[] outputPos, int[] inputPos,
int[] cursorPos, byte[] typeform, String logFileName, int mode);
}
=======================================
--- /java/src/org/liblouis/LibLouisUTDML.java Thu Jun 5 08:25:01 2014 UTC
+++ /java/src/org/liblouis/LibLouisUTDML.java Thu Jun 5 16:25:54 2014 UTC
@@ -184,12 +184,6 @@
public native boolean
checkTable (String tableList, String logFile, int mode);
-/**
-* Add a new entrry to a table.
-*/
-public native boolean compileString (String tableList, String newEntry,
-String logFile);
-
/**
* Path on which liblouis tables and liblouisutdml files can be found.
*/
@@ -222,39 +216,6 @@
public native void free ();
-/**
- * The following methods call liblouis functions. inbuf, outbuf and
- * typeform must be encoded in UTF-8. Thus it does not matter if
- * liblouis is compiled for 16-bit or 32-bit Unicodee.
- */
-public native boolean louisTranslateString
- (String tableList,
- byte[]inbuf,
- int[]inlen,
- byte[] outbuf,
- int[]outlen, byte[]typeform, String logFileName, int mode);
-
- public native boolean louisTranslate (String tableList, byte[]inbuf,
- int[]inlen, byte[] outbuf, int[]outlen,
- byte[]typeform, int[]outputPos, int[]inputPos,
-int[]cursorPos, String logFileName, int mode);
-
-public native boolean hyphenate (String tableList, byte[]inbuf,
- int inlen, byte[]hyphens, String logFileName, int mode);
-
- public native boolean louisBackTranslateString (String tableList,
- byte[]inbuf,
- int[]inlen,
- byte[] outbuf,
- int[]outlen, byte[]typeform,
- String logFileName, int mode);
-
- public native boolean louisBackTranslate (String tableList,
-byte[]inbuf,
- int[]inlen, byte[] outbuf, int[]outlen,
-byte[]typeform, int[]outputPos, int[]inputPos, int[]cursorPos, String
-logFileName, int mode);
-
public native void setLogFile (String fileName);
public native void logEnd();
=======================================
--- /liblouisutdml/liblouisutdml.c Wed May 28 22:09:22 2014 UTC
+++ /liblouisutdml/liblouisutdml.c Thu Jun 5 16:25:54 2014 UTC
@@ -80,7 +80,7 @@
static void
freeEverything ()
{
- lou_logEnd ();
+ lbu_logEnd ();
cleanupLibxml ();
lbu_free ();
}
@@ -225,7 +225,7 @@
else
k = transcribe_text_string ();
*outlen = ud->outlen_so_far;
- lou_logEnd ();
+ lbu_logEnd ();
return k;
}
if (inbuf[k + 1] == '?')
@@ -246,7 +246,7 @@
*outlen = ud->outlen_so_far;
if (xmlInbuf != inbuf)
free (xmlInbuf);
- lou_logEnd ();
+ lbu_logEnd ();
return k;
}
@@ -279,7 +279,7 @@
k = processXmlDocument (inFileName, 0);
if (ud->outFile != stdout)
fclose (ud->outFile);
- lou_logEnd ();
+ lbu_logEnd ();
return k;
}
@@ -334,7 +334,7 @@
fclose (ud->inFile);
if (ud->outFile != stdout)
fclose (ud->outFile);
- lou_logEnd ();
+ lbu_logEnd ();
return k;
}
@@ -372,7 +372,7 @@
}
*outlen = ud->outlen_so_far;
logMessage(LOG_INFO, "Finish lbu_backTranslateString");
- lou_logEnd ();
+ lbu_logEnd ();
return 1;
}
@@ -428,7 +428,7 @@
fclose (ud->inFile);
if (ud->outFile != stdout)
fclose (ud->outFile);
- lou_logEnd ();
+ lbu_logEnd ();
return 1;
}
@@ -463,7 +463,7 @@
int result = 0;
if (tableList == NULL || inbuf == NULL || outbuf == NULL)
return 0;
- lou_logFile (logFile);
+ lbu_logFile (logFile);
interBuf = malloc (length * CHARSIZE);
utf8Length = length;
wcLength = length;
@@ -475,7 +475,7 @@
utf8Length = length;
wc_string_to_utf8 (interBuf, &wcLength, outbuf, &utf8Length);
}
- lou_logEnd ();
+ lbu_logEnd ();
free (interBuf);
return result;
}
@@ -491,7 +491,7 @@
int result = 0;
if (tableList == NULL || inbuf == NULL || outbuf == NULL)
return 0;
- lou_logFile (logFile);
+ lbu_logFile (logFile);
interBuf = malloc (length * CHARSIZE);
utf8Length = length;
wcLength = length;
@@ -502,7 +502,7 @@
utf8Length = length;
wc_string_to_utf8 (interBuf, &wcLength, outbuf, &utf8Length);
}
- lou_logEnd ();
+ lbu_logEnd ();
free (interBuf);
return result;
}
@@ -511,10 +511,10 @@
lbu_checkTable (const char *tableList, const char *logFile, unsigned int
mode)
{
int result = 1;
- lou_logFile (logFile);
+ lbu_logFile (logFile);
if (!lou_getTable (tableList))
result = 0;
- lou_logEnd ();
+ lbu_logEnd ();
return result;
}
@@ -523,7 +523,7 @@
{
/* Free all memory used by liblouisutdml. You MUST call this function at
* the END of your application.*/
- lou_logEnd ();
+ lbu_logEnd ();
lou_free ();
destroy_semantic_table ();
if (ud != NULL)
=======================================
--- /liblouisutdml/logging.c Mon May 26 10:34:30 2014 UTC
+++ /liblouisutdml/logging.c Thu Jun 5 16:25:54 2014 UTC
@@ -141,6 +141,7 @@
void EXPORT_CALL
lbu_logEnd ()
{
+ lou_logEnd();
if (logFile != NULL)
fclose (logFile);
logFile = NULL;
=======================================
--- /liblouisutdml/readconfig.c Wed May 28 22:09:22 2014 UTC
+++ /liblouisutdml/readconfig.c Thu Jun 5 16:25:54 2014 UTC
@@ -1282,7 +1282,7 @@
{
strcpy ((char *) ud->typeform, lbu_getWriteablePath ());
strcat ((char *) ud->typeform, logFileName);
- lou_logFile ((char *) ud->typeform);
+ lbu_logFile ((char *) ud->typeform);
}
if (!config_compileSettings ("liblouisutdml.ini"))
return 0;
@@ -1365,7 +1365,7 @@
{
strcpy ((char *) ud->typeform, lbu_getWriteablePath ());
strcat ((char *) ud->typeform, logFileName);
- lou_logFile ((char *) ud->typeform);
+ lbu_logFile ((char *) ud->typeform);
}
if (!(config_compileSettings ("liblouisutdml.ini")))
return 0;
==============================================================================
Revision: c37cc478bd28
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 16:48:54 2014 UTC
Log: Correct a type to remove warnings.
http://code.google.com/p/liblouisutdml/source/detail?r=c37cc478bd28
Modified:
/java/Jliblouisutdml.c
=======================================
--- /java/Jliblouisutdml.c Thu Jun 5 16:25:54 2014 UTC
+++ /java/Jliblouisutdml.c Thu Jun 5 16:48:54 2014 UTC
@@ -645,7 +645,7 @@
JNIEXPORT void JNICALL Java_org_liblouis_LibLouis_setLogFile
(JNIEnv * env, jobject obj, jstring fileName)
{
- jbyte logf = NULL;
+ const char *logf = NULL;
logf = (*env)->GetStringUTFChars(env, fileName, NULL);
if (logf == NULL)
return;
==============================================================================
Revision: 041052b3526d
Branch: default
Author: Michael Whapples
Date: Thu Jun 5 16:52:41 2014 UTC
Log: Another type change
http://code.google.com/p/liblouisutdml/source/detail?r=041052b3526d
Modified:
/java/Jliblouisutdml.c
=======================================
--- /java/Jliblouisutdml.c Thu Jun 5 16:48:54 2014 UTC
+++ /java/Jliblouisutdml.c Thu Jun 5 16:52:41 2014 UTC
@@ -1304,7 +1304,7 @@
JNIEXPORT void JNICALL Java_org_liblouis_LibLouisUTDML_setLogFile
(JNIEnv * env, jobject obj, jstring logFile)
{
- const jbyte *logf = NULL;
+ const char *logf = NULL;
logf = (*env)->GetStringUTFChars (env, logFile, NULL);
if (logf == NULL)
return;
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com
Other related posts:
- » [liblouis-liblouisxml] [liblouisutdml] 6 new revisions pushed by mwhapples on 2014-06-06 08:42 GMT - liblouisutdml
