diff --git a/build.xml b/build.xml index bf51af3da3b64c28140bb4d70a22776cca714c66..6b4a8bc7c9816558d33eb08997eb719b5e3e539d 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ <target name="init"> <tstamp><format locale="fr,fr" pattern="dd/MM/yyyy" property="TODAY"/></tstamp> <property name="doing" value="running"/> - <property name="version" value="1.2"/> + <property name="version" value="1.3"/> <property name="date" value="${TODAY}"/> <property name="login" value="euzenat"/> <property name="email" value="Jerome.Euzenat@inrialpes.fr"/> diff --git a/lib/procalign.jar b/lib/procalign.jar index 4592a6f29e3c6e8d2695b5839cdfc8c91cb5ba06..d2c18ca7dda62e1c77967dbb418b33787320c20a 100644 Binary files a/lib/procalign.jar and b/lib/procalign.jar differ diff --git a/src/fr/inrialpes/exmo/align/util/Procalign.java b/src/fr/inrialpes/exmo/align/util/Procalign.java index 7d24ad1694b6265e78b33c61aed85fe3b4fdd57b..43adeb535f8523f0bf969931e34644e8f822c907 100644 --- a/src/fr/inrialpes/exmo/align/util/Procalign.java +++ b/src/fr/inrialpes/exmo/align/util/Procalign.java @@ -51,6 +51,7 @@ import org.semanticweb.owl.io.Parser; import java.io.OutputStream; import java.io.FileOutputStream; +import java.io.FileInputStream; import java.io.PrintWriter; import java.io.BufferedWriter; import java.io.OutputStreamWriter; @@ -163,6 +164,11 @@ public class Procalign { case 'p' : /* Read parameters from filename */ paramfile = g.getOptarg(); + try { + FileInputStream fis = new FileInputStream( paramfile ); + System.setIn( fis ); + } catch (Exception e) { e.printStackTrace(); } + params = (Parameters)BasicParameters.read(); break; case 'r' : /* Use the given class for rendering */ @@ -209,10 +215,6 @@ public class Procalign { int i = g.getOptind(); - // Read the param file here - // This should include redirecting input + this should be before - if ( paramfile != null ) params = (Parameters)BasicParameters.read(); - loadedOntologies = new Hashtable(); if (debug > 0) params.setParameter("debug", new Integer(debug)); // debug = ((Integer)params.getParameter("debug")).intValue();