diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime')
8 files changed, 7 insertions, 212 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java index 0934e35c..a63ce959 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java @@ -3271,141 +3271,115 @@ public class ChartD3Helper { int flagDate = 10; */ - //date = MMDDYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; if(date==null) { - //date = EEEMMDDYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(EEEMMDDYYYYFormat, dateStr); if(date!=null) formatFlag = DAYOFTHEWEEKFLAG; } if(date==null) { - //date = MMDDYYYYHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //MMDDYYYYHHFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - //date = MMDDYYYYHHFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHFormat, dateStr); if(date!=null) formatFlag = HOURFLAG; } if(date==null) { - //date = MMDDYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = YYYYMMDDFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYMMDDFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = timestampFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = timestampHrFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampHrFormat, dateStr); if(date!=null) formatFlag = HOURFLAG; } if(date==null) { - //date = timestampDayFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampDayFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = MONYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MONYYYYFormat, dateStr); if(date!=null) formatFlag = MONTHFLAG; } if(date==null) { - //date = MMYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMYYYYFormat, dateStr); if(date!=null) formatFlag = MONTHFLAG; } if(date==null) { - //date = MMMMMDDYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMMMMDDYYYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = MONTHYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MONTHYYYYFormat, dateStr); if(date!=null) formatFlag = MONTHFLAG; } if(date==null) { - //date = YYYYMMDDHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYMMDDHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = YYYYMMDDHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYMMDDHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = DDMONYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(DDMONYYYYHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = DDMONYYYYHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(DDMONYYYYHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = DDMONYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(DDMONYYYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = MMDDYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = MMDDYYHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = MMDDYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = timestampFormat1.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampFormat1, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = MMDDYYYYHHMMZFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHMMZFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = YYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYFormat, dateStr); /* Some random numbers should not satisfy this year format. */ if(dateStr.length()>4) date = null; if(date!=null) formatFlag = YEARFLAG; } if(date==null) { - //date = timestamp_W_dash.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestamp_W_dash, dateStr); if(date!=null) formatFlag = SECFLAG; } @@ -3453,16 +3427,6 @@ public class ChartD3Helper { final int MILLISECFLAG = 7; final int DAYOFTHEWEEKFLAG = 8; final int FLAGDATE = 9; - /*int yearFlag = 1; - int monthFlag = 2; - int dayFlag = 3; - int hourFlag = 4; - int minFlag = 5; - int secFlag = 6; - int milliSecFlag = 7; - int dayoftheweekFlag = 8; - int flagDate = 10; - */ date = MMDDYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); if(date!=null) @@ -3478,7 +3442,6 @@ public class ChartD3Helper { formatFlag = MINFLAG; } if(date==null) { - //MMDDYYYYHHFormat.setTimeZone(TimeZone.getTimeZone("UTC")); date = MMDDYYYYHHFormat.parse(dateStr, new ParsePosition(0)); if(date!=null) formatFlag = HOURFLAG; @@ -3656,8 +3619,6 @@ public class ChartD3Helper { private void clearReportRuntimeBackup(HttpServletRequest request) { - //Session sess = Sessions.getCurrent(true)getCurrent(); - //HttpSession session = (HttpSession)sess.getNativeSession(); HttpSession session = request.getSession(); session.removeAttribute(AppConstants.DRILLDOWN_REPORTS_LIST); request.removeAttribute(AppConstants.DRILLDOWN_INDEX); @@ -3740,7 +3701,7 @@ public class ChartD3Helper { try { if(vals[j] !=null && vals[j].length() > 0) { vals[j] = Utils.oracleSafe(vals[j]); - value.append(java.net.URLDecoder.decode(vals[j], "UTF-8"));// + ","; + value.append(java.net.URLDecoder.decode(vals[j], "UTF-8")); } else value.append(vals[j]); @@ -3762,8 +3723,6 @@ public class ChartD3Helper { value.append(")"); } } - - //value = value.substring(0 , value.length()); valuesMap.put(fieldNameMap.get(formField), value.toString()); } else if(request.getParameter(formField) != null) { diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java index 797333cc..088409e1 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java @@ -642,8 +642,6 @@ public class ChartJSONHelper { if (nvl(getChartType()).length() == 0) return null; //TODO: display chart function to be added. - //if (!getDisplayChart()) - // return null; String sql = null; sql = generateChartSQL(userId, request); @@ -848,8 +846,6 @@ public class ChartJSONHelper { public String getSelectExpr(DataColumnType dct) { - // String colName = - // dct.isCalculated()?dct.getColName():((nvl(dct.getTableId()).length()>0)?(dct.getTableId()+"."+dct.getColName()):dct.getColName()); return getSelectExpr(dct, dct.getColName() /* colName */); } // getSelectExpr @@ -1420,7 +1416,7 @@ public class ChartJSONHelper { try { if(vals[j] !=null && vals[j].length() > 0) { vals[j] = Utils.oracleSafe(vals[j]); - value.append(java.net.URLDecoder.decode(vals[j], "UTF-8"));// + ","; + value.append(java.net.URLDecoder.decode(vals[j], "UTF-8")); } else value.append(vals[j]); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java index 370066ba..e8bd9295 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java @@ -558,9 +558,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } lookup = new IdNameSql(-1, SQL, lu.getDefaultSQL()); } - // } lookupList = lookup; - // } lookup.loadUserData(0, "", getDbInfo(), getUserId()); } @@ -579,9 +577,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } // for - // lookup.clearData(); } catch (Exception e) { - // throw new RaptorRuntimeException(e); } if (!hasPredefinedList) { if (oldSQL != null && !oldSQL.equals("")) { @@ -750,7 +746,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme lookup = new IdNameSql(-1, SQL, lu.getDefaultSQL()); } lookupList = lookup; - // } if (nvl(fieldValue).length() > 0 && (dependsOn == null || dependsOn.length() <= 0)) { sb.append((fieldValue != null) ? "obj.value=\"" + nvl(fieldValue) + "\";" : ""); } else if (lookup != null) { @@ -778,7 +773,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } } catch (Exception e) { } - // if(isVisible()) return sb.toString(); } else if (fieldType.equals(FFT_LIST_BOX)) { StringBuffer sb = new StringBuffer(); @@ -816,10 +810,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } lookup = new IdNameSql(-1, SQL, lu.getDefaultSQL()); } - // } lookupList = lookup; - - // } try { lookup.loadUserData(0, "", getDbInfo(), getUserId()); } catch (Exception e) { @@ -866,7 +857,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme ((IdNameSql) lookup).setSQL(oldSQL); } } - // System.out.println("FORMFIELD 6666667 " + ((IdNameSql)lookup).getSql()); if (isVisible()) return sb.toString(); else @@ -889,9 +879,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } catch (IllegalArgumentException ex1) { } catch (Exception ex2) { } - // System.out.println(fieldName + " " + fieldType + " " + fieldValue); if (fieldType.equals(FFT_TEXT_W_POPUP)) { - // System.out.println("TEXT POPUP " + fieldName); String oldSQL = ""; IdNameValue idNamevalue = null; String fieldDefValue = ""; @@ -914,7 +902,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme Map.Entry entry = (Entry) iter.next(); value = (String) entry.getValue(); SQL = Utils.replaceInString(SQL, "[" + entry.getKey() + "]", value); - // if(SQL.indexOf("'"+"["+entry.getKey()+"]"+"'")!=-1) { if (SQL.indexOf("'" + "[" + entry.getKey() + "]" + "'") != -1 || SQL.indexOf("'" + "[" + entry.getKey()) != -1 || SQL.indexOf(entry.getKey() + "]" + "'") != -1 @@ -951,7 +938,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme lookup = new IdNameSql(-1, SQL, null); } } - // lookupList = lookup; if (getFieldDefaultSQL() != null && (fieldValue == null || fieldValue.trim().equalsIgnoreCase("null") || fieldValue.trim().length() <= 0)) { @@ -1033,13 +1019,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } if (isVisible()) { - /* - * return "<input type=text class=\"text\" size=30 maxlength=50 id=\"" + - * fieldName +"\" name=\"" + fieldName + "\" value=\"" + nvl(fieldDefValue) + - * "\">\n" + "<a href=\"javascript:showArgPopupNew('" + fieldName + - * "', 'document.formd." + fieldName + "')\"><img border=0 src=\"" + - * AppUtils.getImgFolderURL() + "shareicon.gif\" " + getHelpLink(fieldName); - */ String progress = "<div id=\"" + fieldName + "_content\" style=\"display:none;width:100%;height:100%;align:center;\"> <img src=\"" + AppUtils.getImgFolderURL() @@ -1069,8 +1048,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme if (lu.getSql().length() > 0) { valueSQL = lu.getSql(); avail_ReadOnly = (valueSQL.toLowerCase().indexOf(readOnlyInSql) != -1); - // System.out.println("OLD SQL TEXT" + valueSQL); - // oldSQL = lu.getSql(); if (formValues != null) { Set set = formValues.entrySet(); String value1 = ""; @@ -1086,11 +1063,8 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } } // should be value one. - // lookup = new IdNameSql(-1,valueSQL,lu.getDefaultSQL()); } } - // lookupList = lookup; - // System.out.println("8888888 88 " + valueSQL); } if (valueSQL != null && valueSQL.length() > 0) { DataSet ds = ConnectionUtils.getDataSet(valueSQL.toString(), dbInfo); @@ -1112,10 +1086,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme && !inSchedule) ? "" : "") + getCallableJavascript(getFieldName(), rr) + " " + (readOnly ? " readonly " : " ") + " value=\""; - /* - * if(getFieldDefaultSQL()!=null) returnString += nvl(value.getId()); else - * returnString += fieldValue; - */ if (fieldValue != null && fieldValue.length() > 0 && (!(fieldValue.toUpperCase().indexOf("SELECT ") != -1 && fieldValue.toUpperCase().indexOf("FROM") != -1))) { if (validationType.startsWith("TIMESTAMP")) { @@ -1158,15 +1128,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } else returnString += nvl((value != null) ? value.getId() : ""); - /* - * returnString += "\">" + (validationType.equals(VT_DATE) ? - * "\n\t\t\t<a href=\"#\" onClick=\"window.dateField=document." + HTML_FORM + - * "." + fieldName + ";calendar=window.open('" + AppUtils.getRaptorActionURL() + - * "popup.calendar','cal','WIDTH=200,HEIGHT=250');return false;\">" + - * "\n\t\t\t\t<img src=\"" + AppUtils.getImgFolderURL() + - * "calender_icon.gif\" align=absmiddle border=0 width=20 height=20></a>" : ""); - */ - SimpleDateFormat dtf = new SimpleDateFormat("MM/dd/yyyy"); String stRangeText = this.getRangeStartDate() == null ? null : dtf.format(this.getRangeStartDate().getTime()); @@ -1175,12 +1136,8 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme // get the date sqls - // System.out.println("////////////start range date before Start" + - // this.getRangeStartDateSQL()); - if (this.getRangeStartDateSQL() != null && this.getRangeStartDateSQL().trim().toLowerCase().startsWith("select")) { - // System.out.println("////////////start range date Starting"); String SQL = this.getRangeStartDateSQL(); if (formValues != null) { Set set = formValues.entrySet(); @@ -1188,15 +1145,12 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme for (Iterator iter = set.iterator(); iter.hasNext();) { Map.Entry entry = (Entry) iter.next(); v = (String) entry.getValue(); - // System.out.println("///////// key is " + entry.getKey() + " = " + v); SQL = Utils.replaceInString(SQL, "[" + entry.getKey() + "]", v); } } - // System.out.println("////////////start range date sql created" + SQL); try { DataSet ds = ConnectionUtils.getDataSet(SQL.toString(), dbInfo); - // System.out.println("////////////start range date is : " + ds.get(0)); dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar tStart = Calendar.getInstance(); tStart.setTime(dtf.parse(ds.getString(0, 0))); @@ -1210,7 +1164,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme if (this.getRangeEndDateSQL() != null && this.getRangeEndDateSQL().trim().toLowerCase().startsWith("select")) { - // System.out.println("////////////end range date Starting"); String SQL = this.getRangeEndDateSQL(); if (formValues != null) { Set set = formValues.entrySet(); @@ -1224,12 +1177,10 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } try { DataSet ds = ConnectionUtils.getDataSet(SQL.toString(), dbInfo); - // System.out.println("////////////end range date is : " + ds.get(0)); dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar tStart = Calendar.getInstance(); tStart.setTime(dtf.parse(ds.getString(0, 0))); dtf = new SimpleDateFormat("MM/dd/yyyy"); - // endRangeText = dtf.format(tStart.getTime()); endRangeText = dtf.format(tStart.getTime().getTime() + MILLIS_IN_DAY); } catch (Exception e) { System.out.println("Exception////////// : end range date is : " + e); @@ -1266,30 +1217,17 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme if (inSchedule) hour = Integer.parseInt(nvl(((String) formValues.get(fieldName + "_Hr")), "0")); } - // System.out.println("Hour =" + hour); } catch (NumberFormatException ex) { hour = 0; } try { t_hr = Integer.parseInt(timestamphr); - // System.out.println("THR =" + t_hr); } catch (NumberFormatException ex) { t_hr = 0; } if (hour <= 0) hour = t_hr; - // System.out.println("Form Values 887 " + formValues); - /* - * if (formValues.containsKey(fieldDisplayName+"_Hr")){ - * formValues.remove(fieldDisplayName+"_Hr"); - * formValues.put(fieldDisplayName+"_Hr", hour); } else - * formValues.put(fieldDisplayName+"_Hr", hour); - * System.out.println("Form Values 887 " + formValues); - */ - - // int t_min = Integer.parseInt(timestampmin); - // int t_sec = Integer.parseInt(timestampsec); for (int i = 0; i < 24; i++) { if (i == 0) timeStampStr += "<option value=\"" + i + "\"" + ((hour == i) ? " selected" : "") diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java index 62bf4335..1c0e1c3d 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java @@ -343,7 +343,6 @@ public class FormatProcessor extends RaptorObject { count++; } } - //} } else { dv.setCellFormatter(formatter); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java index 73380025..037a6ec5 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java @@ -48,22 +48,6 @@ import org.onap.portalsdk.analytics.util.Utils; public class ReportParamDateValueParser { - /*public static final SimpleDateFormat[] dateFormats; - - static { - dateFormats = new SimpleDateFormat[5]; - (dateFormats[0] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MONTHYYYY)) - .setLenient(true); - (dateFormats[1] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MONTHDDYYYY)) - .setLenient(true); - (dateFormats[2] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MMDDYYYY)) - .setLenient(true); - (dateFormats[3] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MMYYYY)) - .setLenient(true); - (dateFormats[4] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_DDMONYYYY)) - .setLenient(true); - }*/ - public static boolean isDateHrParam(String param) { SimpleDateFormat[] dateFormats = new SimpleDateFormat[2]; dateFormats[0] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MMDDYYYY_HR); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java index 2cff3e63..98651143 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java @@ -107,12 +107,6 @@ public class ReportParamValues extends Hashtable { } // for } // ReportParamValues - /* - * public ReportParamValues(ReportFormFields rff, HttpServletRequest - * request) { this(rff); - * - * setParamValues(request); } // ReportParamValues - */ public boolean isParameterMultiValue(String fieldName) { Boolean b = (Boolean) paramIsMultiValue.get(fieldName); return (b != null) ? b.booleanValue() : false; @@ -130,7 +124,6 @@ public class ReportParamValues extends Hashtable { public boolean setParamValues(HttpServletRequest request, boolean refresh) { long currentTime = System.currentTimeMillis(); - //System.out.println("ReportParamValues setParamValues called " + refresh); boolean paramUpdated = false; if(refresh) clearValues(); @@ -152,41 +145,24 @@ public class ReportParamValues extends Hashtable { newValue = XSSFilter.filterRequestOnlyScript(sb.toString()); } // if } else if (isParameterTextAreaValue(key)) { -/* String[] values = request.getParameterValues(key); - - if (values != null) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < values.length; i++) { - if (sb.length() > 0) - sb.append('|'); - sb.append(values[i]); - } // for -*/ String value = ""; value = request.getParameter(key); value = Utils.oracleSafe(nvl(value)); paramIsTextAreaDrilldownValue.put(key, value); value = value.replaceAll(",", "|"); value = "('" + Utils.replaceInString(value, "|", "','") + "')"; - //value = Utils.replaceInString(value, "|", ","); newValue = XSSFilter.filterRequestOnlyScript(value); paramIsTextAreaValueModified.put(key, new Boolean(true)); //} // if } else - // newValue = nvl(request.getParameter(key)); newValue = XSSFilter.filterRequestOnlyScript(request.getParameter(key)); - //debugLogger.debug("IN REPORTPARAM ^NEW VALUE " + newValue + " OLD VALUE " + oldValue + " KEY " + key + " isParameterMultiValue(key) " + isParameterMultiValue(key)); if(!isParameterMultiValue(key) && !isParameterTextAreaValue(key)) { if(refresh && nvl(newValue).length()<=0) { put(key, oldValue); } else if ( ((newValue != null && newValue.trim().length()>0) && (oldValue!=null && oldValue.trim().length()>0) && !newValue.equals(oldValue)) || ((newValue != null && newValue.trim().length()>0) && (oldValue == null || oldValue.trim().length() <= 0)) ) { - paramUpdated = true; - //System.out.println("paramupdated1 " +paramUpdated+ " " + newValue + " " + oldValue); - // if(newValue.startsWith("[") && newValue.endsWith("]")) { - // newValue = getDateAsString(newValue); - // } + paramUpdated = true; put(key, newValue); } else if (((newValue == null || newValue.trim().length()<=0)) && (oldValue!=null && oldValue.trim().length()>0)) { paramUpdated = true; @@ -212,12 +188,10 @@ public class ReportParamValues extends Hashtable { } else if (((newValue == null || newValue.trim().length()<=0)) && (oldValue!=null && oldValue.trim().length()>0) && (isParameterMultiValue(key)||isParameterTextAreaValue(key))) { paramUpdated = true; - //System.out.println("paramupdated3 " +paramUpdated+ " N" + newValue + " O" + oldValue); put(key, ""); } } } // for - //printValues(); logger.debug(EELFLoggerDelegate.debugLogger, ("[DEBUG MESSAGE FROM RAPTOR] ------->Time Taken for Adding/Clearing Param Values for Search Field Display " + (System.currentTimeMillis() - currentTime))); return paramUpdated; } // setParamValues @@ -240,18 +214,10 @@ public class ReportParamValues extends Hashtable { } value = Utils.replaceInString(value, "~", "' , '"); value = "('" + Utils.replaceInString(value, "|", "','") + "')"; // changed from "|" - //value = Utils.replaceInString(value, "|", ","); value = XSSFilter.filterRequestOnlyScript(value); return value; } else return ""; -// if(nvl(value).length()>0) { -// value = Utils.replaceInString(value, ",", "|"); -// value = value.indexOf("('")!=-1? value.substring(2, value.length()-2):value; -// value = Utils.replaceInString(value, "'|'", ","); -// } -// return value; - } else return (String) get(key); } @@ -305,7 +271,6 @@ public class ReportParamValues extends Hashtable { if(nvl(defaultValue).length()>0) { put(key,ff.getDefaultValue()); } else if(nvl(defaultSQL).length() > 0) { - //defaultSQL = Utils.replaceInString(defaultSQL, "[LOGGED_USERID]", userId); if(!(isParameterMultiValue(key) || isParameterTextAreaValue(key))) { defaultQuery = "SELECT id, name FROM (SELECT rownum r, id, name FROM (" + defaultSQL + ") x " @@ -325,13 +290,7 @@ public class ReportParamValues extends Hashtable { } } } - } - -/* for (Enumeration enKeys = keys(); enKeys.hasMoreElements();) { - String key = (String) enKeys.nextElement(); - put(key,""); - } -*/ + } } @@ -346,28 +305,20 @@ public class ReportParamValues extends Hashtable { private String getDateAsString (String keyword) { String sql = ""; if (keyword.equals("[PROCESSING_DATE]")) { - //sql = "select to_char(trunc(sysdate,'dd'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate,'dd'), 'mm/dd/yyyy') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_NEXT_DATE]")) { - //sql = "select to_char(trunc(sysdate+1,'dd'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate+1,'dd'), 'mm/dd/yyyy') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_DAY_BEFORE_DATE]")) { - //sql = "select to_char(trunc(sysdate-1,'dd'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate-1,'dd'), 'mm/dd/yyyy') as dateStr"+ Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_MONTH_START_DATE]")) { - //sql = "select to_char(trunc(sysdate,'MM'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate,'MM'), 'mm/dd/yyyy') as dateStr"+ Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_MONTH_END_DATE]")) { - //sql = "select to_char(last_day(sysdate), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(last_day(sysdate), 'mm/dd/yyyy') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[CURRENT_HOUR]")) { - //sql = "select to_char(trunc(sysdate,'HH24'),'mm/dd/yyyy HH24') as dateStr from dual"; sql = "select to_char(trunc(sysdate,'HH24'),'mm/dd/yyyy HH24') as dateStr"+ Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PREVIOUS_HOUR]")) { - //sql = "select to_char(trunc(sysdate-1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr from dual"; sql = "select to_char(trunc(sysdate-1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[NEXT_HOUR]")) { - //sql = "select to_char(trunc(sysdate+1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr from dual"; sql = "select to_char(trunc(sysdate+1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr" + Globals.getGenerateSqlVisualDual(); } DataSet ds = null; @@ -381,7 +332,6 @@ public class ReportParamValues extends Hashtable { return ""; } catch (RaptorException ex) { logger.error(EELFLoggerDelegate.errorLogger, "RaptorException in getDateAsString", ex); - //throw ex; } return ""; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java index 483e9fe4..62d95efb 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java @@ -91,12 +91,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // for } // ReportParamValues - /* - * public ReportParamValues(ReportFormFields rff, HttpServletRequest - * request) { this(rff); - * - * setParamValues(request); } // ReportParamValues - */ public boolean isParameterMultiValue(String fieldName) { Boolean b = (Boolean) paramIsMultiValue.get(fieldName); return (b != null) ? b.booleanValue() : false; @@ -108,7 +102,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // isParameterMultiValue public boolean setParamValues(HttpServletRequest request, boolean refresh) { - //debugLogger.debug("ReportParamValues for PDF Excel setParamValues called " + refresh); long currentTime = System.currentTimeMillis(); boolean paramUpdated = false; if(refresh) @@ -141,7 +134,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { for (Iterator iter = rff.iterator(); iter.hasNext();) { name=""; //just added ff = (FormField) iter.next(); - //debugLogger.debug("ff.getFieldName " + ff.getFieldName() + " " + ff.getFieldDisplayName() + " " + ff.getFieldType()+ " " +ff.getBaseSQLForPDFExcel()+ " "+ rr.getParamValue(ff.getFieldName())); if(!ff.getFieldType().equals(FormField.FFT_BLANK)) { sql = ff.getBaseSQLForPDFExcel(); if(sql!=null && sql.trim().length()>0) @@ -197,34 +189,28 @@ public class ReportParamValuesForPDFExcel extends Hashtable { if(name.length()<=0) name = ff.getFieldName(); value = rr.getParamValue(name); - //debugLogger.debug("Name "+ name+ " value:" + value); String paramValue = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), getParamValueForSQL(name, value)); - //debugLogger.debug("PDFEXCEL " + name+ " " + ff.getFieldName()+ " " + value + " " + sql +" "+ paramValue); if(name!=null && name.equals(ff.getFieldName())) sql = Utils.replaceInString(sql, "[VALUE]", paramValue); if(paramValue == null) { if(sql.lastIndexOf("where id = ''")>0) sql = sql.substring(0, sql.lastIndexOf("where id = ''")); } - //debugLogger.debug("SQL Modified " + sql); FormField ff2 = null; for (Iterator iter1 = rff.iterator(); iter1.hasNext();) { ff2 = (FormField)iter1.next(); sql = Utils.replaceInString(sql, "[" + ff2.getFieldDisplayName() +"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),getParamValue(ff2.getFieldName()))); } - //debugLogger.debug("SQL Modified after replacing formfield" + sql); try { String[] reqParameters = Globals.getRequestParams().split(","); String[] sessionParameters = Globals.getSessionParams().split(","); String[] scheduleSessionParameters = Globals.getSessionParamsForScheduling().split(","); - javax.servlet.http.HttpSession session = request.getSession(); - //debugLogger.debug("B4 Session " + sql); + javax.servlet.http.HttpSession session = request.getSession(); if(session != null ) { for (int i = 0; i < sessionParameters.length; i++) { sql = Utils.replaceInString(sql, "[" + sessionParameters[i].toUpperCase()+"]", (String)session.getAttribute(sessionParameters[i]) ); } - } - //debugLogger.debug("B4 request " + sql); + } if(request != null ) { for (int i = 0; i < scheduleSessionParameters.length; i++) { sql = Utils.replaceInString(sql, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(scheduleSessionParameters[i]) )); @@ -243,8 +229,7 @@ public class ReportParamValuesForPDFExcel extends Hashtable { else sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } - } - //debugLogger.debug("After request " + sql); + } DataSet ds = null; try { ds = ConnectionUtils.getDataSet(sql, dbInfo); @@ -255,12 +240,9 @@ public class ReportParamValuesForPDFExcel extends Hashtable { StringBuffer multiValue = new StringBuffer(""); if(ds!=null) { for(int i = 0; i < ds.getRowCount(); i++) { - //if(i==0) multiValue.append("("); multiValue.append(ds.getString(i,1)); if(i<ds.getRowCount()-1) multiValue.append("|"); - //else multiValue.append(")"); - } } put(ff.getFieldName(), nvl(multiValue.toString())); @@ -278,7 +260,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { .getParamValue(ff.getFieldName()+"_Sec")).length() > 0 ? ":"+ addZero(Utils.oracleSafe(nvl(rr .getParamValue(ff.getFieldName()+"_Sec")))) : ""); } - //debugLogger.debug("77777777777777 " + value1); put(ff.getFieldName(), nvl(value1)); } else { @@ -293,15 +274,12 @@ public class ReportParamValuesForPDFExcel extends Hashtable { logger.debug(EELFLoggerDelegate.debugLogger, ("sql not complete" + sql)); } catch (Exception ex) {} - - //debugLogger.debug("66666666666666666 " + ff.getValidationType()); //Added for TimeStamp validation } else { if(!ff.getFieldType().equals(FormField.FFT_BLANK)) { //Added for TimeStamp validation - //debugLogger.debug("666666666666 " + ff.getValidationType()); if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC) ) { value1 = nvl(rr.getParamValue(ff.getFieldName())) + " "+addZero(Utils.oracleSafe(nvl(rr .getParamValue(ff.getFieldName()+"_Hr")))); @@ -315,7 +293,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { .getParamValue(ff.getFieldName()+"_Sec")).length() > 0 ? ":"+ addZero(Utils.oracleSafe(nvl(rr .getParamValue(ff.getFieldName()+"_Sec")))) : ""); } - //debugLogger.debug("77777777777777 " + value1); } else value1 = nvl(rr.getParamValue(ff.getFieldName())); if(value1.length()<=0) @@ -331,7 +308,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // dbInfo } // !=null - //printValues(); logger.debug(EELFLoggerDelegate.debugLogger, ("[DEBUG MESSAGE FROM RAPTOR] ------->Time Taken for Adding/Clearing Param Values for FormField Info Bar " + (System.currentTimeMillis() - currentTime))); return paramUpdated; } // setParamValues @@ -351,7 +327,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // getParamValue public String getParamDisplayValue(String key) { - //debugLogger.debug("Key is " + key +" Value is " + getParamValue(key)); String value = getParamValue(key); if (isParameterMultiValue(key)) value = "(" + Utils.replaceInString(value, "|", ",") + ")"; @@ -397,7 +372,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { if(nvl(defaultValue).length()>0) { put(key,ff.getDefaultValue()); } else if(nvl(defaultSQL).length() > 0) { - //defaultSQL = Utils.replaceInString(defaultSQL, "[LOGGED_USERID]", userId); if(!(isParameterMultiValue(key) || isParameterTextAreaValue(key))) { defaultQuery = "SELECT id, name FROM (SELECT rownum r, id, name FROM (" + defaultSQL + ") x " diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java index 6e03646d..987a8227 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java @@ -1125,9 +1125,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa Vector visibleCols = new Vector(reportCols.size()); Vector formatProcessors = new Vector(reportCols.size()); - // ColumnHeaderRow chr = new ColumnHeaderRow(); - // rd.reportColumnHeaderRows.addColumnHeaderRow(chr); - // chr.setRowHeight("30"); int count =0 ; ReportFormFields rff = getReportFormFields(); ReportFormFields childReportFormFields = null; @@ -1185,7 +1182,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa } } } - //} String widthInPxls = dc.getDisplayWidthInPxls(); @@ -1442,7 +1438,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa } } } - //} String widthInPxls = dc.getDisplayWidthInPxls(); |