midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2337: Adding support for ctx variable in querydata

This commit is contained in:
Deepak Pansheriya 2015-05-20 22:07:36 +05:30
parent 39f6c0b5b4
commit 025c160db3
2 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java
View File

@ -170,6 +170,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
public StandardResponseDocument setDocAction(ModelSetDocActionRequestDocument req) { public StandardResponseDocument setDocAction(ModelSetDocActionRequestDocument req) {
boolean connected = getCompiereService().isConnected(); boolean connected = getCompiereService().isConnected();
boolean manageTrx = this.manageTrx;
Trx trx=null;
try { try {
if (!connected) if (!connected)
getCompiereService().connect(); getCompiereService().connect();
@ -211,7 +213,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
manageTrx = true; manageTrx = true;
} }
Trx trx = Trx.get(trxName, true); trx = Trx.get(trxName, true);
Map<String, Object> requestCtx = getRequestCtx(); Map<String, Object> requestCtx = getRequestCtx();
@ -298,6 +300,9 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
return ret; return ret;
} finally { } finally {
if (manageTrx && trx != null)
trx.close();
if (!connected) if (!connected)
getCompiereService().disconnect(); getCompiereService().disconnect();
} }
@ -1413,6 +1418,8 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
public WindowTabDataDocument queryData(ModelCRUDRequestDocument req) { public WindowTabDataDocument queryData(ModelCRUDRequestDocument req) {
boolean connected = getCompiereService().isConnected(); boolean connected = getCompiereService().isConnected();
boolean manageTrx = this.manageTrx;
Trx trx=null;
try { try {
if (!connected) if (!connected)
getCompiereService().connect(); getCompiereService().connect();
@ -1432,10 +1439,10 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
// Validate parameters vs service type // Validate parameters vs service type
validateCRUD(modelCRUD); validateCRUD(modelCRUD);
Properties ctx = m_cs.getCtx(); Properties ctx = m_cs.getCtx();
String tableName = modelCRUD.getTableName(); String tableName = modelCRUD.getTableName();
Map<String, Object> reqCtx = getRequestCtx();
MWebServiceType m_webservicetype = getWebServiceType(); MWebServiceType m_webservicetype = getWebServiceType();
// get the PO for the tablename and record ID // get the PO for the tablename and record ID
MTable table = MTable.get(ctx, tableName); MTable table = MTable.get(ctx, tableName);
@ -1447,12 +1454,42 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
int roleid = reqlogin.getRoleID(); int roleid = reqlogin.getRoleID();
MRole role = new MRole(ctx, roleid, null); MRole role = new MRole(ctx, roleid, null);
String sqlquery = "SELECT * FROM " + tableName; // start a trx
sqlquery = role.addAccessSQL(sqlquery, tableName, true, true); String trxName = localTrxName;
if (trxName == null) {
trxName = Trx.createTrxName("ws_modelQueryData");
manageTrx = true;
}
trx = Trx.get(trxName, true);
StringBuilder sqlBuilder = new StringBuilder(role.addAccessSQL("SELECT * FROM " + tableName, tableName, true, true));
ArrayList<Object> sqlParaList = new ArrayList<Object>();
PO holderPo = table.getPO(0, trxName);
POInfo poinfo = POInfo.getPOInfo(ctx, table.getAD_Table_ID());
if (modelCRUD.getDataRow() != null) if (modelCRUD.getDataRow() != null)
{ {
DataRow dr = modelCRUD.getDataRow();
DataField fields[] = dr.getFieldArray();
StandardResponseDocument stdRet = StandardResponseDocument.Factory.newInstance();
StandardResponse stdResp = stdRet.addNewStandardResponse();
StandardResponseDocument retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_BEFORE_PARSE, holderPo, fields, trx,
reqCtx, stdResp, stdRet);
if (retResp != null){
throw new IdempiereServiceFault(retResp.getStandardResponse().getError(), new QName("queryData"));
}
retResp = scanFields(fields, m_webservicetype, holderPo, poinfo, trx, stdResp, stdRet);
if (retResp != null){
throw new IdempiereServiceFault(retResp.getStandardResponse().getError(), new QName("queryData"));
}
for (DataField field : modelCRUD.getDataRow().getFieldArray()) { for (DataField field : modelCRUD.getDataRow().getFieldArray()) {
if (m_webservicetype.isInputColumnNameAllowed(field.getColumn())) { if (m_webservicetype.isInputColumnNameAllowed(field.getColumn())) {
@ -1461,11 +1498,14 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
I_AD_Column col = inputField.getAD_Column(); I_AD_Column col = inputField.getAD_Column();
String sqlType = DisplayType.getSQLDataType(col.getAD_Reference_ID(), col.getColumnName(), col.getFieldLength()); String sqlType = DisplayType.getSQLDataType(col.getAD_Reference_ID(), col.getColumnName(), col.getFieldLength());
if(sqlType.contains("CHAR")) if(sqlType.contains("CHAR"))
sqlquery += " AND " + field.getColumn() + " LIKE ?"; sqlBuilder.append(" AND ").append(field.getColumn()).append(" LIKE ?");
else else
sqlquery += " AND " + field.getColumn() + "=?"; sqlBuilder.append(" AND ").append(field.getColumn()).append("=?");
sqlParaList.add(holderPo.get_Value(field.getColumn()));
// End Jan Thielemann Solution for query using the sentence like // End Jan Thielemann Solution for query using the sentence like
} else { }else if(m_webservicetype.getFieldInput(field.getColumn())==null){
//If not even ctx variable column
throw new IdempiereServiceFault("Web service type " throw new IdempiereServiceFault("Web service type "
+ m_webservicetype.getValue() + ": input column " + m_webservicetype.getValue() + ": input column "
+ field.getColumn() + " not allowed", new QName("queryData")); + field.getColumn() + " not allowed", new QName("queryData"));
@ -1473,10 +1513,11 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
} }
} }
if (modelCRUD.getFilter() != null && modelCRUD.getFilter().length() > 0) if (modelCRUD.getFilter() != null && modelCRUD.getFilter().length() > 0){
sqlquery += " AND " + modelCRUD.getFilter(); String sql = parseSQL(" WHERE " + modelCRUD.getFilter(), sqlParaList, holderPo, poinfo, reqCtx);
sqlBuilder.append(" AND ").append(sql.substring(6));
}
POInfo poinfo = POInfo.getPOInfo(ctx, table.getAD_Table_ID());
int cnt = 0; int cnt = 0;
int rowCnt = 0; int rowCnt = 0;
int offset = modelCRUD.getOffset(); int offset = modelCRUD.getOffset();
@ -1486,58 +1527,10 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
ResultSet rsquery = null; ResultSet rsquery = null;
try try
{ {
pstmtquery = DB.prepareStatement (sqlquery, localTrxName); pstmtquery = DB.prepareStatement (sqlBuilder.toString(), trxName);
int p = 1; DB.setParameters(pstmtquery, sqlParaList);
if (modelCRUD.getDataRow() != null)
{ rsquery = pstmtquery.executeQuery();
for (DataField field : modelCRUD.getDataRow().getFieldArray()) {
int idx = poinfo.getColumnIndex(field.getColumn());
Class<?> c = poinfo.getColumnClass(idx);
if (c == Integer.class)
{
int value = 0;
if (Util.isEmpty(field.getVal()) && !Util.isEmpty(field.getLval()))
{
Lookup lookup = null;
int idxcol = poinfo.getColumnIndex(field.getColumn());
X_WS_WebServiceFieldInput fieldInput = m_webservicetype.getFieldInput(field.getColumn());
if(fieldInput.getAD_Reference_ID() > 0 && fieldInput.getAD_Reference_Value_ID()>0)
{
try{
lookup = MLookupFactory.get(m_cs.getCtx(),0,poinfo.getAD_Column_ID(poinfo.getColumnName(idxcol)),fieldInput.getAD_Reference_ID(),Env.getLanguage(m_cs.getCtx()),poinfo.getColumnName(idxcol),fieldInput.getAD_Reference_Value_ID(),false,null);
}catch (Exception e) {
throw new IdempiereServiceFault("Exception in resolving overridden lookup ", new QName(
"LookupResolutionFailed"));
}
}
else
{
lookup = poinfo.getColumnLookup(idxcol);
}
if (lookup == null) {
throw new IdempiereServiceFault(field.getColumn() + " is not lookup column. Pass Value in val element ", new QName(
"LookupResolutionFailed"));
}
String sql = ADLookup.getDirectAccessSQL(lookup, field.getLval().toUpperCase());
int id = DB.getSQLValue(localTrxName, sql);
if (id > 0)
value = id;
}
else
{
value = Integer.valueOf(field.getVal());
}
pstmtquery.setInt(p++, value);
}
else if (c == Timestamp.class)
pstmtquery.setTimestamp(p++, Timestamp.valueOf(field.getVal()));
else if (c == Boolean.class || c == String.class)
pstmtquery.setString(p++, field.getVal());
}
}
rsquery = pstmtquery.executeQuery ();
// Angelo Dabala' (genied) must create just one DataSet, moved outside of the while loop // Angelo Dabala' (genied) must create just one DataSet, moved outside of the while loop
DataSet ds = resp.addNewDataSet(); DataSet ds = resp.addNewDataSet();
while (rsquery.next ()) { while (rsquery.next ()) {
@ -1559,6 +1552,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
catch (Exception e) catch (Exception e)
{ {
log.log(Level.SEVERE, e.getLocalizedMessage(), e); log.log(Level.SEVERE, e.getLocalizedMessage(), e);
throw new IdempiereServiceFault(e);
} }
finally finally
{ {
@ -1574,6 +1568,9 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
return ret; return ret;
} finally { } finally {
if (manageTrx && trx != null)
trx.close();
if (!connected) if (!connected)
getCompiereService().disconnect(); getCompiereService().disconnect();
} }

1
org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
View File

@ -402,6 +402,7 @@ public class AbstractService {
firstInd = sql.indexOf('@'); firstInd = sql.indexOf('@');
} }
sqlBuilder.append(sql);
} }