v0.2.53..v0.2.54 changeset PushToDbCommand.java - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-services/src/main/java/hoot/services/controllers/grail/PushToDbCommand.java b/hoot-services/src/main/java/hoot/services/controllers/grail/PushToDbCommand.java
index 34e63d0..a4bc07a 100644
--- a/hoot-services/src/main/java/hoot/services/controllers/grail/PushToDbCommand.java
+++ b/hoot-services/src/main/java/hoot/services/controllers/grail/PushToDbCommand.java
@@ -28,18 +28,14 @@ package hoot.services.controllers.grail;
 
 import static hoot.services.HootProperties.HOOTAPI_DB_URL;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import hoot.services.command.CommandResult;
-
 
 /**
  * Used for pushing OSM data to the database
@@ -53,8 +49,6 @@ class PushToDbCommand extends GrailCommand {
         logger.info("Params: " + params);
 
         List<String> options = new LinkedList<>();
-        options.add("hootapi.db.writer.overwrite.map=true");
-        options.add("hootapi.db.writer.remap.ids=false");
         options.add("job.id=" + jobId);
         options.add("api.db.email=" + params.getUser().getEmail());
 
@@ -68,24 +62,9 @@ class PushToDbCommand extends GrailCommand {
         substitutionMap.put("DB_NAME", dbName);
         substitutionMap.put("INPUT", params.getInput1());
 
-        String command = "hoot convert --${DEBUG_LEVEL} ${HOOT_OPTIONS} ${INPUT} ${DB_NAME}";
+        String command = "hoot convert --${DEBUG_LEVEL} -C GrailIngest.conf ${HOOT_OPTIONS} ${INPUT} ${DB_NAME}";
 
         super.configureCommand(command, substitutionMap, caller);
     }
 
-    @Override
-    public CommandResult execute() {
-        CommandResult commandResult = super.execute();
-
-        if (params.getWorkDir() != null) {
-            try {
-                FileUtils.forceDelete(params.getWorkDir());
-            }
-            catch (IOException ioe) {
-                logger.error("Error deleting folder: {} ", params.getWorkDir().getAbsolutePath(), ioe);
-            }
-        }
-
-        return commandResult;
-    }
 }