Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

  1. Support use expression as DSC file PCD value.
  2. Update FDF parser to fix bug to get complete macro value.
  3. Fix bug to replace SET statement macro and evaluate SET statement PCD value in FDF file.
  4. Fix a bug for MACRO defined in conditional block cannot be processed correctly

Signed-off-by: lgao4
Reviewed-by: gikidy


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12827 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 125 insertions, 50 deletions

diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py
index 6f5f9fd0b5..73d7318de0 100644
--- a/BaseTools/Source/Python/Ecc/Check.py
+++ b/BaseTools/Source/Python/Ecc/Check.py
@@ -15,6 +15,7 @@ import re
 from CommonDataClass.DataClass import *

 from Common.DataType import SUP_MODULE_LIST_STRING, TAB_VALUE_SPLIT

 from EccToolError import *

+from MetaDataParser import ParseHeaderCommentSection

 import EccGlobalData

 import c

 

@@ -48,7 +49,7 @@ class Check(object):
         if EccGlobalData.gConfig.GeneralCheckNonAcsii == '1' or EccGlobalData.gConfig.GeneralCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking Non-ACSII char in file ...")

             SqlCommand = """select ID, FullPath, ExtName from File"""

-            RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)

+            RecordSet = EccGlobalData.gDb.TblFile.Exec(SqlCommand)

             for Record in RecordSet:

                 if Record[2].upper() not in EccGlobalData.gConfig.BinaryExtList:

                     op = open(Record[1]).readlines()

@@ -415,13 +416,81 @@ class Check(object):
                     elif Ext in ('.inf', '.dec', '.dsc', '.fdf'):

                         FullName = os.path.join(Dirpath, F)

                         op = open(FullName).readlines()

-                        if not op[0].startswith('## @file') and op[6].startswith('## @file') and op[7].startswith('## @file'):

+                        FileLinesList = op

+                        LineNo             = 0

+                        CurrentSection     = MODEL_UNKNOWN 

+                        HeaderSectionLines       = []

+                        HeaderCommentStart = False 

+                        HeaderCommentEnd   = False

+                        

+                        for Line in FileLinesList:

+                            LineNo   = LineNo + 1

+                            Line     = Line.strip()

+                            if (LineNo < len(FileLinesList) - 1):

+                                NextLine = FileLinesList[LineNo].strip()

+            

+                            #

+                            # blank line

+                            #

+                            if (Line == '' or not Line) and LineNo == len(FileLinesList):

+                                LastSectionFalg = True

+

+                            #

+                            # check whether file header comment section started

+                            #

+                            if Line.startswith('#') and \

+                                (Line.find('@file') > -1) and \

+                                not HeaderCommentStart:

+                                if CurrentSection != MODEL_UNKNOWN:

+                                    SqlStatement = """ select ID from File where FullPath like '%s'""" % FullName

+                                    ResultSet = EccGlobalData.gDb.TblFile.Exec(SqlStatement)

+                                    for Result in ResultSet:

+                                        Msg = 'INF/DEC/DSC/FDF file header comment should begin with ""## @file"" or ""# @file""at the very top file'

+                                        EccGlobalData.gDb.TblReport.Insert(ERROR_DOXYGEN_CHECK_FILE_HEADER, Msg, "File", Result[0])

+

+                                else:

+                                    CurrentSection = MODEL_IDENTIFIER_FILE_HEADER

+                                    #

+                                    # Append the first line to section lines.

+                                    #

+                                    HeaderSectionLines.append((Line, LineNo))

+                                    HeaderCommentStart = True

+                                    continue        

+            

+                            #

+                            # Collect Header content.

+                            #

+                            if (Line.startswith('#') and CurrentSection == MODEL_IDENTIFIER_FILE_HEADER) and\

+                                HeaderCommentStart and not Line.startswith('##') and not\

+                                HeaderCommentEnd and NextLine != '':

+                                HeaderSectionLines.append((Line, LineNo))

+                                continue

+                            #

+                            # Header content end

+                            #

+                            if (Line.startswith('##') or not Line.strip().startswith("#")) and HeaderCommentStart \

+                                and not HeaderCommentEnd:

+                                if Line.startswith('##'):

+                                    HeaderCommentEnd = True

+                                HeaderSectionLines.append((Line, LineNo))

+                                ParseHeaderCommentSection(HeaderSectionLines, FullName)

+                                break

+                        if HeaderCommentStart == False:

                             SqlStatement = """ select ID from File where FullPath like '%s'""" % FullName

                             ResultSet = EccGlobalData.gDb.TblFile.Exec(SqlStatement)

                             for Result in ResultSet:

-                                Msg = 'INF/DEC/DSC/FDF file header comment should begin with ""## @file""'

+                                Msg = 'INF/DEC/DSC/FDF file header comment should begin with ""## @file"" or ""# @file"" at the very top file'

                                 EccGlobalData.gDb.TblReport.Insert(ERROR_DOXYGEN_CHECK_FILE_HEADER, Msg, "File", Result[0])

+                        if HeaderCommentEnd == False:

+                            SqlStatement = """ select ID from File where FullPath like '%s'""" % FullName

+                            ResultSet = EccGlobalData.gDb.TblFile.Exec(SqlStatement)

+                            for Result in ResultSet:

+                                Msg = 'INF/DEC/DSC/FDF file header comment should end with ""##"" at the end of file header comment block'

+                                # Check whether File header Comment End with '##'

+                                if EccGlobalData.gConfig.HeaderCheckFileCommentEnd == '1' or EccGlobalData.gConfig.HeaderCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

+                                    EccGlobalData.gDb.TblReport.Insert(ERROR_DOXYGEN_CHECK_FILE_HEADER, Msg, "File", Result[0])

 

+                                     

 

     # Check whether the function headers are followed Doxygen special documentation blocks in section 2.3.5

     def DoxygenCheckFunctionHeader(self):

@@ -504,9 +573,9 @@ class Check(object):
     def MetaDataFileCheckLibraryInstance(self):

         if EccGlobalData.gConfig.MetaDataFileCheckLibraryInstance == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking for library instance type issue ...")

-            SqlCommand = """select A.ID, A.Value2, B.Value2 from Inf as A left join Inf as B

-                            where A.Value1 = 'LIBRARY_CLASS' and A.Model = %s

-                            and B.Value1 = 'MODULE_TYPE' and B.Model = %s and A.BelongsToFile = B.BelongsToFile

+            SqlCommand = """select A.ID, A.Value3, B.Value3 from Inf as A left join Inf as B

+                            where A.Value2 = 'LIBRARY_CLASS' and A.Model = %s

+                            and B.Value2 = 'MODULE_TYPE' and B.Model = %s and A.BelongsToFile = B.BelongsToFile

                             group by A.BelongsToFile""" % (MODEL_META_DATA_HEADER, MODEL_META_DATA_HEADER)

             RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)

             LibraryClasses = {}

@@ -528,8 +597,8 @@ class Check(object):
                 if Record[2] != 'BASE' and Record[2] not in SupModType:

                     EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_LIBRARY_INSTANCE_2, OtherMsg="The Library Class '%s' does not specify its supported module types" % (List[0]), BelongsToTable='Inf', BelongsToItem=Record[0])

 

-            SqlCommand = """select A.ID, A.Value1, B.Value2 from Inf as A left join Inf as B

-                            where A.Model = %s and B.Value1 = '%s' and B.Model = %s

+            SqlCommand = """select A.ID, A.Value1, B.Value3 from Inf as A left join Inf as B

+                            where A.Model = %s and B.Value2 = '%s' and B.Model = %s

                             and B.BelongsToFile = A.BelongsToFile""" \

                             % (MODEL_EFI_LIBRARY_CLASS, 'MODULE_TYPE', MODEL_META_DATA_HEADER)

             RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)

@@ -558,11 +627,13 @@ class Check(object):
             SqlCommand = """select ID, Value1, Value2 from Dsc where Model = %s""" % MODEL_EFI_LIBRARY_CLASS

             LibraryClasses = EccGlobalData.gDb.TblDsc.Exec(SqlCommand)

             for LibraryClass in LibraryClasses:

-                if LibraryClass[1].upper() != 'NULL':

+                if LibraryClass[1].upper() == 'NULL' or LibraryClass[1].startswith('!ifdef') or LibraryClass[1].startswith('!ifndef') or LibraryClass[1].endswith('!endif'):

+                    continue

+                else:

                     LibraryIns = os.path.normpath(os.path.join(EccGlobalData.gWorkspace, LibraryClass[2]))

-                    SqlCommand = """select Value2 from Inf where BelongsToFile =

+                    SqlCommand = """select Value3 from Inf where BelongsToFile =

                                     (select ID from File where lower(FullPath) = lower('%s'))

-                                    and Value1 = '%s'""" % (LibraryIns, 'LIBRARY_CLASS')

+                                    and Value2 = '%s'""" % (LibraryIns, 'LIBRARY_CLASS')

                     RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)

                     IsFound = False

                     for Record in RecordSet:

@@ -591,8 +662,8 @@ class Check(object):
                     EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_LIBRARY_NO_USE, OtherMsg="The Library Class [%s] is not used in any platform" % (Record[1]), BelongsToTable='Inf', BelongsToItem=Record[0])

             SqlCommand = """

                          select A.ID, A.Value1, A.BelongsToFile, A.StartLine, B.StartLine from Dsc as A left join Dsc as B

-                         where A.Model = %s and B.Model = %s and A.Value3 = B.Value3 and A.Arch = B.Arch and A.ID <> B.ID

-                         and A.Value1 = B.Value1 and A.StartLine <> B.StartLine and B.BelongsToFile = A.BelongsToFile""" \

+                         where A.Model = %s and B.Model = %s and A.Scope1 = B.Scope1 and A.Scope2 = B.Scope2 and A.ID <> B.ID

+                         and A.Value1 = B.Value1 and A.Value2 <> B.Value2 and A.BelongsToItem = -1 and B.BelongsToItem = -1 and A.StartLine <> B.StartLine and B.BelongsToFile = A.BelongsToFile""" \

                             % (MODEL_EFI_LIBRARY_CLASS, MODEL_EFI_LIBRARY_CLASS)

             RecordSet = EccGlobalData.gDb.TblDsc.Exec(SqlCommand)

             for Record in RecordSet:

@@ -631,9 +702,10 @@ class Check(object):
         if EccGlobalData.gConfig.MetaDataFileCheckPcdDuplicate == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking for duplicate PCDs defined in both DSC and FDF files ...")

             SqlCommand = """

-                         select A.ID, A.Value2, A.BelongsToFile, B.ID, B.Value2, B.BelongsToFile from Dsc as A, Fdf as B

+                         select A.ID, A.Value1, A.Value2, A.BelongsToFile, B.ID, B.Value1, B.Value2, B.BelongsToFile from Dsc as A, Fdf as B

                          where A.Model >= %s and A.Model < %s

                          and B.Model >= %s and B.Model < %s

+                         and A.Value1 = B.Value1

                          and A.Value2 = B.Value2

                          and A.Enabled > -1

                          and B.Enabled > -1

@@ -641,71 +713,74 @@ class Check(object):
                          """ % (MODEL_PCD, MODEL_META_DATA_HEADER, MODEL_PCD, MODEL_META_DATA_HEADER)

             RecordSet = EccGlobalData.gDb.TblDsc.Exec(SqlCommand)

             for Record in RecordSet:

-                SqlCommand1 = """select Name from File where ID = %s""" % Record[2]

-                SqlCommand2 = """select Name from File where ID = %s""" % Record[5]

+                SqlCommand1 = """select Name from File where ID = %s""" % Record[3]

+                SqlCommand2 = """select Name from File where ID = %s""" % Record[7]

                 DscFileName = os.path.splitext(EccGlobalData.gDb.TblDsc.Exec(SqlCommand1)[0][0])[0]

                 FdfFileName = os.path.splitext(EccGlobalData.gDb.TblDsc.Exec(SqlCommand2)[0][0])[0]

                 if DscFileName != FdfFileName:

                     continue

-                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, Record[1]):

-                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg="The PCD [%s] is defined in both FDF file and DSC file" % (Record[1]), BelongsToTable='Dsc', BelongsToItem=Record[0])

-                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, Record[3]):

-                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg="The PCD [%s] is defined in both FDF file and DSC file" % (Record[4]), BelongsToTable='Fdf', BelongsToItem=Record[3])

+                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, Record[1] + '.' + Record[2]):

+                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg="The PCD [%s] is defined in both FDF file and DSC file" % (Record[1] + '.' + Record[2]), BelongsToTable='Dsc', BelongsToItem=Record[0])

+                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, Record[5] + '.' + Record[6]):

+                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg="The PCD [%s] is defined in both FDF file and DSC file" % (Record[5] + '.' + Record[6]), BelongsToTable='Fdf', BelongsToItem=Record[4])

 

             EdkLogger.quiet("Checking for duplicate PCDs defined in DEC files ...")

             SqlCommand = """

-                         select A.ID, A.Value2 from Dec as A, Dec as B

+                         select A.ID, A.Value1, A.Value2, A.Model, B.Model from Dec as A left join Dec as B

                          where A.Model >= %s and A.Model < %s

                          and B.Model >= %s and B.Model < %s

+                         and A.Value1 = B.Value1

                          and A.Value2 = B.Value2

-                         and ((A.Arch = B.Arch) and (A.Arch != 'COMMON' or B.Arch != 'COMMON'))

-                         and A.ID != B.ID

+                         and A.Scope1 = B.Scope1

+                         and A.ID <> B.ID

+                         and A.Model = B.Model

                          and A.Enabled > -1

                          and B.Enabled > -1

                          and A.BelongsToFile = B.BelongsToFile

                          group by A.ID

                          """ % (MODEL_PCD, MODEL_META_DATA_HEADER, MODEL_PCD, MODEL_META_DATA_HEADER)

-            RecordSet = EccGlobalData.gDb.TblDsc.Exec(SqlCommand)

+            RecordSet = EccGlobalData.gDb.TblDec.Exec(SqlCommand)

             for Record in RecordSet:

-                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, Record[1]):

-                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg="The PCD [%s] is defined duplicated in DEC file" % (Record[1]), BelongsToTable='Dec', BelongsToItem=Record[0])

+                RecordCat = Record[1] + '.' + Record[2]

+                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, RecordCat):

+                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg="The PCD [%s] is defined duplicated in DEC file" % RecordCat, BelongsToTable='Dec', BelongsToItem=Record[0])

 

     # Check whether PCD settings in the FDF file can only be related to flash.

     def MetaDataFileCheckPcdFlash(self):

         if EccGlobalData.gConfig.MetaDataFileCheckPcdFlash == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking only Flash related PCDs are used in FDF ...")

             SqlCommand = """

-                         select ID, Value2, BelongsToFile from Fdf as A

+                         select ID, Value1, Value2, BelongsToFile from Fdf as A

                          where A.Model >= %s and Model < %s

                          and A.Enabled > -1

                          and A.Value2 not like '%%Flash%%'

                          """ % (MODEL_PCD, MODEL_META_DATA_HEADER)

             RecordSet = EccGlobalData.gDb.TblFdf.Exec(SqlCommand)

             for Record in RecordSet:

-                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_FLASH, Record[1]):

-                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_FLASH, OtherMsg="The PCD [%s] defined in FDF file is not related to Flash" % (Record[1]), BelongsToTable='Fdf', BelongsToItem=Record[0])

+                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_FLASH, Record[1] + '.' + Record[2]):

+                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_FLASH, OtherMsg="The PCD [%s] defined in FDF file is not related to Flash" % (Record[1] + '.' + Record[2]), BelongsToTable='Fdf', BelongsToItem=Record[0])

 

     # Check whether PCDs used in Inf files but not specified in Dsc or FDF files

     def MetaDataFileCheckPcdNoUse(self):

         if EccGlobalData.gConfig.MetaDataFileCheckPcdNoUse == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking for non-specified PCDs ...")

             SqlCommand = """

-                         select ID, Value2, BelongsToFile from Inf as A

+                         select ID, Value1, Value2, BelongsToFile from Inf as A

                          where A.Model >= %s and Model < %s

                          and A.Enabled > -1

-                         and A.Value2 not in

-                             (select Value2 from Dsc as B

+                         and (A.Value1, A.Value2) not in

+                             (select Value1, Value2 from Dsc as B

                               where B.Model >= %s and B.Model < %s

                               and B.Enabled > -1)

-                         and A.Value2 not in

-                             (select Value2 from Fdf as C

+                         and (A.Value1, A.Value2) not in

+                             (select Value1, Value2 from Fdf as C

                               where C.Model >= %s and C.Model < %s

                               and C.Enabled > -1)

                          """ % (MODEL_PCD, MODEL_META_DATA_HEADER, MODEL_PCD, MODEL_META_DATA_HEADER, MODEL_PCD, MODEL_META_DATA_HEADER)

             RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)

             for Record in RecordSet:

-                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_NO_USE, Record[1]):

-                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_NO_USE, OtherMsg="The PCD [%s] defined in INF file is not specified in either DSC or FDF files" % (Record[1]), BelongsToTable='Inf', BelongsToItem=Record[0])

+                if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_PCD_NO_USE, Record[1] + '.' + Record[2]):

+                    EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_NO_USE, OtherMsg="The PCD [%s] defined in INF file is not specified in either DSC or FDF files" % (Record[1] + '.' + Record[2]), BelongsToTable='Inf', BelongsToItem=Record[0])

 

     # Check whether having duplicate guids defined for Guid/Protocol/Ppi

     def MetaDataFileCheckGuidDuplicate(self):

@@ -729,7 +804,7 @@ class Check(object):
         if EccGlobalData.gConfig.MetaDataFileCheckModuleFileNoUse == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking for no used module files ...")

             SqlCommand = """

-                         select upper(Path) from File where ID in (select BelongsToFile from INF where BelongsToFile != -1)

+                         select upper(Path) from File where ID in (select BelongsToFile from Inf where BelongsToFile != -1)

                          """

             InfPathSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)

             InfPathList = []

@@ -756,15 +831,15 @@ class Check(object):
         if EccGlobalData.gConfig.MetaDataFileCheckPcdType == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':

             EdkLogger.quiet("Checking for pcd type in c code function usage ...")

             SqlCommand = """

-                         select ID, Model, Value1, BelongsToFile from INF where Model > %s and Model < %s

+                         select ID, Model, Value1, Value2, BelongsToFile from INF where Model > %s and Model < %s

                          """ % (MODEL_PCD, MODEL_META_DATA_HEADER)

             PcdSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)

             for Pcd in PcdSet:

                 Model = Pcd[1]

                 PcdName = Pcd[2]

-                if len(Pcd[2].split(".")) > 1:

-                    PcdName = Pcd[2].split(".")[1]

-                BelongsToFile = Pcd[3]

+                if Pcd[3]:

+                    PcdName = Pcd[3]

+                BelongsToFile = Pcd[4]

                 SqlCommand = """

                              select ID from File where FullPath in

                             (select B.Path || '\\' || A.Value1 from INF as A, File as B where A.Model = %s and A.BelongsToFile = %s

@@ -809,9 +884,9 @@ class Check(object):
             EdkLogger.quiet("Checking for pcd type in c code function usage ...")

             Table = EccGlobalData.gDb.TblInf

             SqlCommand = """

-                         select A.ID, A.Value2, A.BelongsToFile, B.BelongsToFile from %s as A, %s as B

-                         where A.Value1 = 'FILE_GUID' and B.Value1 = 'FILE_GUID' and

-                         A.Value2 = B.Value2 and A.ID <> B.ID group by A.ID

+                         select A.ID, A.Value3, A.BelongsToFile, B.BelongsToFile from %s as A, %s as B

+                         where A.Value2 = 'FILE_GUID' and B.Value2 = 'FILE_GUID' and

+                         A.Value3 = B.Value3 and A.ID <> B.ID group by A.ID

                          """ % (Table.Table, Table.Table)

             RecordSet = Table.Exec(SqlCommand)

             for Record in RecordSet:

@@ -836,7 +911,7 @@ class Check(object):
                      select A.ID, A.Value1 from %s as A, %s as B

                      where A.Model = %s and B.Model = %s

                      and A.Value1 = B.Value1 and A.ID <> B.ID

-                     and A.Arch = B.Arch

+                     and A.Scope1 = B.Scope1

                      and A.Enabled > -1

                      and B.Enabled > -1

                      group by A.ID

@@ -857,16 +932,16 @@ class Check(object):
         if Model == MODEL_EFI_PPI:

             Name = 'ppi'

         SqlCommand = """

-                     select A.ID, A.Value2 from %s as A, %s as B

+                     select A.ID, A.Value1, A.Value2 from %s as A, %s as B

                      where A.Model = %s and B.Model = %s

                      and A.Value2 = B.Value2 and A.ID <> B.ID

-                     and A.Arch = B.Arch

+                     and A.Scope1 = B.Scope1 and A.Value1 <> B.Value1

                      group by A.ID

                      """ % (Table.Table, Table.Table, Model, Model)

         RecordSet = Table.Exec(SqlCommand)

-        for Record in RecordSet:

-            if not EccGlobalData.gException.IsException(ErrorID, Record[1]):

-                EccGlobalData.gDb.TblReport.Insert(ErrorID, OtherMsg="The %s value [%s] is used more than one time" % (Name.upper(), Record[1]), BelongsToTable=Table.Table, BelongsToItem=Record[0])

+        for Record in RecordSet:     

+            if not EccGlobalData.gException.IsException(ErrorID, Record[1] + ':' + Record[2]):

+                EccGlobalData.gDb.TblReport.Insert(ErrorID, OtherMsg="The %s value [%s] is used more than one time" % (Name.upper(), Record[2]), BelongsToTable=Table.Table, BelongsToItem=Record[0])

 

     # Naming Convention Check

     def NamingConventionCheck(self):