@@ -37,8 +37,8 @@ |
Map<String, JSONObject> group = JSONUtils.preprocess(groups.getJSONArray(i)); |
aoaId = JSONUtils.getIntParam(group, "AoAid", 0); |
int plan_techn_id = JSONUtils.getIntParam(group, "plan_techn_id", 0); |
- String plan_techn_discrim_type = JSONUtils.getStringParam(group, "plan_techn_discrim_type", "err"); |
- String plan_techn_discrim = JSONUtils.getStringParam(group, "plan_techn_discrim", "err"); |
+ String plan_techn_discrim_type = JSONUtils.getStringParam(group, "plan_techn_discrim_type", ""); |
+ String plan_techn_discrim = JSONUtils.getStringParam(group, "plan_techn_discrim", ""); |
Input input = new Input(aoaId, plan_techn_id, plan_techn_discrim_type, plan_techn_discrim); |
components.add(input); |
} |
@@ -126,6 +126,9 @@ |
} |
|
//#Compute nutrient technique mitigation scores for Phosphorus in Surface Water concern and increment total scores |
+ if(ip.plan_techn_discrim.isEmpty()) |
+ query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water';"; |
+ else |
query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND tech_discrim_type ='"+ ip.plan_techn_discrim_type+"' AND tech_discrim ='"+ip.plan_techn_discrim+"' ;"; |
resultset = statement.executeQuery(query); |
while (resultset.next()) { |
@@ -133,21 +136,36 @@ |
psurf_techn_score += techn_score; |
} |
|
- query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id = " + ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND mode_of_action = 'Avoid';"; |
+ if(ip.plan_techn_discrim.isEmpty()) |
+ query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND mode_of_action = 'Avoid';"; |
+ else |
+ query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND tech_discrim_type ='"+ ip.plan_techn_discrim_type+"' AND tech_discrim ='"+ip.plan_techn_discrim+"' AND mode_of_action = 'Avoid';"; |
+ |
+ // query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id = " + ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND mode_of_action = 'Avoid';"; |
resultset = statement.executeQuery(query); |
while (resultset.next()) { |
int avoid_techn_score = resultset.getInt("nut_tech_score"); |
psurf_avoid_techn_score += avoid_techn_score; |
} |
|
- query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern ='Phosphorus in Surface Water' AND mode_of_action ='Control';"; |
+ if(ip.plan_techn_discrim.isEmpty()) |
+ query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND mode_of_action = 'Control';"; |
+ else |
+ query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND tech_discrim_type ='"+ ip.plan_techn_discrim_type+"' AND tech_discrim ='"+ip.plan_techn_discrim+"' AND mode_of_action = 'Control';"; |
+ |
+ //query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern ='Phosphorus in Surface Water' AND mode_of_action ='Control';"; |
resultset = statement.executeQuery(query); |
while (resultset.next()) { |
int control_techn_score = resultset.getInt("nut_tech_score"); |
psurf_control_techn_score += control_techn_score; |
} |
|
- query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id =" + ip.plan_techn_id+" AND wqm_concern ='Phosphorus in Surface Water' AND mode_of_action ='Trap';"; |
+ if(ip.plan_techn_discrim.isEmpty()) |
+ query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND mode_of_action = 'Trap';"; |
+ else |
+ query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id ="+ ip.plan_techn_id+" AND wqm_concern = 'Phosphorus in Surface Water' AND tech_discrim_type ='"+ ip.plan_techn_discrim_type+"' AND tech_discrim ='"+ip.plan_techn_discrim+"' AND mode_of_action = 'Trap';"; |
+ |
+ // query = "SELECT nut_tech_score FROM wqm_nutrient_technique_scores WHERE nutrient_technique_id =" +ip.plan_techn_id+" AND wqm_concern ='Phosphorus in Surface Water' AND mode_of_action ='Trap';"; |
resultset = statement.executeQuery(query); |
while (resultset.next()) { |
int trap_techn_score = resultset.getInt("nut_tech_score"); |