From 8d8b23bff18b8afd42840ef1d4574ef3ea9f8cee Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Tue, 26 Oct 2004 11:18:23 +0000
Subject: Protect against error in database format. Recover to old if database was

unreadable ..
---
(limited to 'noncore/tools')

diff --git a/noncore/tools/pimconverter/converter.cpp b/noncore/tools/pimconverter/converter.cpp
index e8bd475..d92f382 100644
--- a/noncore/tools/pimconverter/converter.cpp
+++ b/noncore/tools/pimconverter/converter.cpp
@@ -249,7 +249,7 @@ bool Converter::sqliteMoveAndConvert( const QString& name, const QString& src, c
 
     if ( error ){
 		QMessageBox::critical( this, tr("Pim-Converter"),
-                                       tr("<qt>Conversion not possible: \n"
+                                       tr("<qt>Conversion not possible: <br>"
                                           "Problem: %1</qt>").arg(cmd) );
 		return error;
     }
@@ -274,13 +274,27 @@ bool Converter::sqliteMoveAndConvert( const QString& name, const QString& src, c
 	    }
     }
 
+
+    /*
+     * Check whether conversion really worked. If not, move old database back to recover it
+     */
+    if ( !QFile::exists( src ) ){
+	    cmd = "mv " + Global::shellQuote(dest) + " " + Global::shellQuote(src);
+	    if ( ::system( cmd ) != 0 ){
+	    }
+	    error = true;
+	    cmd = "Database-Format is not V2!?";	    
+    }
+
     if ( error ){
 	    QMessageBox::critical( this, tr("Pim-Converter"),
-				   tr("<qt>An internal error occurred: "
-				      "Converting the database was impossible! "
-				      "Command: '%1' </qt>").arg(cmd) );
+				   tr("<qt>An internal error occurred: <br>"
+				      "Converting the database was impossible! <br>"
+				      "Command/Reason: '%1' </qt>").arg(cmd) );
 	    
     }
+
+
 }
 
 
--
cgit v0.9.0.2