[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/extragear/graphics/digikam/1.0-databaseext
From:       Holger Foerster <hamsi2k () freenet ! de>
Date:       2010-01-17 20:50:01
Message-ID: 1263761401.950627.16950.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1076246 by foerster:

Start an internal database server if the user want to perform a connection test on \
this server.

 M  +1 -5      digikam/digikamapp.cpp  
 M  +5 -1      libs/database/databaseparameters.cpp  
 M  +21 -5     libs/widgets/common/databasewidget.cpp  


--- branches/extragear/graphics/digikam/1.0-databaseext/digikam/digikamapp.cpp \
#1076245:1076246 @@ -344,11 +344,7 @@
 
 void DigikamApp::startInternalDatabase()
 {
-    // First of all, check if the database server must started
-    if (AlbumSettings::instance()->getInternalDatabaseServer())
-    {
-        DatabaseServerStarter::startServerManagerProcess();
-    }
+    DatabaseServerStarter::startServerManagerProcess();
 }
 
 void DigikamApp::stopInternalDatabase()
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/database/databaseparameters.cpp \
#1076245:1076246 @@ -169,8 +169,12 @@
     parameters.port             = \
parameters.m_DatabaseConfigs[databaseType].m_Port.toInt();  
     const QString miscDir     = KStandardDirs::locateLocal("data", \
                "digikam/db_misc");
-    parameters.connectOptions   = \
parameters.m_DatabaseConfigs[databaseType].m_ConnectOptions.replace(QRegExp("$$DBMISCPATH$$"), \
miscDir); +    QString connectOptions = \
parameters.m_DatabaseConfigs[databaseType].m_ConnectOptions; +    \
connectOptions.replace(QString("$$DBMISCPATH$$"), miscDir);  
+    parameters.connectOptions   = connectOptions;
+
+    kDebug(50003)<<"ConnectOptions "<< parameters.connectOptions;
     return parameters;
 }
 
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/widgets/common/databasewidget.cpp \
#1076245:1076246 @@ -36,6 +36,9 @@
 #include <QSqlDatabase>
 #include <qsqlerror.h>
 
+#include <databaseparameters.h>
+#include <databaseserverstarter.h>
+
 namespace Digikam
 {
     DatabaseWidget::DatabaseWidget(QWidget* parent): QWidget(parent)
@@ -216,12 +219,25 @@
     void DatabaseWidget::checkDatabaseConnection(){
         QString databaseID("ConnectionTest");
         QSqlDatabase testDatabase = \
                QSqlDatabase::addDatabase(databaseType->currentText(), databaseID);
-        testDatabase.setHostName(hostName->text());
-        testDatabase.setPort(hostPort->text().toInt());
-        testDatabase.setUserName(userName->text());
-        testDatabase.setPassword(password->text());
-        testDatabase.setConnectOptions(connectionOptions->text());
 
+        if (internalServer->isChecked())
+        {
+           DatabaseParameters internalServerParameters = \
DatabaseParameters::parametersFromConfig(databaseType->currentText()); +           \
testDatabase.setHostName(internalServerParameters.hostName); +           \
testDatabase.setPort(internalServerParameters.port); +           \
testDatabase.setUserName(internalServerParameters.userName); +           \
testDatabase.setPassword(internalServerParameters.password); +           \
testDatabase.setConnectOptions(internalServerParameters.connectOptions); +           \
DatabaseServerStarter::startServerManagerProcess(databaseType->currentText()); +      \
}else +        {
+            testDatabase.setHostName(hostName->text());
+            testDatabase.setPort(hostPort->text().toInt());
+            testDatabase.setUserName(userName->text());
+            testDatabase.setPassword(password->text());
+            testDatabase.setConnectOptions(connectionOptions->text());
+        }
+
         bool result = testDatabase.open();
         if (result == true){
             KMessageBox::information(0, i18n("Database connection test \
successful."), i18n("Database connection test"));


[prev in list] [next in list] [prev in thread] [next in thread]