2 files changed, 54 insertions, 46 deletions

diff --git a/noncore/tools/pimconverter/converter.cpp b/noncore/tools/pimconverter/converter.cpp
index fa3e714..e8bd475 100644
--- a/noncore/tools/pimconverter/converter.cpp
+++ b/noncore/tools/pimconverter/converter.cpp
@@ -45,65 +45,65 @@ void Converter::selectedDatabase( int num )
 void Converter::selectedDestFormat( int num )
 {
     m_selectedDestFormat = num;
 }
 
 void Converter::selectedSourceFormat( int num )
 {
     m_selectedSourceFormat = num;
 }
 
 void Converter::start_conversion(){
 
     // Creating backends to the requested databases..
     OPimBase* sourceDB;
     OPimBase* destDB;
 
     odebug << "SourceFormat: " <<  m_selectedSourceFormat << oendl;
     odebug << "DestFormat: " << m_selectedDestFormat << oendl;
     if ( m_selectedSourceFormat == m_selectedDestFormat ){
 
             QMessageBox::warning( this, tr("PimConverter"),
                                   tr( "<qt>It is not a good idea to use"
                                       "the same source and destformat !</qt>"));
             return;
     }
 
     switch( m_selectedSourceFormat ){
     case XML:
         odebug << "XMLSourceDB = " << m_selectedDatabase << "" << oendl;
         switch( m_selectedDatabase ){
         case ADDRESSBOOK:{
             sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" );
-                }
+        }
             break;
         case TODOLIST:{
             sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" );
             }break;
         case DATEBOOK:{
             sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" );
                 }
             break;
         default:
             owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
             return;
         }
         break;
     case SQL:
         odebug << "SQLSourceDB = " << m_selectedDatabase << "" << oendl;
         switch( m_selectedDatabase ){
         case ADDRESSBOOK:{
             sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" );
                 }
             break;
         case TODOLIST:{
             sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" );
             }break;
         case DATEBOOK:{
             sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" );
                 }
             break;
         default:
             owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
             return;
         }
         break;
@@ -198,137 +198,145 @@ void Converter::start_conversion(){
         delete static_cast<OPimContactAccess*> (destDB);
         break;
     case TODOLIST:
         delete static_cast<OPimTodoAccess*> (sourceDB);
         delete static_cast<OPimTodoAccess*> (destDB);
         break;
     case DATEBOOK:
         delete static_cast<ODateBookAccess*> (sourceDB);
         delete static_cast<ODateBookAccess*> (destDB);
         break;
     default:
         owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
         return;
     }
 
 
     owarn << "Conversion is finished and needed " << t.elapsed() << " ms !" << oendl;
 }
 
 void Converter::closeEvent( QCloseEvent *e )
 {
 
         /* Due to the fact that we don't have multitasking here, this
          * critical handling don't make sense, but the future..
          */
         if ( m_criticalState ){
                 e->ignore();
                 return;
         }
         e->accept();
 }
 
-bool Converter::sqliteCopyAndConvert(const QString& src, const QString &dest, QString &cmd)
+bool Converter::sqliteMoveAndConvert( const QString& name, const QString& src, const QString &dest )
 {
+
+        QMessageBox::information( this, tr( "Pim-Converter" ),
+                                  tr( "<qt>Starting to convert the database for %1</qt>" ).arg( name ) );
+
+
+    bool error = false;
+    QString cmd;
     if (!QFile::exists( src ) ) {
-        cmd = tr("No SQLite2 database exists");
-        return false;
+        cmd = tr( "No SQLite2 database could be found!" );
+        error = true;
     }
 
     if( QFile::exists( dest ) ) {
-        cmd = tr("A copy of the SQLite2 exists");
-        return false;
+        cmd = tr( "The database is already converted!" );
+        error = true;
     }
 
-    /*
-     * Copy it over
-     */
-    cmd = "cp " + Global::shellQuote(src) + " " + Global::shellQuote(dest);
-    if( ::system( cmd ) != 0 )
-        return false;
+
+    if ( error ){
+                QMessageBox::critical( this, tr("Pim-Converter"),
+                                       tr("<qt>Conversion not possible: \n"
+                                          "Problem: %1</qt>").arg(cmd) );
+                return error;
+    }
+            
 
     /*
-     * Delete it to make place for the new file
+     * Move it over
      */
-    cmd = "rm " + Global::shellQuote(src);
-    if( ::system( cmd ) != 0 )
-        return false;
+    cmd = "mv " + Global::shellQuote(src) + " " + Global::shellQuote(dest);
+    if( ::system( cmd ) != 0 ){
+            error = true;
+    }
+
 
     /*
      * Convert it
      */
-    cmd = "sqlite " + Global::shellQuote(dest) + " .dump | sqlite3 " + Global::shellQuote(src);
-    return ::system( cmd ) == 0;
+    if ( !error ){
+            cmd = "sqlite " + Global::shellQuote(dest) + " .dump | sqlite3 " + Global::shellQuote(src);
+            if ( ::system( cmd ) != 0 ){
+                    error = true;
+            }
+    }
+
+    if ( error ){
+            QMessageBox::critical( this, tr("Pim-Converter"),
+                                   tr("<qt>An internal error occurred: "
+                                      "Converting the database was impossible! "
+                                      "Command: '%1' </qt>").arg(cmd) );
+            
+    }
 }
 
 
 
 void Converter::start_upgrade()
 {
         odebug << "Start upgrading" << oendl;
         switch( QMessageBox::warning( this, tr("Pim-Converter"),
                                       tr("<qt>Are you really sure that you "
                                       "want to convert your database from "
                                       "sqlite V2 to sqlite V3?</qt>"),
                                       QMessageBox::Ok | QMessageBox::Default,
                                       QMessageBox::Abort | QMessageBox::Escape )) {
 
         case QMessageBox::Abort: // Abort clicked or Escape pressed
                 // abort
                 return;
                 break;
         }
         odebug << "Checking whether sqlite is installed" << oendl;
         if ( system( "which sqlite" ) != 0 ){
                 QMessageBox::critical( this, tr("Pim-Converter"),
                                        tr("<qt>An internal error occurred: "
                                        "sqlite was not accessible! "
                                        "Please correct the PATH or install "
                                        "this packages!</qt>") );
                 return;
         }
         if ( system( "which sqlite3" ) != 0 ){
                 QMessageBox::critical( this, tr("Pim-Converter"),
                                        tr("<qt>An internal error occurred: "
                                           "sqlite3 was not accessible! "
                                           "Please correct the PATH or install "
                                           "this packages!</qt>") );
                 return;
         }
 
-        QString src, dest, cmd;
+        QString src, dest;
+        bool error = false;
+
         src  = Global::applicationFileName("addressbook", "addressbook.db"    );
         dest = Global::applicationFileName("addressbook", "addressbook.db_v2" );
-
-        if(!sqliteCopyAndConvert(src, dest, cmd)) {
-                QMessageBox::critical( this, tr("Pim-Converter"),
-                                       tr("<qt>An internal error occurred: "
-                                          "Converting the addressbook command was impossible! "
-                                          "Executed the following command: %1</qt>").arg(cmd) );
-                return;
-        }
+        error = sqliteMoveAndConvert( "Addressbook", src, dest );
 
         src  = Global::applicationFileName("datebook", "datebook.db"    );
         dest = Global::applicationFileName("datebook", "datebook.db_v2" );
-        if(!sqliteCopyAndConvert(src, dest, cmd)) {
-                QMessageBox::critical( this, tr("Pim-Converter"),
-                                       tr("<qt>An internal error occurred: "
-                                       "Converting the datebook command was impossible! "
-                                       "Executed the following command: '%1' </qt>").arg(cmd)
-                                      );
-                return;
-        }
+        error = sqliteMoveAndConvert( "Datebook", src, dest );
+        
 
         src  = Global::applicationFileName("todolist", "todolist.db"    );
         dest = Global::applicationFileName("todolist", "todolist.db_v2" );
-        if(!sqliteCopyAndConvert(src, dest, cmd)) {
-                QMessageBox::critical( this, tr("Pim-Converter"),
-                                       tr("<qt>An internal error occurred: "
-                                          "Converting the todolist command was impossible! "
-                                          "Executed the following command: '%1' </qt>").arg(cmd) );
-                return;
-        }
+        error = sqliteMoveAndConvert( "TodoList", src, dest );
 
-        QMessageBox::information( this, tr("Pim-Converter"),
-                                  tr("Conversion is finished!"),
-                                  QMessageBox::Ok );
+        if ( !error ){
+                QMessageBox::information( this, tr("Pim-Converter"),
+                                          tr("Conversion is finished!"),
+                                          QMessageBox::Ok );
+        }
 }
diff --git a/noncore/tools/pimconverter/converter.h b/noncore/tools/pimconverter/converter.h
index e9035e7..cfd315c 100755
--- a/noncore/tools/pimconverter/converter.h
+++ b/noncore/tools/pimconverter/converter.h
@@ -13,37 +13,37 @@ public:
         // Slots defined in the ui-description file
         void start_conversion();
         void start_upgrade();
         void selectedDatabase( int num );
         void selectedDestFormat( int num );
         void selectedSourceFormat( int num );
 
         void closeEvent( QCloseEvent *e );
         
 private:
         // Caution:
         // The order and value of the following enums must be regarding
         // the predefinition in the UI-File !!
         // If you don't understand what I am talking about: Keep your fingers away!!
         enum DataBases{
                 ADDRESSBOOK = 0,
                 TODOLIST    = 1,
                 DATEBOOK    = 2,
         };
 
         enum DbFormats{
                 XML = 0,
                 SQL = 1,
         };
 
         int m_selectedDatabase;
         int m_selectedSourceFormat;
         int m_selectedDestFormat;
         bool m_criticalState;
 
 
 private:
-        static bool sqliteCopyAndConvert( const QString &src, const QString &destination, QString &lastCommand );
+        bool sqliteMoveAndConvert( const QString& name, const QString &src, const QString &destination );
 };
 
 
 #endif