Update ClaimGeneratorSparkHelper.scala

cpp-cat · Jan 14, 2015 · a55810b · a55810b
1 parent bd9b2b8
commit a55810b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/play/app/com/nickelsoftware/bettercare4me/actors/ClaimGeneratorSparkHelper.scala b/play/app/com/nickelsoftware/bettercare4me/actors/ClaimGeneratorSparkHelper.scala
@@ -48,11 +48,11 @@ object ClaimGeneratorSparkHelper {
    */
   def generateClaims(generator: ClaimGeneratorHelper, configTxt: String): ClaimGeneratorCounts = {
 
-    val conf = new SparkConf()
+    var conf = new SparkConf()
       .setMaster(SparkConfig.master)
       .setAppName(SparkConfig.appName)
-      .set("spark.executorEnv.BC4ME_DATA_DIR", SparkConfig.dataDir)
-      .set("spark.executorEnv.BC4ME_CASSANDRA_CONFIG", SparkConfig.cassandraConf)
+    if(SparkConfig.dataDir != "") conf = conf.set("spark.executorEnv.BC4ME_DATA_DIR", SparkConfig.dataDir)
+    if(SparkConfig.cassandraConf != "") conf = conf.set("spark.executorEnv.BC4ME_CASSANDRA_CONFIG", SparkConfig.cassandraConf)
 
     val sc = new SparkContext(conf)
     Logger.info("generateClaims: Spark master: " + sc.master)
@@ -93,11 +93,11 @@ object ClaimGeneratorSparkHelper {
 
   def processGeneratedClaims(generator: ClaimGeneratorHelper, configTxt: String): HEDISScoreSummary = {
 
-    val conf = new SparkConf()
+    var conf = new SparkConf()
       .setMaster(SparkConfig.master)
       .setAppName(SparkConfig.appName)
-      .set("spark.executorEnv.BC4ME_DATA_DIR", SparkConfig.dataDir)
-      .set("spark.executorEnv.BC4ME_CASSANDRA_CONFIG", SparkConfig.cassandraConf)
+    if(SparkConfig.dataDir != "") conf = conf.set("spark.executorEnv.BC4ME_DATA_DIR", SparkConfig.dataDir)
+    if(SparkConfig.cassandraConf != "") conf = conf.set("spark.executorEnv.BC4ME_CASSANDRA_CONFIG", SparkConfig.cassandraConf)
 
     val sc = new SparkContext(conf)
     Logger.info("processGeneratedClaims: Spark master: " + sc.master)