unprintable char removed from description also connection closed and...

unprintable char removed from description also connection closed and unnecessary connection commented


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91283 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-fin/ibase/webitm/ejb/fin/DefaultAssetRegisterIC.java

@@ -63,7 +63,7 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 			
 			if (actionType.equalsIgnoreCase("Default"))
 			{
-					try
+					/*try
 					{
 						if(conn==null)
 						{
@@ -82,7 +82,7 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 					catch (Exception e)
 					{
 						e.printStackTrace();
-					}
+					}*/
 					retString = actionDefault(dom, dom1, objContext, xtraParams);
 			}
 		}
@@ -114,12 +114,12 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 		
 		try
 		{	
-			if(conn==null)
-			{
+			//if(conn==null)
+			//{
 				ConnDriver connDriver = new ConnDriver();
 				conn = connDriver.getConnectDB("DriverITM");
 				connDriver=null;
-			}
+			//}
 			if(objContext != null && objContext.trim().length()>0)
 			{
 				currentFormNo = Integer.parseInt(objContext);
@@ -136,10 +136,10 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 		    rs = pstmt.executeQuery();
 			while (rs.next())
 			{
-				assetcode	=	rs.getString(1) == null ? "" :rs.getString(1);				
-				assetdescr	=	rs.getString(2) == null ? "" :rs.getString(2);
-				itemcode	=	rs.getString(3) == null ? "" :rs.getString(3);
-				itemdescr	=	rs.getString(4) == null ? "" :rs.getString(4);					
+				assetcode	=	rs.getString(1) == null ? "" : rs.getString(1);				
+				assetdescr	=	rs.getString(2) == null ? "" : rs.getString(2);
+				itemcode	=	rs.getString(3) == null ? "" : rs.getString(3);
+				itemdescr	=	rs.getString(4) == null ? "" : rs.getString(4);					
 				
 				valueXmlString.append("<Detail>\r\n");
 				valueXmlString.append("<asset_code>").append("<![CDATA[").append(assetcode).append("]]>").append("</asset_code>\r\n");
@@ -218,11 +218,11 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 	{
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
 		
-		Connection conn = null;
+		//Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		Node currDetail = null, currDetail1 = null;
-		ConnDriver connDriver = new ConnDriver();
+		//ConnDriver connDriver = new ConnDriver();
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		
@@ -232,8 +232,8 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 		String itmdescr_trans = null;
 		try 
 		{
-			conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;
+			//conn = connDriver.getConnectDB("DriverITM");
+			//connDriver = null;
 			
 			NodeList detailList = selDataDom.getElementsByTagName("Detail");
 			int noOfDetails = detailList.getLength();
@@ -245,9 +245,23 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 				astdescr_trans = genericUtility.getColumnValueFromNode("descr", currDetail1);
 				itmcode_trans = genericUtility.getColumnValueFromNode("item_code", currDetail1);
 				itmdescr_trans = genericUtility.getColumnValueFromNode("descr_item", currDetail1);
+				if (astcode_trans != null && astcode_trans.trim().length() > 0)
+				{
+					valueXmlString.append("<asset_code>").append("<![CDATA[").append(astcode_trans).append("]]>").append("</asset_code>\r\n");
+				}
+				else
+				{
+					valueXmlString.append("<asset_code>").append("<![CDATA[]]>").append("</asset_code>\r\n");
+				}
+				if (astdescr_trans != null && astdescr_trans.trim().length() > 0)
+				{
+					valueXmlString.append("<descr>").append("<![CDATA[").append(astdescr_trans).append("]]>").append("</descr>\r\n");
+				}
+				else
+				{
+					valueXmlString.append("<descr>").append("<![CDATA[]]>").append("</descr>\r\n");
+				}
 				
-				valueXmlString.append("<asset_code>").append("<![CDATA[").append(astcode_trans).append("]]>").append("</asset_code>\r\n");
-				valueXmlString.append("<descr>").append("<![CDATA[").append(astdescr_trans).append("]]>").append("</descr>\r\n");
 				valueXmlString.append("</Detail>");
 				//valueXmlString.append("<item_code>").append("<![CDATA[").append(itmcode_trans).append("]]>").append("</item_code>\r\n");
 				//valueXmlString.append("<descr>").append("<![CDATA[").append(itmdescr_trans).append("]]>").append("</descr>\r\n");
@@ -260,13 +274,13 @@ public class DefaultAssetRegisterIC extends ActionHandlerEJB implements DefaultA
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new ITMException(e);
-		} finally {
+		} /*finally {
 			try {
 				conn.close();
 				conn = null;
 			} catch (Exception e) {
 			}
-		}
+		}*/
 		System.out.println("valueXmlString from :" + valueXmlString.toString());
 		return valueXmlString.toString();
 	}