[Gzz-commits] fenfire ./Makefile org/fenfire/bin/fenpdf10.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/14 07:41:48

Modified files:
        .              : Makefile 
        org/fenfire/bin: fenpdf10.py 

Log message:
        Pool adjustable

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.31 fenfire/Makefile:1.32
--- fenfire/Makefile:1.31       Thu Aug 14 06:56:41 2003
+++ fenfire/Makefile    Thu Aug 14 07:41:48 2003
@@ -42,8 +42,13 @@
 run:
        $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenpdf.file=$(FILE) $(DBG) org/fenfire/bin/$(BIN)
 
+run_literature:
+       $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenpdf.pool=../pool/ 
-Dfenpdf.file=../spaces/literature.rdf $(DBG) org/fenfire/bin/$(BIN)
+
 run_fenpdfdemo:
        $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenpdf.file=$(FILE) -Dfenpdf.demo=1 $(DBG) 
org/fenfire/bin/$(BIN)
+
+
 
 BENCH=org.fenfire.swamp.bench.graph
 
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.39 
fenfire/org/fenfire/bin/fenpdf10.py:1.40
--- fenfire/org/fenfire/bin/fenpdf10.py:1.39    Thu Aug 14 06:55:38 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug 14 07:41:48 2003
@@ -24,11 +24,13 @@
 
 # Input: in Java properties:
 #
-# fenpdf.file : The file name
+# fenpdf.file : The file name. Default: myFenfire/mygraph.rdf
 # 
 # fenpdf.demo : If the file does not exist, FenPDF creates a new space.
 #              If this value is nonzero, it creates a small demo space,
-#              otherwise an empty space.
+#              otherwise an empty space. Default: empty
+#
+# fenpdf.pool : The storm pool directory to use. Default: myFenfire/
 
 dbg = 0
 
@@ -111,10 +113,11 @@
 if FILE == None:
     FILE = DIR+'mygraph.rdf'
 
+POOLDIR = java.lang.System.getProperty("fenpdf.pool", DIR)
 
+os.system('mkdir -p '+POOLDIR)
 
-os.system('mkdir -p '+DIR)
-pool = storm.impl.DirPool(java.io.File(DIR), java.util.HashSet())
+pool = storm.impl.DirPool(java.io.File(POOLDIR), java.util.HashSet())
 myalph = alph.impl.StormAlph(pool)