diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java')
| -rw-r--r-- | ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java index 4037bd0e..65972806 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java @@ -3582,7 +3582,6 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp String dbType = ""; String partSql = ""; String reportSQL = getWholeSQL(); - if (!CachingUtils.isReportSqlExists(request.getSession().getId()+reportSQL)) { if (!isNull(dbInfo) && (!dbInfo.equals(AppConstants.DB_LOCAL))) { try { dbType = remDbInfo.getDBType(dbInfo); @@ -3616,9 +3615,6 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp } } } - if (nvl(reportSQL).trim().toUpperCase().startsWith("SELECT")) { - - } } StringBuffer colNames = new StringBuffer(); StringBuffer colExtraIdNames = new StringBuffer(); @@ -3677,8 +3673,7 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp if ("DAYTONA".equals(dbType) && reportSQL.trim().toUpperCase().startsWith("SELECT")) { if (endRow == -1) - endRow = (getMaxRowsInExcelDownload() > 0) ? getMaxRowsInExcelDownload() - : Globals.getDownloadLimit(); + endRow = (getMaxRowsInExcelDownload() > 0) ? getMaxRowsInExcelDownload() : Globals.getDownloadLimit(); reportSQL = reportSQL + " LIMIT TO " + (startRow == 0 ? startRow + 1 : startRow) + "->" + endRow; return reportSQL; } else if ("DAYTONA".equals(dbType)) { @@ -3720,15 +3715,9 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp CachingUtils.putPageSql(request.getSession().getId()+getWholeSQL(), partSql); CachingUtils.putReportSql(request.getSession().getId()+getWholeSQL(), reportSQL); - }else { if (!AppUtils.isNotEmpty(getDBType())) { setDBType(Globals.getDBType()); } - } - if(startRow >= 0 && CachingUtils.isReportSqlExists(request.getSession().getId()+getWholeSQL()) ) { - partSql = CachingUtils.getPageSql(request.getSession().getId()+getWholeSQL()); - reportSQL = CachingUtils.getReportSql(request.getSession().getId()+getWholeSQL()); - } if (getDBType().equals(AppConstants.MYSQL)) { partSql = partSql + " LIMIT " + String.valueOf(startRow) + " , " + String.valueOf(endRow); @@ -3739,7 +3728,6 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp partSql = partSql + " LIMIT " + String.valueOf(endRow) + " , " + String.valueOf(startRow); } - reportSQL += partSql; return reportSQL; |