Reporting Enhancements

Issue-ID: PORTAL-314
Remote DB logic is added to enhance RAPTOR to pull content from different DB as well as Different DB TYPE

Change-Id: I5cb343cd9daa912d78e7a8e409d28c8845d9afb4
Signed-off-by: RAMALINGAM, SUNDAR (sr7234) <sr7234@us.att.com>

1 files changed, 7 insertions, 6 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 97faffb1..1dce0e36 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
@@ -3684,11 +3684,10 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject {
 		setWholeSQL(reportSQL);
 		if(nvl(reportSQL).length()>0)
 			reportSQL = generateSQL(userId, request);
-		
-		if (reportSQL.toUpperCase().indexOf("ORDER BY ") < 0) {
+		if (nvl(reportSQL).toUpperCase().indexOf("ORDER BY ") < 0) {
 			StringBuffer sortBy = null;
 
-			if (reportSQL.toUpperCase().indexOf("GROUP BY ") < 0)
+			if (nvl(reportSQL).toUpperCase().indexOf("GROUP BY ") < 0)
 				if (getDataSourceList().getDataSource().size() > 0) {
 					DataSourceType dst = (DataSourceType) getDataSourceList().getDataSource()
 							.get(0);
@@ -3706,15 +3705,17 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject {
 						} // while
 					}
 				} // if
-			if (reportSQL.trim().toUpperCase().startsWith("SELECT")) {
+			if (nvl(reportSQL).trim().toUpperCase().startsWith("SELECT")) {
 				 //if (!(dbType.equals("DAYTONA") && reportSQL.trim().toUpperCase().startsWith("SELECT"))) 
 					// reportSQL += " ORDER BY " + ((sortBy == null) ? "1" : sortBy.toString());
 			}
 		}
-
 		StringBuffer colNames = new StringBuffer();
 		StringBuffer colExtraIdNames = new StringBuffer();
 		StringBuffer colExtraDateNames = new StringBuffer();
+		if(getDBType()!=null && getDBType().equals(AppConstants.ORACLE)) {
+			colNames.append("rownum rnum");
+		}
 		
 		if(getColumnNamesFromReportSQL) {
 			DataSet ds = ConnectionUtils.getDataSet(reportSQL, dbInfo);
@@ -3848,7 +3849,7 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject {
 			partSql = partSql+ " LIMIT "+ String.valueOf(startRow)+" , "+ String.valueOf(endRow);
 		} else if(getDBType().equals(AppConstants.ORACLE)) {
 			reportSQL = reportSQL.replace(" AS ", " ");
-			partSql = "where rownum >= "+ String.valueOf(startRow)+" and rownum <= "+(Integer.parseInt(String.valueOf(startRow)) + Integer.parseInt(String.valueOf(endRow)));
+			partSql = "where rnum >= "+ String.valueOf(startRow)+" and rnum <= "+(Integer.parseInt(String.valueOf(startRow)) + Integer.parseInt(String.valueOf(endRow)));
 		} else if(getDBType().equals(AppConstants.POSTGRESQL)) {
 			partSql = partSql + " LIMIT "+ String.valueOf(endRow)+" , "+ String.valueOf(startRow);//limit [pageSize] offset [startRow]
 		}