2 files changed, 71 insertions, 16 deletions

diff --git a/bin/kdepim/korganizer/Migration-HowTo.txt b/bin/kdepim/korganizer/Migration-HowTo.txt
index ca767c6..a5fa02c 100644
--- a/bin/kdepim/korganizer/Migration-HowTo.txt
+++ b/bin/kdepim/korganizer/Migration-HowTo.txt
@@ -1,7 +1,16 @@
 
 Migration HowTo Outlook 200X -> KDE 
 
+Version 1.0.1
+The latest version of this file can be downloaded from
+http://sourceforge.net/projects/kdepimpi/
+Please choose there package/project/file:
+general Files for KDE/Pim
+MigrationHowTo_OL2KDE
+MigrationHowTo_OL2KDE.txt
+
+
 This HowTo describes the process of migrating data ( contact and calendar data ) from Outlook 200X to the PIM programs of the KDE-Desktop-Environment.
 The PIM programs are KAdddressbook and KOrganizer, which may be used embedded in the Kontact PIM management framework.
 This HowTo describes version 1.9.3a of the migration tools.
 The migration tools are the platform independent versions of KAdddressbook and KOrganizer: KAdddressbook/Pi and KOrganizer/Pi.
@@ -13,8 +22,10 @@ Content:
 3) Where to get the migration tools
 4) How to install the migration tools
 5) How to get the contact data out of Outlook200X
 6) How to get the calendar data out of Outlook200X
+7) How to import your contact data into Kontact
+8) How to import your calendar data into Kontact
 
 APPENDIX A) Problems and solutions when reading contact data
 APPENDIX B) Problems and solutions when reading calendar data
 
@@ -34,23 +45,36 @@ If you have a running Outlook200X already with contact/calendar data available,
 ****************************************
 2) How to import pst files in Outlook
 ****************************************
 
-MISSING 
+To open a local *.pst file in Outlook2003, choose menu:
+File - Open - Outlook Data File ...
+Now the data included in this file is shown 
+as folders of a newly added root folder in the Outlook folder view.
+This root folder is probably not accessable from
+the migration tools via OLE. 
+To access data stored in one of the subfolders,
+copy this subfolder to a root folder, 
+which can be accessed from the migration tools via OLE.
+(To know, which folder can be accessed, just perform 5.) or 6.) until
+you get the Oulook import dialog!)
+
+To copy it, right click on that subfolder and choose
+Copy "<subfoldername>"...
+in the popup menu.
 
 ****************************************
 3) Where to get the migration tools
 ****************************************
 
 The data migration is is performed with the Windows versions of KAdddressbook/Pi and KOrganizer/Pi.
 Pi stands for platform-independend - platform-independend because the same program is available for different platforms, like Windows, Linux desktop and Sharp-Zaurus PDA.
-Note: The Linux desktop versions of KOrganizer/Pi and KOrganizer/KDE-desktop are two different programs! You cannot use  KOrganizer/Pi together with or embedded in the KDE-desktop environment. The same is valid for KAdddressbook/Pi.
+Note: The Linux desktop versions of KOrganizer/Pi and KOrganizer/KDE-desktop are two different programs! You cannot use  KOrganizer/Pi together with, or embedded in, the KDE-desktop environment. The same is valid for KAdddressbook/Pi.
 
 The programs you need for the migration are: 
 a) KAdddressbook/Pi executeable + 2dlls + icons
 b) KOrganizer/Pi executeable + icons
-c) The Qt3 library qt-mt331.dll and the MSVC library msvcr71.dll
-
+c) The Qt3 library qt-mt331.dll and the MSVC library msvcr71.dll and the MSVC library mfc71u.dll
 You can download all of them at:
 
 http://sourceforge.net/projects/kdepimpi/
 
@@ -65,18 +89,22 @@ Such that the files to download are
 kapi193a-exe.zip
 kopi193a-exe.zip
 
 To download b)
-Please choose there package/project with name KO/Pi - general files.
-(Direct link: http://sourceforge.net/project/showfiles.php?group_id=104103&package_id=116719 )
+Please choose there package/project/file:
+general Files for KDE/Pim
+Needed Windows Dlls
+kdepimdll.zip
+
+(Direct link: http://sourceforge.net/project/showfiles.php?group_id=104103&package_id=122438&release_id=256700 )
 Choose there the file:
-kopidll.zip
+kdepimdll.zip
 
 Now you have downloaded the files
 
 kapi193a-exe.zip
 kopi193a-exe.zip
-kopidll.zip
+kdepimdll.zip
 
 and we can continue to install the files, which is simply unzipping them.
 
 
@@ -87,19 +115,19 @@ and we can continue to install the files, which is simply unzipping them.
 You have downloaded the files
  
 kapi193a-exe.zip
 kopi193a-exe.zip
-kopidll.zip
+kdepimdll.zip
 
 Unzip these files.
-The directory "pics" of the kopidll.zip is useless now and can be completely ignored.
 Now choose an arbitrary installation directory, where to copy all the needed files together.
 You should have now the following files and the directory "kdepim" in the same directory:
 kopi.exe  
 kapi.exe  
 microkabc_dir.dll  
 microkabc_file.dll   
 msvcr71.dll
+mfc71u.dll
 qt-mt331.dll  
 ReadMich.txt
 kdepim (directory)
 
@@ -132,9 +160,11 @@ Please start kapi.exe.
 Choose menu:
 File - Import - Import from OL...
 You will get a dialog which shows all "Personal Folders" of Outlook.
 Choose the Contact Folder(s) you want to import and select them with a hook.
-(All other folder but the contact containing folders are shown, but disabled)
+(All other folder but the contact containing folders are shown, but disabled).
+(If the data you want to import is not stored in one of the shown folders,
+please read step 2.) and click on "close" ).
 Click the "import" button.
 Now Outlook asks you to allow access to the contact data.
 Select "Allow access" amd click "Yes" in this dialog.
 Now the importing is performed and KA/Pi will show a progress bar.
@@ -153,8 +183,9 @@ Now you should have the contact data in the file std.vcf in your home directory
 (YOURHOMEDIR)\kdepim\apps\kabc\std.vcf
 
 Copy that file to a moveable disk or memory stick or just copy it via network to the destination.
 Import that file into KAddressbook/Kontact via Import - Import vcard.
+Details about importing you can read at: 7) How to import your contact data into Kontact
 
 Now you have your Outlook200X contact data on the KDE desktop available and you are done with the migration of contacts.
 
 *************************************************************
@@ -185,9 +216,11 @@ Now you will see the KO/Pi main window.
 Choose menu:
 File - Import from OL
 You will get a dialog which shows all "Personal Folders" of Outlook.
 Choose the Calendar Folder(s) you want to import and select them with a hook.
-(All other folder but the calendar data containing folders are shown, but disabled)
+(All other folder but the calendar data containing folders are shown, but disabled).
+(If the data you want to import is not stored in one of the shown folders,
+please read step 2.) and click on "close" ).
 Click the "import" button.
 Now Outllok asks you to allow access to the contact data.
 Select "Allow access" amd click "Yes" in this dialog.
 Now the importing is performed and KO/Pi will show a progress bar.
@@ -203,9 +236,10 @@ Close KO/Pi - data will be saved automatically.
 Now you should have the calendar data in the file mycalendar.ics in your home directory in the path
 (YOURHOMEDIR)\kdepim\apps\korganizer\mycalendar.ics
 
 Copy that file to a moveable disk or memory stick or just copy it via network to the destination.
-Import that file into KOrganizer/Kontact via Import - Import iCal/ics file.
+Import that file into KOrganizer/Kontact.
+Details about importing your calendar data you can read at: 8) How to import your calendar data into Kontact.
 (Warning again: Don't forget to set the timezone in KDE KOrganizer before importing data there. The timezone in KDE KOrganizer is set per default to UTC (GMT), that is -1h of CET).
 Now you have your Outlook200X calendar data on the KDE desktop available and you are done with the migration.
 
 Hint:
@@ -215,8 +249,25 @@ Another hint:
 KO/Pi + KA/Pi ( = KDE-Pim/Pi ) are available for the Sharp Zaurus PDA.
 Syncing data works for KO/Pi ( version 1.9.3) but not yet for KA/Pi.
 
 
+*************************************************************
+7) How to import your contact data into Kontact
+*************************************************************
+
+
+
+MISSING 
+
+
+
+*************************************************************
+8) How to import your calendar data into Kontact
+*************************************************************
+
+
+MISSING 
+
 
 *************************************************************
 APPENDIX A) Problems and solutions when reading contact data
 *************************************************************
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index d7c4595..f1db8b7 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -385,8 +385,9 @@ void IncidenceBase::setID( const QString & prof , int id )
             qDebug("Error in IncidenceBase::setID ");
     } else {
         mExternalId += prof+";"+QString::number( id) +";0:";
     }
+    qDebug("setID*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
 }
 int IncidenceBase::getID( const QString &  prof)
 {
     int ret = -1;
@@ -397,12 +398,13 @@ int IncidenceBase::getID( const QString &  prof)
         if ( end > 0 ) {
             bool ok;
             ret = mExternalId.mid ( num + len,end-len-num).toInt( &ok );
             if (!ok)
-                return -1;
+                ret = -1;
         }
     }
-    return ret;
+    qDebug("getID*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
+    return ret; 
 }
 
 // example  :Sharp_DTM;22;23566:TP;-1;8654:TPP;18;0:
 // format name;III;JJJ:  III >= 0, may be -1.  JJJ always >= 0  
@@ -419,8 +421,9 @@ void IncidenceBase::setCsum( const QString & prof , int id )
             qDebug("Error in IncidenceBase::setCsum ");
     } else {
         mExternalId += prof+";-1;"+QString::number( id) +":";
     }
+    qDebug("setCsum*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
 }
 int IncidenceBase::getCsum( const QString &  prof)
 {
     int ret = -1;
@@ -432,11 +435,12 @@ int IncidenceBase::getCsum( const QString &  prof)
         if ( end > 0 ) {
             bool ok;
             ret = mExternalId.mid ( num ,end-num).toInt( &ok );
             if (!ok)
-                return -1;
+                ret = -1;
         }
     }
+    qDebug("getCsum*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
     return ret;
 }
 
 void IncidenceBase::setIDStr( const QString & s )