more bug fixes

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/FlowManager.java

@@ -238,6 +238,8 @@ public void runInputFlow(Flow flow, HubConfig config) {
                     FlowType.INPUT.toString(),
                     flow.getDataFormat());
             sourceOptions.setInputFileType("documents");
+            sourceOptions.setTransformModule("/com.marklogic.hub/mlcp-flow-transform.xqy");
+            sourceOptions.setTransformNamespace("http://marklogic.com/data-hub/mlcp-flow-transform");
             mlcp.addSourceDirectory(config.modulesPath, sourceOptions);
             mlcp.loadContent();
         }

marklogic-data-hub/src/main/java/com/marklogic/hub/Mlcp.java

@@ -131,13 +131,15 @@ public List<String> getMlcpArguments() throws IOException, JSONException {
 			    arguments.add(sourceOptions.getDataFormat());
 			}
 
-			arguments.add("-transform_module");
-	        arguments.add("/com.marklogic.hub/mlcp-flow-transform.xqy");
-	        arguments.add("-transform_namespace");
-	        arguments.add("http://marklogic.com/data-hub/mlcp-flow-transform");
-	        arguments.add("-transform_param");
-	        arguments.add("\"" + sourceOptions.getTransformParams() + "\"");
-
+			String transformModule = sourceOptions.getTransformModule();
+			if (transformModule != null) {
+    			arguments.add("-transform_module");
+    	        arguments.add("\"" + transformModule +"\"");
+    	        arguments.add("-transform_namespace");
+    	        arguments.add("\"" + sourceOptions.getTransformNamespace() +"\"");
+    	        arguments.add("-transform_param");
+    	        arguments.add("\"" + sourceOptions.getTransformParams() + "\"");
+			}
 
 			return arguments;
 		}
@@ -167,6 +169,8 @@ public static class SourceOptions {
 		private String dataFormat = "json";
 		private String inputFileType;
 		private String otherOptions;
+		private String transformModule;
+		private String transformNamespace;
 
 		public SourceOptions(String entityName, String flowName, String flowType, Format dataFormat) {
 			this.entityName = entityName;
@@ -217,6 +221,22 @@ protected String getTransformParams() {
                     "<params><entity-name>%s</entity-name><flow-name>%s</flow-name><flow-type>%s</flow-type></params>",
                     entityName, flowName, flowType);
         }
+
+        public String getTransformModule() {
+            return transformModule;
+        }
+
+        public void setTransformModule(String transformModule) {
+            this.transformModule = transformModule;
+        }
+
+        public String getTransformNamespace() {
+            return transformNamespace;
+        }
+
+        public void setTransformNamespace(String transformNamespace) {
+            this.transformNamespace = transformNamespace;
+        }
 	}
 
     public List<String> getMlcpOptions(MlcpSource source) throws IOException, JSONException {