s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing jython initialization logic

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@924 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Stefano Mazzocchi 2010-05-31 09:00:42 +00:00
parent b288f41854
commit 3b7f132430
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main/src/com/metaweb/gridworks/expr/JythonEvaluable.java
View File

@ -15,17 +15,32 @@ import org.python.core.PyString;
import org.python.util.PythonInterpreter; import org.python.util.PythonInterpreter;
public class JythonEvaluable implements Evaluable { public class JythonEvaluable implements Evaluable {
private static final String s_functionName = "___temp___"; private static final String s_functionName = "___temp___";
private static PythonInterpreter _engine; private static PythonInterpreter _engine;
// FIXME(SM): this initialization logic depends on the fact that the JVM's
// current working directory is the root of the Gridworks distributions
// or the development checkouts. While this works in practice, it would
// be preferable to have a more reliable address space, but since we
// don't have access to the servlet context from this class this is
// the best we can do for now.
static { static {
File libPath = new File("webapp/WEB-INF/lib/jython"); File libPath = new File("webapp/WEB-INF/lib/jython");
if (libPath.exists()) { if (!libPath.exists() && !libPath.canRead()) {
libPath = new File("main/webapp/WEB-INF/lib/jython");
if (!libPath.exists() && !libPath.canRead()) {
libPath = null;
}
}
if (libPath != null) {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("python.path", libPath.getAbsolutePath()); props.setProperty("python.path", libPath.getAbsolutePath());
PythonInterpreter.initialize(System.getProperties(), props, new String[] { "" });
PythonInterpreter.initialize(System.getProperties(),props, new String[] { "" });
} }
_engine = new PythonInterpreter(); _engine = new PythonInterpreter();
} }