diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java')
12 files changed, 5 insertions, 299 deletions
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 49ed35b3..e144ef77 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 @@ -559,9 +559,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()); } @@ -580,9 +578,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("")) { @@ -751,7 +747,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) { @@ -779,7 +774,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(); @@ -817,10 +811,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) { @@ -867,7 +858,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 @@ -890,9 +880,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 = ""; @@ -915,7 +903,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 @@ -952,7 +939,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)) { @@ -1034,13 +1020,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() @@ -1070,8 +1049,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 = ""; @@ -1087,11 +1064,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); @@ -1113,10 +1087,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")) { @@ -1159,15 +1129,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()); @@ -1176,12 +1137,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(); @@ -1189,15 +1146,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))); @@ -1211,7 +1165,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(); @@ -1225,12 +1178,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); @@ -1267,30 +1218,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 d10826af..c62e1f07 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 @@ -1129,9 +1129,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; @@ -1189,7 +1186,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa } } } - //} String widthInPxls = dc.getDisplayWidthInPxls(); @@ -1446,7 +1442,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa } } } - //} String widthInPxls = dc.getDisplayWidthInPxls(); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java index b68acec8..82d3f76c 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java @@ -68,13 +68,6 @@ public class ReportSearchResult extends SearchResult { "Are you sure you want to create a copy of this report?", AppUtils .getImgFolderURL() + "modify_icon.gif", "13", "12", true, false, false)); - /*addColumn(new SearchResultColumn(" Schedule ", "5%", "Center", - "document." + HTML_FORM + "." + AppConstants.RI_ACTION - + ".value='report.schedule_only';", "Schedule report", HTML_FORM, - null, AppUtils - .getImgFolderURL() - + "calendar_icon.gif", "13", "12", true, false, false)); - */ addColumn(new SearchResultColumn("edit"," Edit ", "5%", "Center", "document." + HTML_FORM + "." + AppConstants.RI_ACTION diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java index 9f32eeba..7d74f59a 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java @@ -216,17 +216,6 @@ public class SearchResultField extends org.onap.portalsdk.analytics.RaptorObject return (displayValue.length() == 0) ? " " : displayValue; } - /*public String getAlignmentHtml() { - return (alignment.length() == 0) ? "" : (" align=" + alignment); - }*/ - - /*public String getDisplayValueLinkHtml() { - if (nvl(drillDownLink).length() == 0) - return getDisplayValueHtml(); - else - return getDrillDownLink(); - } // getDisplayValueLinkHtml*/ - public String getColumnId() { return columnId; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java index 9bb5c7dd..d141eb43 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java @@ -65,8 +65,6 @@ class ColumnContent { } public class SearchResultRow extends ArrayList { - - //private SearchResultField searchresultField; private int nextElemIdx = 0; public void resetNext() { diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java index c13e2ba7..fba9fee4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java @@ -346,18 +346,6 @@ public class SendNotifications { } } - // schedulerUtil.getAndExecute("select c.column_value from table(CR_DISSECTURL(p_formfields)) c - // where substr(c.column_value, 1, instr(c.column_value, '=')-1) = substr(" + result.v_name + - // ",1,instr(" + result.v_name + ",'_auto')-1)||'_Hr'", new Executor() { - // - // @Override - // public void execute(ResultSet rs) throws SQLException { - // - // result.v_hour = rs.getString("column_value"); - // } - // - // }); - if (result.v_hour.length() > 0) { result.v_hour_value = result.v_hour.substring(result.v_hour.indexOf('=') + 1); } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java index 972cf721..245ae55a 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java @@ -135,10 +135,6 @@ public class AppUtils /* implements IAppUtils */{ return Globals.getAppUtils().isUserInRole(request,roleId); } // isUserInRole -// public static boolean isUserInRole(String userId, String roleId) throws RaptorException { -// return Globals.getAppUtils().isUserInRole(userId, roleId); -// } // isUserInRole - public static Vector getUserRoles(HttpServletRequest request) throws RaptorException { return Globals.getAppUtils().getUserRoles(request); } // getUserRoles @@ -146,10 +142,6 @@ public class AppUtils /* implements IAppUtils */{ public static Vector getUserRoles(String userID) throws RaptorException { return Globals.getAppUtils().getUserRoles(userID); } // getUserRoles - -// public static Vector getUserRoles(HttpServletRequest request) throws RaptorException { -// return Globals.getAppUtils().getUserRoles(request); -// } // getUserRoles public static void resetUserCache() { Globals.getAppUtils().resetUserCache(); @@ -170,12 +162,6 @@ public class AppUtils /* implements IAppUtils */{ else return isUserInRole(request, getSuperRoleID()); } // isSuperUser - /*public static boolean isSuperUser(String userId) throws RaptorException { - if(Globals.isAdminRoleEquivalenttoSuperRole()) return isAdminUser(userId); - else return isUserInRole(userId, getSuperRoleID()); - } // isSuperUser - */ - public static boolean isAdminUser(HttpServletRequest request) throws RaptorException { if (isSuperUser(request)) return true; @@ -186,18 +172,6 @@ public class AppUtils /* implements IAppUtils */{ return false; } // isAdminUser - /*public static boolean isAdminUser(String userId) throws RaptorException { - if (isSuperUser(userId)) - return true; - - for (int i = 0; i < getAdminRoleIDs().size(); i++) - if (isUserInRole(userId, (String) getAdminRoleIDs().get(i))) - return true; - - return false; - } // isAdminUser - */ - public static String getTempFolderPath() { String path = Globals.getAppUtils().getTempFolderPath(); if (path.endsWith(File.separator) || path.endsWith("/")){ @@ -266,19 +240,6 @@ public class AppUtils /* implements IAppUtils */{ return Globals.getAppUtils().getFolderPathAdj(); } // getBaseFolderURL - - /* - * public static String getReportExecuteActionURL() { return - * Globals.getAppUtils().getReportExecuteActionURL(); } // - * getReportExecuteActionURL - * - * public static String getDataViewActionURL() { return - * Globals.getAppUtils().getDataViewActionURL(); } // getDataViewActionURL - * - * public static String getDataViewActionParam() { return - * Globals.getAppUtils().getDataViewActionParam(); } // - * getDataViewActionParam - */ public static String getDirectAccessURL() { return Globals.getAppUtils().getDirectAccessURL(); } // getDirectAccessURL diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java index b64f8e07..6d9c94f9 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java @@ -990,10 +990,6 @@ return sheetName; } return limit; } - -// public static String getWhereConditionForUserRole() { -// return nvls(raptorProperties.getProperty("schedule_where_condition"),"").trim(); -// } public static String getCustomizedScheduleQueryForUsers() { return nvls(raptorProperties.getProperty("schedule_custom_query_for_users"),"").trim(); } @@ -1336,65 +1332,6 @@ return sheetName; List formParameter = new ArrayList(); String formField = ""; -// for(int i = 1 ; i < (countOfFields+1); i++) -// { -// formField ="ff"+i; -// -// if(request.getParameterValues(formField) != null && request.getParameterValues(formField).length > 1 ) -// { -// String[] vals = request.getParameterValues(formField); -// boolean isMultiValue = false; -// StringBuffer value = new StringBuffer(""); -// if(vals.length > 1) { -// isMultiValue = true; -// value.append("("); -// } -// for(int j = 0 ; j < vals.length; j++) -// { -// if(isMultiValue) value.append("'"); -// try { -// if(vals[j] !=null && vals[j].length() > 0) -// value.append(java.net.URLDecoder.decode(vals[j], "UTF-8"));// + ","; -// else -// value.append(vals[j]); -// } catch (UnsupportedEncodingException ex) {value.append(vals[j]);} -// catch (IllegalArgumentException ex1){value.append(vals[j]);} -// catch (Exception ex2){value.append(vals[j]);} -// -// -// if(isMultiValue) value.append("'"); -// -// if(j != vals.length -1) { -// value.append(","); -// } -// } -// if(vals.length > 1) { -// value.append(")"); -// } -// -// //value = value.substring(0 , value.length()); -// -// valuesMap.put(fieldNameMap.get(formField), value.toString()); -// value = new StringBuffer(""); -// -// } -// else if(request.getParameter(formField) != null) -// { -// String value = ""; -// value = request.getParameter(formField); -// try { -// if(value !=null && value.length() > 0) -// value = java.net.URLDecoder.decode(request.getParameter(formField), "UTF-8"); -// } catch (UnsupportedEncodingException ex) {} -// catch (IllegalArgumentException ex1){} -// catch (Exception ex2){} -// valuesMap.put(fieldNameMap.get(formField), value); -// -// }else -// { -// valuesMap.put(fieldNameMap.get(formField), "NULL" ); -// } -// } for(int i = 0 ; i < rff.size(); i++) { ff = ((FormField)rff.getFormField(i)); formField = ff.getFieldName(); |