do not add fix variable to teh select statement twice

dtcenter · May 9, 2019 · 5f20cf4 · 5f20cf4
1 parent 5ca8203
commit 5f20cf4
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/java/edu/ucar/metviewer/db/mysql/MysqlAppDatabaseManager.java b/java/edu/ucar/metviewer/db/mysql/MysqlAppDatabaseManager.java
@@ -1049,11 +1049,16 @@ public List<String> buildPlotSql(
       if (listPlotFixVal.length > 0) {
         for (int i = 0; i < listPlotFixVal.length; i++) {
           String strField = (String) listPlotFixVal[i].getKey();
+          String fieldFormatted = formatField(strField, job.isModeJob() || job.isMtdJob(), true);
           if (listPlotFixVal[i].getValue() != null) {
-            selectList += ",\n  "
-                    + formatField(strField, job.isModeJob() || job.isMtdJob(), true);
-            selectPlotList += ",\n  "
-                    + formatField(strField, job.isModeJob() || job.isMtdJob(), true);
+            if(!selectList.contains(fieldFormatted.trim())) {
+              selectList += ",\n  "
+                      + formatField(strField, job.isModeJob() || job.isMtdJob(), true);
+            }
+            if(!selectPlotList.contains(fieldFormatted.trim())) {
+              selectPlotList += ",\n  "
+                      + formatField(strField, job.isModeJob() || job.isMtdJob(), true);
+            }
 
           }
         }
@@ -2515,11 +2520,14 @@ public List<String> buildPlotModeEventEqualizeSql(
       if (listPlotFixVal.length > 0) {
         for (int i = 0; i < listPlotFixVal.length; i++) {
           String strField = (String) listPlotFixVal[i].getKey();
+          String fieldFormatted = formatField(strField, job.isModeJob() || job.isMtdJob(), true);
           if (listPlotFixVal[i].getValue() != null) {
-            selectList += ",\n  "
-                    + formatField(strField, job.isModeJob() || job.isMtdJob(), true);
-            selectPlotList += ",\n  "
-                    + formatField(strField, job.isModeJob() || job.isMtdJob(), true);
+            if(!selectList.contains(fieldFormatted.trim())) {
+              selectList += ",\n  " + fieldFormatted;
+            }
+            if(!selectPlotList.contains(fieldFormatted.trim())) {
+              selectPlotList += ",\n  " + fieldFormatted;
+            }
           }
         }
       }
@@ -2849,8 +2857,11 @@ public int buildAndExecuteQueriesForRocRelyJob(
       if (listPlotFixVal.length > 0) {
         for (int i = 0; i < listPlotFixVal.length; i++) {
           String strField = (String) listPlotFixVal[i].getKey();
+          String fieldFormatted = formatField(strField, job.isModeJob() || job.isMtdJob(), true);
           if (!strField.equals("fcst_var") && listPlotFixVal[i].getValue() != null) {
-            strPlotDataSelect += formatField(strField, job.isModeJob() || job.isMtdJob(), true) + ",\n";
+            if(!strPlotDataSelect.contains(fieldFormatted.trim())) {
+              strPlotDataSelect += fieldFormatted + ",\n";
+            }
 
           }
         }
@@ -3105,7 +3116,9 @@ public int buildAndExecuteQueriesForEclvJob(
     if (listPlotFixVal.length > 0) {
       for (Map.Entry aListPlotFixVal : listPlotFixVal) {
         String strField = (String) aListPlotFixVal.getKey();
-        strPlotDataSelect = strPlotDataSelect + strField + ",\n";
+        if(!strPlotDataSelect.contains(strField)) {
+          strPlotDataSelect = strPlotDataSelect + strField + ",\n";
+        }
       }
     }