UPDATED

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

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

@@ -8,6 +8,8 @@ import java.rmi.RemoteException;
 import java.sql.*;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -217,7 +219,7 @@ public class BudgetGroup extends ValidatorEJB implements BudgetGroupLocal,Budget
 						if (childNodeName.equalsIgnoreCase("cctr_code"))
 						{
 							cctr_code = genericUtility.getColumnValue("cctr_code",dom);							
-							if (cctr_code == null || cctr_code.trim().length() == 0 )
+							if (cctr_code == null)
 							{
 									errCode = "VMCCTRE";
 									errString = getErrorString("cctr_code",errCode,userId);
@@ -251,7 +253,7 @@ public class BudgetGroup extends ValidatorEJB implements BudgetGroupLocal,Budget
 									
 									anal_code = genericUtility.getColumnValue("anal_code",dom);							
 									acct_code = genericUtility.getColumnValue("acct_code",dom);	
-									if (anal_code == null || anal_code.trim().length() == 0 )
+									if (anal_code == null)
 									{
 											errCode = "VMACIE";
 											errString = getErrorString("anal_code",errCode,userId);
@@ -278,52 +280,52 @@ public class BudgetGroup extends ValidatorEJB implements BudgetGroupLocal,Budget
 											errString = getErrorString("anal_code",errCode,userId);
 											break;
 										}
-//											String val = null;
-//					                        sql = "select acct_code from accounts_analysis where anal_code= ? ";
-//					                        System.out.println("CHECK ANAL");
-//					                        pstmt = conn.prepareStatement(sql);
-//					                        pstmt.setString(1, anal_code);
-//					                        rs = pstmt.executeQuery();
-//
-//					                        if (rs.next()) {
-//					                                val = rs.getString(1);
-//					                               
-//					                        }
-//					                       
-//					                        rs.close();
-//					                        rs = null;
-//					                        pstmt.close();
-//					                        pstmt = null;
-//					                       
-//					                        if (!(val.trim().equalsIgnoreCase(acct_code.trim()))) {
-//					                        	
-//					                                errCode = "VMANAL2";
-//					                                errString = getErrorString("anal_code",errCode, userId);
-//					                                break;
-//					                        }
+											String val = null;
+				                        sql = "select acct_code from accounts_analysis where anal_code= ? ";
+				                        System.out.println("CHECK ANAL");
+				                        pstmt = conn.prepareStatement(sql);
+				                        pstmt.setString(1, anal_code);
+				                        rs = pstmt.executeQuery();
+
+				                        if (rs.next()) {
+				                                val = rs.getString(1);
+				                               
+					                        }
+					                       
+					                        rs.close();
+					                        rs = null;
+					                        pstmt.close();
+					                        pstmt = null;
+					                        System.out.println("callll");
+				                        if (!(val.trim().equalsIgnoreCase(acct_code.trim()))) {
+				                        	
+				                                errCode = "VMANAL2";
+				                                errString = getErrorString("anal_code",errCode, userId);
+				                                break;
+				                        }
 										
 	
-												sql = "select count(1) from accounts_analysis where "
-														+ " acct_code = ? and anal_code= ? ";
-												pstmt = conn.prepareStatement(sql);
-									     		pstmt.setString(1, acct_code);
-												pstmt.setString(2, anal_code);
-												rs = pstmt.executeQuery();
-
-												if (rs.next()) {
-													cnt = rs.getInt(1);
-												}
-												rs.close();
-												rs = null;
-												pstmt.close();
-												pstmt = null;
-												if (cnt > 0) {
-
-													errCode = "VMANAL2";
-													errString = getErrorString("anal_code",
-															errCode, userId);
-													break;
-												}
+//												sql = "select count(1) from accounts_analysis where "
+//														+ " acct_code = ? and anal_code= ? ";
+//												pstmt = conn.prepareStatement(sql);
+//									     		pstmt.setString(1, acct_code);
+//												pstmt.setString(2, anal_code);
+//												rs = pstmt.executeQuery();
+//
+//												if (rs.next()) {
+//													cnt = rs.getInt(1);
+//												}
+//												rs.close();
+//												rs = null;
+//												pstmt.close();
+//												pstmt = null;
+//												if (cnt > 0) {
+//
+//													errCode = "VMANAL2";
+//													errString = getErrorString("anal_code",
+//															errCode, userId);
+//													break;
+//												}
 											
 										
 					                
@@ -337,7 +339,7 @@ public class BudgetGroup extends ValidatorEJB implements BudgetGroupLocal,Budget
 								if (childNodeName.equalsIgnoreCase("dept_code"))
 								{
 									String dept_code = genericUtility.getColumnValue("dept_code",dom);							
-									if (dept_code == null || dept_code.trim().length() == 0 )
+									if (dept_code == null)
 									{
 											errCode = "VMDCTRE";
 											errString = getErrorString("dept_code",errCode,userId);