dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp
branchRCL_3
changeset 58 83ca720e2b9a
parent 57 05bc53fe583b
--- a/dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp	Tue Aug 31 15:35:44 2010 +0300
+++ b/dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp	Wed Sep 01 12:23:51 2010 +0100
@@ -150,6 +150,8 @@
     CLOG_WRITE( "Processing started...\n" )
     CLOG_WRITE( "=====================\n" )               
 
+	iCmManager.OpenL();
+
     TDbCreatorInputCharSet charSet( ECharSetUnknown );//input character set
 
     //Creates access points
@@ -301,7 +303,8 @@
                                                           iPluginArray,
                                                           iPluginNames,
                                                           iDestArray,
-                                                          iDestNames ); 
+                                                          iDestNames,
+                                                          iDefCon ); 
                 iFileProcessor->ParseFileL();
 
                 delete iFileProcessor;
@@ -322,7 +325,7 @@
                   
 
     // Updates the IAPs that are not in destinations.
-    UpdateUncatCmsL( iCmInDest );
+    UpdateUncatCmsL( iCmInDest /*, iPluginNames, iPluginArray*/ );
 
     // Sets the underlying IAP/SNAPS for vpn IAPs    
     SetUnderlyingIapL( iUnderLying );
@@ -346,6 +349,9 @@
     // Sets linger settings
     SetLingerSettingsL( iLingerSettings );
 
+    // Sets the default connection    
+    SetDefaultConnectionL( iDefCon );
+
     // Logs IAPs in UDEB mode
     #ifdef _DEBUG
     LogIapIdsL();
@@ -410,6 +416,8 @@
     
     iLingerSettings.ResetAndDestroy();
 
+    iDefCon.ResetAndDestroy();
+    
     iCmInDest.Close(); 
     
     iCmManager.Close();
@@ -427,9 +435,7 @@
     FeatureManager::InitializeLibL();
     iIsWlanS = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
     FeatureManager::UnInitializeLib();
-    CLOG_WRITE( "FeatureManager closed\n" )
-
-    iCmManager.OpenL();
+    CLOG_WRITE( "FeatureManager closed\n" )               
     }
     
 //------------------------------------------------
@@ -577,6 +583,34 @@
         }
     }
 
+// ---------------------------------------------------------
+// CCdcCommsDatCreator::ProcessDNL
+// ---------------------------------------------------------
+//
+void CCdcCommsDatCreator::SetDefaultConnectionL( RPointerArray< HBufC >& aDefCon )
+    {
+    // Sets the default connection    
+    if( aDefCon.Count() > 0 )
+        {
+        CLOG_WRITE_FORMAT( "SetDefaultConnectionL: %d\n", aDefCon.Count() )
+        CLOG_WRITE( "--------------------------------------\n" )
+
+        CProcessorGlobal* glb = CProcessorGlobal::NewL( iReader,
+                                               iCmManager,
+                                               iPluginArray,
+                                               iPluginNames,
+                                               iDestArray,
+                                               iDestNames,
+                                               aDefCon );
+        
+        CleanupStack::PushL( glb );
+        glb->SetDefaultConnectionL();
+                
+        CleanupStack::PopAndDestroy( glb );
+
+        CLOG_WRITE( "--------------------------------------\n" )
+        }
+    }
 
 // ---------------------------------------------------------
 // CCdcCommsDatCreator::SetUnderlyingIapL