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

BF [ 1739530 ] getLookup_TableDirEmbed error when BaseColumn is sql query 

http://sourceforge.net/tracker/index.php?func=detail&aid=1739530&group_id=176962&atid=879332

* minor cleanup: commented unused variables
* fixed broken javadoc
This commit is contained in:
teo_sarca 2007-06-19 07:51:10 +00:00
parent 4523ee6583
commit 52d9e4dc1a
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
base/src/org/compiere/model/MLookupFactory.java
View File

@ -27,7 +27,7 @@ import org.compiere.util.*;
* @author Jorg Janke * @author Jorg Janke
* @version $Id: MLookupFactory.java,v 1.3 2006/07/30 00:58:04 jjanke Exp $ * @version $Id: MLookupFactory.java,v 1.3 2006/07/30 00:58:04 jjanke Exp $
* *
* @author Teo Sarca - BF [ 1734394 ], BF [ 1714261 ], BF [ 1672820 ] * @author Teo Sarca - BF [ 1734394 ], BF [ 1714261 ], BF [ 1672820 ], BF [ 1739530 ]
*/ */
public class MLookupFactory public class MLookupFactory
{ {
@ -282,11 +282,11 @@ public class MLookupFactory
} // getLookup_List } // getLookup_List
/** /**
* Get Lookup SQL for List * Get Lookup SQL for List
* @param language report Language * @param language report Language
* @param AD_Reference_Value_ID reference value * @param AD_Reference_Value_ID reference value
* @param linkColumnName link column name * @param linkColumnName link column name
* @return SELECT Name FROM AD_Ref_List WHERE AD_Reference_ID=x AND Value=linkColumn * @return SELECT Name FROM AD_Ref_List WHERE AD_Reference_ID=x AND Value=linkColumn
*/ */
static public String getLookup_ListEmbed(Language language, static public String getLookup_ListEmbed(Language language,
int AD_Reference_Value_ID, String linkColumnName) int AD_Reference_Value_ID, String linkColumnName)
@ -340,10 +340,10 @@ public class MLookupFactory
// //
String KeyColumn = null, DisplayColumn = null, TableName = null, WhereClause = null, OrderByClause = null; String KeyColumn = null, DisplayColumn = null, TableName = null, WhereClause = null, OrderByClause = null;
boolean IsTranslated = false, isValueDisplayed = false; boolean IsTranslated = false, isValueDisplayed = false;
boolean isSOTrx = !"N".equals(Env.getContext(ctx, WindowNo, "IsSOTrx")); //boolean isSOTrx = !"N".equals(Env.getContext(ctx, WindowNo, "IsSOTrx"));
int ZoomWindow = 0; int ZoomWindow = 0;
int ZoomWindowPO = 0; int ZoomWindowPO = 0;
int AD_Table_ID = 0; //int AD_Table_ID = 0;
boolean loaded = false; boolean loaded = false;
try try
@ -362,7 +362,7 @@ public class MLookupFactory
OrderByClause = rs.getString(7); OrderByClause = rs.getString(7);
ZoomWindow = rs.getInt(8); ZoomWindow = rs.getInt(8);
ZoomWindowPO = rs.getInt(9); ZoomWindowPO = rs.getInt(9);
AD_Table_ID = rs.getInt(10); //AD_Table_ID = rs.getInt(10);
loaded = true; loaded = true;
} }
rs.close(); rs.close();
@ -539,12 +539,12 @@ public class MLookupFactory
/************************************************************************** /**************************************************************************
* Get Lookup SQL for direct Table Lookup * Get Lookup SQL for direct Table Lookup
* @param ctx context for access * @param ctx context for access
* @param language report language * @param language report language
* @param ColumnName column name * @param ColumnName column name
* @param WindowNo Window (for SOTrx) * @param WindowNo Window (for SOTrx)
* @return SELECT Key, NULL, Name, IsActive from Table (fully qualified) * @return SELECT Key, NULL, Name, IsActive from Table (fully qualified)
*/ */
static private MLookupInfo getLookup_TableDir (Properties ctx, Language language, static private MLookupInfo getLookup_TableDir (Properties ctx, Language language,
int WindowNo, String ColumnName) int WindowNo, String ColumnName)
@ -561,7 +561,7 @@ public class MLookupFactory
String TableName = ColumnName.substring(0,ColumnName.length()-3); String TableName = ColumnName.substring(0,ColumnName.length()-3);
String KeyColumn = ColumnName; String KeyColumn = ColumnName;
boolean isSOTrx = !"N".equals(Env.getContext(ctx, WindowNo, "IsSOTrx")); //boolean isSOTrx = !"N".equals(Env.getContext(ctx, WindowNo, "IsSOTrx"));
int ZoomWindow = 0; int ZoomWindow = 0;
int ZoomWindowPO = 0; int ZoomWindowPO = 0;
@ -804,7 +804,14 @@ public class MLookupFactory
.append(" AND ").append(TableName).append("_Trl.AD_Language=") .append(" AND ").append(TableName).append("_Trl.AD_Language=")
.append(DB.TO_STRING(language.getAD_Language())).append(")"); .append(DB.TO_STRING(language.getAD_Language())).append(")");
} }
embedSQL.append(" WHERE ").append(BaseTable).append(".").append(BaseColumn); embedSQL.append(" WHERE ");
// If is not virtual column - teo_sarca [ 1739530 ]
if (! BaseColumn.trim().startsWith("(")) {
embedSQL.append(BaseTable).append(".").append(BaseColumn);
}
else {
embedSQL.append(BaseColumn);
}
embedSQL.append("=").append(TableName).append(".").append(ColumnName); embedSQL.append("=").append(TableName).append(".").append(ColumnName);
// //
return embedSQL.toString(); return embedSQL.toString();