phonebookengines/contactsmodel/cntplsql/src/cpplcommaddrtable.cpp
branchRCL_3
changeset 32 2828b4d142c0
parent 26 0d28c1c5b6dd
child 39 a6539d1e8e43
equal deleted inserted replaced
26:0d28c1c5b6dd 32:2828b4d142c0
   815             TPtrC extValString = stmnt.ColumnTextL(KExtraValueIdx);
   815             TPtrC extValString = stmnt.ColumnTextL(KExtraValueIdx);
   816             TInt32 storedUpperDigits;
   816             TInt32 storedUpperDigits;
   817             User::LeaveIfError(TLex(extValString).Val(storedUpperDigits));
   817             User::LeaveIfError(TLex(extValString).Val(storedUpperDigits));
   818             TInt32 stored = storedUpperDigits;
   818             TInt32 stored = storedUpperDigits;
   819 
   819 
   820             while ( (number != 0) && (stored != 0) &&
   820             TBool nonZeroInStoredFound = EFalse;
   821                     (number % 10 == 0 || stored % 10 == 0) )
   821             TBool nonZeroInNumberFound = EFalse;
       
   822             while ((number != 0) && (stored != 0))
   822                 {
   823                 {
       
   824                 nonZeroInNumberFound |= (number % 10 != 0);
       
   825                 nonZeroInStoredFound |= (stored % 10 != 0);
       
   826                 if (nonZeroInStoredFound && nonZeroInNumberFound)
       
   827                     {
       
   828                     break;
       
   829                     }
   823                 number /= 10;
   830                 number /= 10;
   824                 stored /= 10;
   831                 stored /= 10;
   825                 }
   832                 }
   826 
   833 
   827             if ( (phoneDigits.iUpperDigits == 0) || (storedUpperDigits == 0) ||
   834             if ((phoneDigits.iUpperDigits == 0) || (storedUpperDigits == 0) ||
   828                  (number == stored) )
   835                  (number == stored))
   829                 {
   836                 {
   830                 phoneMatchArray->AddL(stmnt.ColumnInt(KContactIdIdx));
   837                 phoneMatchArray->AddL(stmnt.ColumnInt(KContactIdIdx));
   831                 }
   838                 }
   832             }
   839             }
   833 
   840