[Digikam-devel] [Bug 235928] digikam fails to open database at startup

[Gilles Caulier]

https://bugs.kde.org/show_bug.cgi?id=235928





--- Comment #12 from Gilles Caulier <caulier gilles gmail com>  2010-05-06 08:07:00 ---
SVN commit 1122611 by foerster:

On first run dialog, save database settings with methods provided by
DatabaseParameters to ensure the same settings format is used.
This should be a fix: B.K.O. 235928.

 M  +3 -2      libs/database/databaseparameters.cpp
 M  +7 -4      utilities/firstrun/collectionpage.cpp


--- trunk/extragear/graphics/digikam/libs/database/databaseparameters.cpp
#1122610:1122611
@@ -7,7 +7,7 @@
 * Description : Storage container for database connection parameters.
 *
 * Copyright (C) 2007-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
- * Copyright (C) 2010 by Holger Förster <hamsi2k at freenet dot de>
+ * Copyright (C) 2010 by Holger F�rster <hamsi2k at freenet dot de>
 *
 * This program is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General
@@ -188,6 +188,7 @@
        const QString miscDir = KStandardDirs::locateLocal("data",
"digikam/db_misc");
        databaseType= "QMYSQL";
        databaseName = "digikam";
+        internalServer = false;
        databaseNameThumbnails = "digikam";
        hostName = QString();
        port = -1;
@@ -306,7 +307,7 @@

 DatabaseParameters DatabaseParameters::parametersForSQLiteDefaultFile(const
QString& directory)
 {
-    QString filePath = directory + '/' + "digikam4.db";
+    QString filePath = directory + QDir::separator() + "digikam4.db";
    filePath = QDir::cleanPath(filePath);
    return parametersForSQLite(filePath);
 }
--- trunk/extragear/graphics/digikam/utilities/firstrun/collectionpage.cpp
#1122610:1122611
@@ -46,7 +46,7 @@
 #include <kdebug.h>

 // Local includes
-
+#include <databaseparameters.h>
 #include "version.h"

 namespace Digikam
@@ -168,9 +168,12 @@
    KConfigGroup group        = config->group("General Settings");
    group.writeEntry("Version", digikam_version);

-    group = config->group("Album Settings");
-    group.writeEntry("Album Path",         d->rootAlbum);
-    group.writeEntry("Database File Path", d->dbPath);
+    DatabaseParameters params;
+    params.databaseType = "QSQLITE";
+    params.internalServer = false;
+    params.databaseName = d->dbPath + QDir::separator();
+    params.databaseNameThumbnails = d->dbPath + QDir::separator();
+    params.writeToConfig(config);

    config->sync();
 }

-- 
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.