from MetaDataTable import ConvertToSqlString\r
from CommonDataClass.DataClass import MODEL_FILE_DSC, MODEL_FILE_DEC, MODEL_FILE_INF, \\r
MODEL_FILE_OTHERS\r
+from Common.DataType import *\r
\r
class MetaFileTable(Table):\r
# TRICK: use file ID as the part before '.'\r
Value3 TEXT,\r
Scope1 TEXT,\r
Scope2 TEXT,\r
+ Scope3 TEXT,\r
BelongsToItem REAL NOT NULL,\r
FromItem REAL NOT NULL,\r
StartLine INTEGER NOT NULL,\r
Enabled INTEGER DEFAULT 0\r
'''\r
# used as table end flag, in case the changes to database is not committed to db file\r
- _DUMMY_ = "-1, -1, '====', '====', '====', '====', '====', -1, -1, -1, -1, -1, -1, -1"\r
+ _DUMMY_ = "-1, -1, '====', '====', '====', '====', '====','====', -1, -1, -1, -1, -1, -1, -1"\r
\r
## Constructor\r
def __init__(self, Cursor, MetaFile, Temporary):\r
# @param EndColumn: EndColumn of a Dsc item\r
# @param Enabled: If this item enabled\r
#\r
- def Insert(self, Model, Value1, Value2, Value3, Scope1='COMMON', Scope2='COMMON', BelongsToItem=-1, \r
+ def Insert(self, Model, Value1, Value2, Value3, Scope1='COMMON', Scope2='COMMON', Scope3=TAB_DEFAULT_STORES_DEFAULT,BelongsToItem=-1,\r
FromItem=-1, StartLine=-1, StartColumn=-1, EndLine=-1, EndColumn=-1, Enabled=1):\r
- (Value1, Value2, Value3, Scope1, Scope2) = ConvertToSqlString((Value1, Value2, Value3, Scope1, Scope2))\r
+ (Value1, Value2, Value3, Scope1, Scope2,Scope3) = ConvertToSqlString((Value1, Value2, Value3, Scope1, Scope2,Scope3))\r
return Table.Insert(\r
self, \r
Model, \r
Value3, \r
Scope1, \r
Scope2,\r
+ Scope3,\r
BelongsToItem, \r
FromItem,\r
StartLine, \r
#\r
def Query(self, Model, Scope1=None, Scope2=None, BelongsToItem=None, FromItem=None):\r
ConditionString = "Model=%s AND Enabled>0" % Model\r
- ValueString = "Value1,Value2,Value3,Scope1,Scope2,ID,StartLine"\r
+ ValueString = "Value1,Value2,Value3,Scope1,Scope2,Scope3,ID,StartLine"\r
\r
if Scope1 != None and Scope1 != 'COMMON':\r
ConditionString += " AND (Scope1='%s' OR Scope1='COMMON')" % Scope1\r
if Scope2 != None and Scope2 != 'COMMON':\r
- ConditionString += " AND (Scope2='%s' OR Scope2='COMMON' OR Scope2='DEFAULT')" % Scope2\r
+ # Cover the case that CodeBase is 'COMMON' for BuildOptions section\r
+ if '.' in Scope2:\r
+ Index = Scope2.index('.')\r
+ NewScope = 'COMMON'+ Scope2[Index:]\r
+ ConditionString += " AND (Scope2='%s' OR Scope2='COMMON' OR Scope2='DEFAULT' OR Scope2='%s')" % (Scope2, NewScope)\r
+ else:\r
+ ConditionString += " AND (Scope2='%s' OR Scope2='COMMON' OR Scope2='DEFAULT')" % Scope2\r
\r
if BelongsToItem != None:\r
ConditionString += " AND BelongsToItem=%s" % BelongsToItem\r