equal
deleted
inserted
replaced
1073 if(checknetView->UpdateRecord()==KErrNone) |
1073 if(checknetView->UpdateRecord()==KErrNone) |
1074 { |
1074 { |
1075 _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network found, update name"); |
1075 _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network found, update name"); |
1076 checknetView->WriteTextL(TPtrC(COMMDB_NAME), ConvertTo16LC(aObject)); |
1076 checknetView->WriteTextL(TPtrC(COMMDB_NAME), ConvertTo16LC(aObject)); |
1077 _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network name updated"); |
1077 _DBG_FILE("CNSmlInternetAdapter::AddLeafObjectL: network name updated"); |
|
1078 checknetView->PutRecordChanges(); |
1078 CleanupStack::PopAndDestroy(); //ConvertTo16LC |
1079 CleanupStack::PopAndDestroy(); //ConvertTo16LC |
1079 } |
1080 } |
1080 // writing failed for some reason |
1081 // writing failed for some reason |
1081 else |
1082 else |
1082 { |
1083 { |
2983 |
2984 |
2984 if (fType == CNSmlInternetAdapter::EStr) |
2985 if (fType == CNSmlInternetAdapter::EStr) |
2985 { // Name + NAPAddr + DNSAddrL |
2986 { // Name + NAPAddr + DNSAddrL |
2986 if(aURI.Match(_L8("AP/*/Networks/*/Name"))!= KErrNotFound ) // Networks-name |
2987 if(aURI.Match(_L8("AP/*/Networks/*/Name"))!= KErrNotFound ) // Networks-name |
2987 { |
2988 { |
2988 TUint32 iapID8 = IntLUID(aLUID); |
2989 // TUint32 iapID8 = IntLUID(aLUID); |
2989 |
2990 |
2990 // IAP-table NetworkId Fetch |
2991 // IAP-table NetworkId Fetch |
2991 CCommsDbTableView* networkView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP), |
2992 CCommsDbTableView* networkView = iDatabase->OpenViewMatchingUintLC(TPtrC(IAP), |
2992 TPtrC(COMMDB_ID), |
2993 TPtrC(COMMDB_ID), |
2993 iapID8); |
2994 iapID); |
2994 networkView->GotoFirstRecord(); |
2995 networkView->GotoFirstRecord(); |
2995 TRAPD(leavecode,networkView->ReadUintL(TPtrC(IAP_NETWORK), iISPId)); |
2996 TRAPD(leavecode,networkView->ReadUintL(TPtrC(IAP_NETWORK), iISPId)); |
2996 CleanupStack::PopAndDestroy(); // networkView |
2997 CleanupStack::PopAndDestroy(); // networkView |
2997 if(leavecode != 0) |
2998 if(leavecode != 0) |
2998 { |
2999 { |
5019 |
5020 |
5020 TPtrC qTable = TPtrC(IAP); // Check if IAP-table free |
5021 TPtrC qTable = TPtrC(IAP); // Check if IAP-table free |
5021 TPtrC qDB = TPtrC(COMMDB_ID); |
5022 TPtrC qDB = TPtrC(COMMDB_ID); |
5022 |
5023 |
5023 //Check if URI is /AP/*/NAPDef/* then it should be check IAP ID in DB not IAPService |
5024 //Check if URI is /AP/*/NAPDef/* then it should be check IAP ID in DB not IAPService |
5024 if(( iIAPId > 0 ) && ((aURI.Match(_L8("AP/*/NAPDef/*" ))!= KErrNotFound) || (aURI.Match(_L8("AP/*/NAPDef/*/Bearer/*" ))!= KErrNotFound))) |
5025 if(( iIAPId >= 0 ) && ((aURI.Match(_L8("AP/*/NAPDef/*" ))!= KErrNotFound) || (aURI.Match(_L8("AP/*/NAPDef/*/Bearer/*" ))!= KErrNotFound) || (aURI.Match(_L8("AP/*" ))!= KErrNotFound) ||(aURI.Match(_L8("AP/*/NAPDef" ))!= KErrNotFound))) |
5025 { |
5026 { |
5026 //Get parent UID and check if that exist if not add |
5027 //Get parent UID and check if that exist if not add |
5027 iIAPId = GetAPIdFromURIL(aURI); |
5028 iIAPId = GetAPIdFromURIL(aURI); |
5028 |
5029 |
5029 } |
5030 } |
7202 |
7203 |
7203 if(iBuffer->At(iExecutionIndex).iLuid == 0) // After BearerL |
7204 if(iBuffer->At(iExecutionIndex).iLuid == 0) // After BearerL |
7204 iBuffer->At(iExecutionIndex).iLuid = iISPId; |
7205 iBuffer->At(iExecutionIndex).iLuid = iISPId; |
7205 } |
7206 } |
7206 |
7207 |
7207 iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iDone = ETrue; |
7208 TInt uidValue = IntLUID(addLUID); |
|
7209 if(( iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iUri->Des().Match( _L8( "AP/*/NAPDef/*/NAPAddr" ) ) != KErrNotFound ) && (uidValue == KErrNone)) |
|
7210 { |
|
7211 iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iDone = EFalse; |
|
7212 } |
|
7213 else |
|
7214 { |
|
7215 iBuffer->At(iExecutionIndex).iNodeBuf->At(cmd).iDone = ETrue; |
|
7216 } |
|
7217 |
7208 } |
7218 } |
7209 |
7219 |
7210 } |
7220 } |
7211 // |
7221 // |
7212 // Execute all commands for One AP Px |
7222 // Execute all commands for One AP Px |