Skip to content

B
business-java
Commit b019c02b authored by smane's avatar smane
Browse files
Options

Changes for Generalise validation, To solve issue for , if 

the any message is with type warning then also system is not checking
for further validation.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97037 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e199bc39
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 20 deletions
webitm-sys/ibase/webitm/ejb/sys/GenVal.java
View file @ b019c02b
...@@ -10,7 +10,6 @@ import ibase.webitm.ejb.*; ...@@ -10,7 +10,6 @@ import ibase.webitm.ejb.*;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.system.config.*; import ibase.system.config.*;
import ibase.system.config.ConnDriver;
public class GenVal public class GenVal
{ {
...@@ -29,10 +28,12 @@ public class GenVal ...@@ -29,10 +28,12 @@ public class GenVal
File filePtr ; File filePtr ;
File logDir ; File logDir ;
String logDirName = ""; String logDirName = "";
HashMap<String, String> errorMap=new HashMap<String, String>();
//end added by msalam on 22/11/07 for appending log in jboss log //end added by msalam on 22/11/07 for appending log in jboss log
//public String genVal(String modName ,String objContext,Document data ,Connection conn) //public String genVal(String modName ,String objContext,Document data ,Connection conn)
public String genVal(String modName ,String objContext,Document data ) //public String genVal(String modName ,String objContext,Document data ) //comment added by sagar on 24/12/14
public HashMap genVal(String modName ,String objContext,Document data )
{ {
//System.out.println("Generalized Validation Is In Process.************************************......."); //System.out.println("Generalized Validation Is In Process.************************************.......");
Statement stmt = null; Statement stmt = null;
...@@ -40,8 +41,10 @@ public class GenVal ...@@ -40,8 +41,10 @@ public class GenVal
Connection conn = null; Connection conn = null;
String fldName ="",valType = "",fldMin = "",sqlInput = "",fldMax = "",errCD = "",blankOpt = "",fldData ="",fldType=""; String fldName ="",valType = "",fldMin = "",sqlInput = "",fldMax = "",errCD = "",blankOpt = "",fldData ="",fldType="";
String errCode =""; String errCode ="";
//HashMap<String, String> errorMap=new HashMap<String, String>();
String sql = " SELECT FLD_NAME,VAL_TYPE,FLD_MIN,SQL_INPUT,FLD_MAX,ERROR_CD,BLANK_OPT ,FLD_TYPE FROM GENMST WHERE MOD_NAME= '"+modName.toUpperCase()+"'"; String sql = " SELECT FLD_NAME,VAL_TYPE,FLD_MIN,SQL_INPUT,FLD_MAX,ERROR_CD,BLANK_OPT ,FLD_TYPE FROM GENMST WHERE MOD_NAME= '"+modName.toUpperCase()+"'";
//System.out.println("SQL :: "+sql); //System.out.println("SQL :: "+sql);
System.out.println(">>>>>>>>sql in genVal:"+sql);
String errMsg =" "; String errMsg =" ";
try try
{ {
...@@ -63,6 +66,12 @@ public class GenVal ...@@ -63,6 +66,12 @@ public class GenVal
blankOpt = rs.getString(7); blankOpt = rs.getString(7);
fldType = rs.getString(8); fldType = rs.getString(8);
fldData = getValueFromDom(data,fldName,objContext); fldData = getValueFromDom(data,fldName,objContext);
System.out.println(">>>>>>>>>in while fldName:"+fldName);
System.out.println(">>>>>>>>>in while valType:"+valType);
System.out.println(">>>>>>>>>in while fldData:"+fldData);
System.out.println(">>>>>>>>>in while flag:"+flag);
//System.out.println("Fld Name :["+fldName+"] Value : "+fldData+"] Present["+flag+"]"); //System.out.println("Fld Name :["+fldName+"] Value : "+fldData+"] Present["+flag+"]");
//System.out.println("validation Type********************["+valType+"]"); //System.out.println("validation Type********************["+valType+"]");
if( flag == true ) if( flag == true )
...@@ -86,6 +95,7 @@ public class GenVal ...@@ -86,6 +95,7 @@ public class GenVal
{ {
//***errMsg = genVal( fldName, modName, data, objContext, fldMin, sqlInput, fldMax, errCD, conn ); //***errMsg = genVal( fldName, modName, data, objContext, fldMin, sqlInput, fldMax, errCD, conn );
errMsg = genVal( fldName, modName, data, objContext, fldMin, sqlInput, fldMax, errCD ); errMsg = genVal( fldName, modName, data, objContext, fldMin, sqlInput, fldMax, errCD );
System.out.println(">>>>>>>errMsg from Q valType:"+errMsg);
} }
//slab validation //slab validation
else if( valType.equalsIgnoreCase( "S" ) ) else if( valType.equalsIgnoreCase( "S" ) )
...@@ -148,6 +158,7 @@ public class GenVal ...@@ -148,6 +158,7 @@ public class GenVal
{ {
//System.out.println("Calling masterVal for module * * * * * [" + modName.trim() + "]"); //System.out.println("Calling masterVal for module * * * * * [" + modName.trim() + "]");
//***errMsg = masterVal( fldName, modName, fldData, errCD, conn ); //***errMsg = masterVal( fldName, modName, fldData, errCD, conn );
System.out.println(">>>>>>>If valType M:"+valType);
errMsg = masterVal( fldName, modName, fldData, errCD ); errMsg = masterVal( fldName, modName, fldData, errCD );
} }
//next line commented by msalam on 22/11/07 as validation is required on fldData blank also //next line commented by msalam on 22/11/07 as validation is required on fldData blank also
...@@ -155,9 +166,18 @@ public class GenVal ...@@ -155,9 +166,18 @@ public class GenVal
//end commented by msalam on 22/11/07 as validation is required on fldData blank also //end commented by msalam on 22/11/07 as validation is required on fldData blank also
} }
} }
if(errMsg.trim().length()>0) /*if(errMsg.trim().length()>0) //comment added by sagar on 24/12/14
{ {
break; break;
}*/
System.out.println(">>>>>>>>>Get fldName:"+fldName);
System.out.println(">>>>>>>>>Get errMsg:"+errMsg);
if(errMsg.trim().length()>0 && flag==true) //condition added by sagar on 25/12/14
{
System.out.println(">>>>>>>>Before Adding to errorMap >fldName:"+fldName);
System.out.println(">>>>>>>>Before Adding to errorMap >errMsg:"+errMsg);
errorMap.put(fldName.trim(), errMsg.trim());
errMsg="";
} }
} }
rs.close(); rs.close();
...@@ -169,15 +189,19 @@ public class GenVal ...@@ -169,15 +189,19 @@ public class GenVal
conn.close(); conn.close();
conn = null; conn = null;
} }
if(errMsg.trim().length()==0 && xFlag == true) if(errMsg.trim().length()==0 && xFlag == true)
{ {
System.out.println(">>>>>>>>>>>>>Check for ModeName:X");
xFlag = false; xFlag = false;
//System.out.println("Calling genVal for module * * * * * [X]"); //System.out.println("Calling genVal for module * * * * * [X]");
//***errMsg = genVal("X",objContext,data ,conn); //***errMsg = genVal("X",objContext,data ,conn);
errMsg = genVal("X",objContext,data ); //errMsg = genVal("X",objContext,data );//comment added by sagar on 25/12/14
errorMap = genVal("X",objContext,data );//code added by sagar on 25/12/14
System.out.println(">>>>>>>>>>>>>errorMap from Mod Name=X :"+errorMap);
xFlag = true; xFlag = true;
} }
System.out.println(">>>>>>>>Final Return errorMap:"+errorMap);
} // end of try } // end of try
catch (SQLException sx) catch (SQLException sx)
{ {
...@@ -220,16 +244,18 @@ public class GenVal ...@@ -220,16 +244,18 @@ public class GenVal
//return stkOpt; //return stkOpt;
} }
return errMsg; //return errMsg;
return errorMap;//return type changed by sagar on 25/12/14
} }
//changed by msalam on 26/09/07 start //changed by msalam on 26/09/07 start
//to overload the function //to overload the function
//public String genVal(String modName ,String objContext,Document data ,Connection conn) //public String genVal(String modName ,String objContext,Document data ,Connection conn)
//public String genVal(String modName ,String objContext,Document data, String focusedRow, Connection conn) //public String genVal(String modName ,String objContext,Document data, String focusedRow, Connection conn)
public String genVal(String modName ,String objContext,Document data, String focusedRow) //public String genVal(String modName ,String objContext,Document data, String focusedRow)//comment added by sagar on 25/12/14
public HashMap genVal(String modName ,String objContext,Document data, String focusedRow)
{ {
String errMsg =" "; String errMsg =" ";
HashMap<String, String> errorMsgMap= new HashMap<String, String>();
//changed by msalam on 26/09/07 start //changed by msalam on 26/09/07 start
if( focusedRow != null ) if( focusedRow != null )
{ {
...@@ -252,9 +278,11 @@ public class GenVal ...@@ -252,9 +278,11 @@ public class GenVal
writeLog( filePtr, "GenVal called", true ); writeLog( filePtr, "GenVal called", true );
//end changed by msalam on 22/11/07 for appending log //end changed by msalam on 22/11/07 for appending log
//***errMsg = genVal( modName, objContext, data, conn); //***errMsg = genVal( modName, objContext, data, conn);
errMsg = genVal( modName, objContext, data); //errMsg = genVal( modName, objContext, data);//comment added by sagar on 25/12/14
errorMsgMap = genVal( modName, objContext, data);//code added by sagar on 25/12/14
return errMsg; System.out.println(">>>>>>>>>>>Return errorMsgMap in GenVal:"+errorMsgMap.toString());
//return errMsg;//comment added by sagar on 25/12/14
return errorMsgMap;
} }
//changed by msalam on 26/09/07 end //changed by msalam on 26/09/07 end
...@@ -326,6 +354,7 @@ public class GenVal ...@@ -326,6 +354,7 @@ public class GenVal
//System.out.println("Excecuting Query(valtype=M);:::::::::::::::"+sql); //System.out.println("Excecuting Query(valtype=M);:::::::::::::::"+sql);
//try //try
//{ //{
System.out.println(">>>>>>>>>>>>>in masterVal sql:"+sql);
mst=conn.createStatement(); mst=conn.createStatement();
mrs = mst.executeQuery( sql ); mrs = mst.executeQuery( sql );
if(mrs.next()) if(mrs.next())
...@@ -336,6 +365,7 @@ public class GenVal ...@@ -336,6 +365,7 @@ public class GenVal
mrs = null; mrs = null;
mst.close(); mst.close();
mst = null; mst = null;
System.out.println(">>>>>>>>>>>>>in masterVal count:"+count);
if(count==0) if(count==0)
{ {
err = errCD; err = errCD;
...@@ -376,7 +406,11 @@ public class GenVal ...@@ -376,7 +406,11 @@ public class GenVal
writeLog( filePtr, "Database queries :::" + queryFrDB, true ); writeLog( filePtr, "Database queries :::" + queryFrDB, true );
writeLog( filePtr, "Input to query :::" + sqlInput, true ); writeLog( filePtr, "Input to query :::" + sqlInput, true );
writeLog( filePtr, "Value after execute :::" + resultStr, true ); writeLog( filePtr, "Value after execute :::" + resultStr, true );
System.out.println(">>>>>>>>>>>>>>>In genVal Start>>>>>>>>>>>>>>>>>>>>");
System.out.println(">>>>>>>>queryFrDB:"+queryFrDB);
System.out.println(">>>>>>>>sqlInput:"+sqlInput);
System.out.println(">>>>>>>>resultStr:"+resultStr);
System.out.println(">>>>>>>>fldName:"+fldName);
//***enumerate the sqlinput and store individual parameter in an vector(check for null) //***enumerate the sqlinput and store individual parameter in an vector(check for null)
if( sqlInput != null ) if( sqlInput != null )
{ {
...@@ -386,12 +420,14 @@ public class GenVal ...@@ -386,12 +420,14 @@ public class GenVal
sqlInputVec.add( st.nextToken() ); sqlInputVec.add( st.nextToken() );
} }
} }
System.out.println(">>>>>>>>>>>>sqlInputVec:"+sqlInputVec.toString());
//***Enumerate the resultStr and store individual parameter in an vector //***Enumerate the resultStr and store individual parameter in an vector
st = new StringTokenizer( resultStr, "," ); st = new StringTokenizer( resultStr, "," );
while ( st.hasMoreTokens() ) while ( st.hasMoreTokens() )
{ {
resultStrVec.add( st.nextToken() ); resultStrVec.add( st.nextToken() );
} }
System.out.println(">>>>>>>>>>>>resultStrVec:"+resultStrVec.toString());
} }
catch ( Exception e ) catch ( Exception e )
{ {
...@@ -520,6 +556,7 @@ public class GenVal ...@@ -520,6 +556,7 @@ public class GenVal
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
ResultSetMetaData rsmd = rs1.getMetaData(); ResultSetMetaData rsmd = rs1.getMetaData();
int numberOfColumns = rsmd.getColumnCount(); int numberOfColumns = rsmd.getColumnCount();
System.out.println(">>>>>>>>>>>numberOfColumns:"+numberOfColumns);
if( numberOfColumns != resultStrVec.size() ) if( numberOfColumns != resultStrVec.size() )
{ {
errCode = "CONFIGERR"; errCode = "CONFIGERR";
...@@ -556,6 +593,7 @@ public class GenVal ...@@ -556,6 +593,7 @@ public class GenVal
{ {
data = new Integer( rs1.getInt( ctr ) ).toString(); data = new Integer( rs1.getInt( ctr ) ).toString();
} }
System.out.println(">>>>>>>>>>>in for numberOfColumns data:"+data);
} }
writeLog( filePtr, "Query RESULT ====>>>" + data, true ); writeLog( filePtr, "Query RESULT ====>>>" + data, true );
dataVec.add( data ); dataVec.add( data );
...@@ -567,19 +605,23 @@ public class GenVal ...@@ -567,19 +605,23 @@ public class GenVal
pstmt1 = null; pstmt1 = null;
conn.close(); conn.close();
conn = null; conn = null;
System.out.println(">>>>>>>resultStrVec:"+resultStrVec.toString());
for( int counter = 0; counter < resultStrVec.size(); counter++ ) for( int counter = 0; counter < resultStrVec.size(); counter++ )
{ {
System.out.println(">>>>>>>In for resultStrVec:");
String result = (String)resultStrVec.get( counter ); String result = (String)resultStrVec.get( counter );
String valueFrDatabase = (String)dataVec.get( counter ); String valueFrDatabase = (String)dataVec.get( counter );
System.out.println(">>>>>>>>>>result:"+result);
System.out.println(">>>>>>>>>>valueFrDatabase:"+valueFrDatabase);
writeLog( filePtr, "valueFrDatabase=" + valueFrDatabase, true ); writeLog( filePtr, "valueFrDatabase=" + valueFrDatabase, true );
writeLog( filePtr, "QRY Result" + result, true ); writeLog( filePtr, "QRY Result" + result, true );
if( !result.trim().equalsIgnoreCase( valueFrDatabase.trim() ) ) if( !result.trim().equalsIgnoreCase( valueFrDatabase.trim() ) )
{ {
System.out.println(">>>>>>>>>>>Assign errcd to errCode:"+errcd);
errCode = errcd ; errCode = errcd ;
break; break;
} }
} }
} }
catch (SQLException sx) catch (SQLException sx)
{ {
...@@ -590,6 +632,8 @@ public class GenVal ...@@ -590,6 +632,8 @@ public class GenVal
{ {
e.printStackTrace(); e.printStackTrace();
} }
System.out.println(">>>>>>>>>>>errCode from genVal:"+errCode);
System.out.println(">>>>>>>>>>>>>>>In genVal End>>>>>>>>>>>>>>>>>>>>");
return errCode; return errCode;
} }
//******** Get the type of the field //******** Get the type of the field
......
webitm-sys/ibase/webitm/ejb/sys/GenValidate.java
View file @ b019c02b
...@@ -14,6 +14,10 @@ import java.rmi.RemoteException; ...@@ -14,6 +14,10 @@ import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.ejb.CreateException; import javax.ejb.CreateException;
import javax.ejb.SessionBean; import javax.ejb.SessionBean;
...@@ -28,7 +32,7 @@ import org.w3c.dom.Document; ...@@ -28,7 +32,7 @@ import org.w3c.dom.Document;
* Window - Preferences - Java - Code Style - Code Templates * Window - Preferences - Java - Code Style - Code Templates
*/ */
import javax.ejb.Stateless; // added for ejb3 import javax.ejb.Stateless; // added for ejb3
@Stateless // added for ejb3 @Stateless // added for ejb3
public class GenValidate extends ValidatorEJB implements GenValidateLocal , GenValidateRemote // SessionBean{ public class GenValidate extends ValidatorEJB implements GenValidateLocal , GenValidateRemote // SessionBean{
...@@ -65,8 +69,12 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen ...@@ -65,8 +69,12 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String winName, String xtraParams) throws RemoteException public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String winName, String xtraParams) throws RemoteException
{ {
String finalStr = ""; String finalStr = "";
String errFldName="";
Document dom = null; Document dom = null;
String userId="", errCode = "",resultString = ""; String userId="", errCode = "",resultString = "";
String errString = "",errorType="";
HashMap<String , String > errorMap= new HashMap<String, String>();
StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
// finalStr = mergeXml(xmlString, xmlString1, xmlString2); // finalStr = mergeXml(xmlString, xmlString1, xmlString2);
try try
{ {
...@@ -87,14 +95,45 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen ...@@ -87,14 +95,45 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
//errCode = genVal.genVal(winName,objContext,dom,conn); //errCode = genVal.genVal(winName,objContext,dom,conn);
//****errCode = genVal.genVal(winName,objContext,dom, focusedRow, conn); //****errCode = genVal.genVal(winName,objContext,dom, focusedRow, conn);
GenVal genVal = new GenVal(); GenVal genVal = new GenVal();
errCode = genVal.genVal(winName,objContext,dom, focusedRow); //errCode = genVal.genVal(winName,objContext,dom, focusedRow);//comment added by sagar on 25/12/14
errorMap = genVal.genVal(winName,objContext,dom, focusedRow);//code added by sagar on 25/12/14
genVal = null; genVal = null;
//changed by msalam on 27/09/07 end //changed by msalam on 27/09/07 end
if (errCode != null && errCode.trim().length() > 0) /*if (errCode != null && errCode.trim().length() > 0) //comment added by sagar on 25/12/14
{ {
resultString = getErrorString("", errCode, userId); resultString = getErrorString("", errCode, userId);
}*/
//code added by sagar on 25/12/14 Start....
System.out.println(">>>>>>>>Return errorMap in GenValidate:"+errorMap);
if(!errorMap.isEmpty())
{
System.out.println(">>>>>>>>Return Non empty errorMap in GenValidate:"+errorMap.size());
Iterator iterator = errorMap.entrySet().iterator();
while (iterator.hasNext())
{
Map.Entry mapEntry = (Map.Entry) iterator.next();
errFldName= (String) mapEntry.getKey();
errCode= (String) mapEntry.getValue();
System.out.println(">>>>>>>>errFldName:"+errFldName);
System.out.println(">>>>>>>>errCode:"+errCode);
errString = getErrorString(errFldName, errCode, userId);
//errorType = errorType(conn, errCode);
if (errString.length() > 0)
{
String bifurErrString = errString.substring(errString.indexOf("<Errors>") + 8, errString.indexOf("<trace>"));
bifurErrString = bifurErrString + errString.substring(errString.indexOf("</trace>") + 8, errString.indexOf("</Errors>"));
errStringXml.append(bifurErrString);
errString = "";
} }
} }
errStringXml.append("</Errors> </Root> \r\n");
}
else
{
errStringXml = new StringBuffer("");
}
//code added by sagar on 25/12/14 end.
}//end try
catch (RemoteException e1) { catch (RemoteException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
...@@ -119,7 +158,9 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen ...@@ -119,7 +158,9 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
}*/ }*/
return resultString; //return resultString;//comment added by sagar on 25/12/14
errString = errStringXml.toString(); //code added by sagar on 25/12/14
return errString;
} }
private String mergeXml(String xmlString, String xmlString1, String xmlString2) private String mergeXml(String xmlString, String xmlString1, String xmlString2)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment