From b5604498ce494199268290433960858266e67b10 Mon Sep 17 00:00:00 2001 From: Rogan Creswick Date: Sun, 16 Jun 2013 13:41:59 -0700 Subject: made the ruleSet path in run descriptions resolve relative to the json file specifying the run description params --- .../src/main/java/com/galois/fiveui/HeadlessRunDescription.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java index 92f2ef1..c9b70de 100644 --- a/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java +++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java @@ -110,6 +110,10 @@ public class HeadlessRunDescription { if (json.isJsonObject()) { // check if the description is an extended one JsonObject obj = json.getAsJsonObject(); ruleSetDir = objGetString(obj, "rulePath"); + String runDescDir = new File(_fn).getParent(); + if (null != runDescDir) { + ruleSetDir = runDescDir + File.separator + ruleSetDir; + } _crawlType = objGetString(obj, "crawlType"); arr = obj.get("runs").getAsJsonArray(); } else if (json.isJsonArray()) { -- cgit v1.2.3