Diffstat (limited to 'noncore/tools/pimconverter/converter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/tools/pimconverter/converter.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
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 | |||
@@ -246,13 +246,13 @@ bool Converter::sqliteMoveAndConvert( const QString& name, const QString& src, c | |||
246 | error = true; | 246 | error = true; |
247 | } | 247 | } |
248 | 248 | ||
249 | 249 | ||
250 | if ( error ){ | 250 | if ( error ){ |
251 | QMessageBox::critical( this, tr("Pim-Converter"), | 251 | QMessageBox::critical( this, tr("Pim-Converter"), |
252 | tr("<qt>Conversion not possible: \n" | 252 | tr("<qt>Conversion not possible: <br>" |
253 | "Problem: %1</qt>").arg(cmd) ); | 253 | "Problem: %1</qt>").arg(cmd) ); |
254 | return error; | 254 | return error; |
255 | } | 255 | } |
256 | 256 | ||
257 | 257 | ||
258 | /* | 258 | /* |
@@ -271,19 +271,33 @@ bool Converter::sqliteMoveAndConvert( const QString& name, const QString& src, c | |||
271 | cmd = "sqlite " + Global::shellQuote(dest) + " .dump | sqlite3 " + Global::shellQuote(src); | 271 | cmd = "sqlite " + Global::shellQuote(dest) + " .dump | sqlite3 " + Global::shellQuote(src); |
272 | if ( ::system( cmd ) != 0 ){ | 272 | if ( ::system( cmd ) != 0 ){ |
273 | error = true; | 273 | error = true; |
274 | } | 274 | } |
275 | } | 275 | } |
276 | 276 | ||
277 | |||
278 | /* | ||
279 | * Check whether conversion really worked. If not, move old database back to recover it | ||
280 | */ | ||
281 | if ( !QFile::exists( src ) ){ | ||
282 | cmd = "mv " + Global::shellQuote(dest) + " " + Global::shellQuote(src); | ||
283 | if ( ::system( cmd ) != 0 ){ | ||
284 | } | ||
285 | error = true; | ||
286 | cmd = "Database-Format is not V2!?"; | ||
287 | } | ||
288 | |||
277 | if ( error ){ | 289 | if ( error ){ |
278 | QMessageBox::critical( this, tr("Pim-Converter"), | 290 | QMessageBox::critical( this, tr("Pim-Converter"), |
279 | tr("<qt>An internal error occurred: " | 291 | tr("<qt>An internal error occurred: <br>" |
280 | "Converting the database was impossible! " | 292 | "Converting the database was impossible! <br>" |
281 | "Command: '%1' </qt>").arg(cmd) ); | 293 | "Command/Reason: '%1' </qt>").arg(cmd) ); |
282 | 294 | ||
283 | } | 295 | } |
296 | |||
297 | |||
284 | } | 298 | } |
285 | 299 | ||
286 | 300 | ||
287 | 301 | ||
288 | void Converter::start_upgrade() | 302 | void Converter::start_upgrade() |
289 | { | 303 | { |