From 3618d22b27b5d9ceb41d4f648b7a7c225505646e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr> Date: Fri, 20 May 2005 08:51:59 +0000 Subject: [PATCH] - Introduced the parameters file reading. --- build.xml | 2 +- lib/procalign.jar | Bin 87202 -> 87273 bytes .../inrialpes/exmo/align/util/Procalign.java | 10 ++++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index bf51af3d..6b4a8bc7 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 GIT binary patch delta 4466 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 ZHk*6Q3b+OM<VIToCmB9yQ1*Ywe*mez4OajF delta 4424 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 diff --git a/src/fr/inrialpes/exmo/align/util/Procalign.java b/src/fr/inrialpes/exmo/align/util/Procalign.java index 7d24ad16..43adeb53 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(); -- GitLab