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
@@ -3,2 +3,11 @@ 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.
@@ -16,2 +25,4 @@ Content:
 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
 
@@ -37,3 +48,17 @@ If you have a running Outlook200X already with contact/calendar data available,
 
-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.
 
@@ -45,3 +70,3 @@ The data migration is is performed with the Windows versions of KAdddressbook/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.
 
@@ -50,4 +75,3 @@ 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:
@@ -68,6 +92,10 @@ 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
 
@@ -77,3 +105,3 @@ kapi193a-exe.zip
 kopi193a-exe.zip
-kopidll.zip
+kdepimdll.zip
 
@@ -90,6 +118,5 @@ 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.
@@ -101,2 +128,3 @@ microkabc_file.dll
 msvcr71.dll
+mfc71u.dll
 qt-mt331.dll  
@@ -135,3 +163,5 @@ 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.
@@ -156,2 +186,3 @@ Copy that file to a moveable disk or memory stick or just copy it via network to
 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
 
@@ -188,3 +219,5 @@ 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.
@@ -206,3 +239,4 @@ Now you should have the calendar data in the file mycalendar.ics in your home di
 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).
@@ -218,2 +252,19 @@ 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 
+
 
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index d7c4595..f1db8b7 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -388,2 +388,3 @@ void IncidenceBase::setID( const QString & prof , int id )
     }
+    qDebug("setID*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
 }
@@ -400,6 +401,7 @@ int IncidenceBase::getID( const QString &  prof)
             if (!ok)
-                return -1;
+                ret = -1;
         }
     }
-    return ret;
+    qDebug("getID*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
+    return ret; 
 }
@@ -422,2 +424,3 @@ void IncidenceBase::setCsum( const QString & prof , int id )
     }
+    qDebug("setCsum*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
 }
@@ -435,5 +438,6 @@ int IncidenceBase::getCsum( const QString &  prof)
             if (!ok)
-                return -1;
+                ret = -1;
         }
     }
+    qDebug("getCsum*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
     return ret;