[ff-cvs] fenfire ./Makefile org/fenfire/fenmm/textmm.py ...

[Tuukka Hastrup]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuukka Hastrup <address@hidden> 03/08/28 07:42:18

Modified files:
        .              : Makefile 
        org/fenfire/fenmm: textmm.py 
Added files:
        org/fenfire/fenmm: TextMain.java 

Log message:
        textmm jar now takes only the rdf file as an argument

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/TextMain.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/textmm.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.41 fenfire/Makefile:1.42
--- fenfire/Makefile:1.41       Thu Aug 28 06:45:55 2003
+++ fenfire/Makefile    Thu Aug 28 07:42:17 2003
@@ -56,12 +56,12 @@
        $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenmm.file="../spaces/mmdemo.rdf" org/fenfire/demo/mm.py
 
 run_textmm:
-       java -cp $(CLASSPATH) $(PYTHONPATH) -Dfenmm.file="$(FILE)" 
org.python.util.jython org/fenfire/demo/text-mm.py
+       java -cp $(CLASSPATH) $(PYTHONPATH) -Dfenmm.file="$(FILE)" 
org.python.util.jython org/fenfire/fenmm/textmm.py
 
 
 VERSION=snapshot-`date -I`
 textmm_jar: JARNAME=textmm-$(VERSION).jar
-textmm_jar: mainclass=org.fenfire.util.JythonMain
+textmm_jar: mainclass=org.fenfire.fenmm.TextMain
 textmm_jar:
        ./jarbuilder.sh "$(CLASSPATH)" "$(PYTHONPATH)" "$(VERSION)" 
"$(JARNAME)" "$(mainclass)"
 
Index: fenfire/org/fenfire/fenmm/textmm.py
diff -u fenfire/org/fenfire/fenmm/textmm.py:1.2 
fenfire/org/fenfire/fenmm/textmm.py:1.3
--- fenfire/org/fenfire/fenmm/textmm.py:1.2     Thu Aug 28 06:59:39 2003
+++ fenfire/org/fenfire/fenmm/textmm.py Thu Aug 28 07:42:18 2003
@@ -37,7 +37,7 @@
 import os.path
 
 # text UI
-from sys import stdin, stdout
+from sys import argv, stdin, stdout
 from traceback import print_exc
 
 def p(*s):
@@ -49,6 +49,11 @@
 DIR = 'myFenfire/'
 FILE = java.lang.System.getProperty("fenmm.file", DIR+"mindmap.rdf")
 POOLDIR = java.lang.System.getProperty("fenmm.pool", DIR)
+
+try:
+    FILE = argv[1]
+except IndexError:
+    pass
 
 os.system('mkdir -p '+POOLDIR)