Fixed minor bugs

diff --git a/Samples/Samples/Sample1_SimpleCells/Container/dstyle.css b/Samples/Samples/Sample1_SimpleCells/Container/dstyle.css
index b22eed2..5a10ecb 100644 (file)
--- a/Samples/Samples/Sample1_SimpleCells/Container/dstyle.css
+++ b/Samples/Samples/Sample1_SimpleCells/Container/dstyle.css
@@ -35,7 +35,7 @@ a[parameter="cellcode"] {
 }
 
 a[parameter="connection"]:before {
-       content:       "-> " attr(href)  "(" attr(name) ")"; 
+       content:       "-> " attr(href)  "(" attr(receptor) ")"; 
        display:       inline;
 }
 

diff --git a/Samples/Samples/Sample2_SimpleStorageCells/Container/dstyle.css b/Samples/Samples/Sample2_SimpleStorageCells/Container/dstyle.css
index b22eed2..5a10ecb 100644 (file)
--- a/Samples/Samples/Sample2_SimpleStorageCells/Container/dstyle.css
+++ b/Samples/Samples/Sample2_SimpleStorageCells/Container/dstyle.css
@@ -35,7 +35,7 @@ a[parameter="cellcode"] {
 }
 
 a[parameter="connection"]:before {
-       content:       "-> " attr(href)  "(" attr(name) ")"; 
+       content:       "-> " attr(href)  "(" attr(receptor) ")"; 
        display:       inline;
 }
 

diff --git a/Source/platform/qt/qtdnstorageimpl.cpp b/Source/platform/qt/qtdnstorageimpl.cpp
index 517deda..4f0a43f 100644 (file)
--- a/Source/platform/qt/qtdnstorageimpl.cpp
+++ b/Source/platform/qt/qtdnstorageimpl.cpp
@@ -360,21 +360,18 @@ bool QtDNStorageImpl::initDB()
     {
         QSqlQuery q;
 
-        if (!q.exec("CREATE TABLE properties(cell TEXT, prokey TEXT, value REAL, PRIMARY KEY (cell, prokey))"));
+        if (!q.exec("CREATE TABLE properties(cell TEXT, prokey TEXT, value REAL, PRIMARY KEY (cell, prokey))"))
         {
-            if (mDatabase->database.lastError().type() != QSqlError::NoError)
+            std::string message = "Failied to create data table (properties) in ";
+            message.append(mStoragePath.toStdString());
+            message.append("\n");
+            message.append(mDatabase->database.lastError().text().toStdString());
+            if (dnGlobal()->updateErrorStatus(DNGlobal::ERROR))
             {
-                std::string message = "Failied to create data table (properties) in ";
-                message.append(mStoragePath.toStdString());
-                message.append("\n");
-                message.append(mDatabase->database.lastError().text().toStdString());
-                if (dnGlobal()->updateErrorStatus(DNGlobal::ERROR))
-                {
-                    dnGlobal()->setMessage1("Persistent storage initialization error.");
-                    dnGlobal()->setMessage2(message);
-                }
-                return false;
+                dnGlobal()->setMessage1("Persistent storage initialization error.");
+                dnGlobal()->setMessage2(message);
             }
+            return false;
         }
     }
 
@@ -382,21 +379,18 @@ bool QtDNStorageImpl::initDB()
     {
         QSqlQuery q;
 
-        if (!q.exec("CREATE TABLE xyzvdata(cell TEXT, dskey TEXT, dsindex INTEGER, x REAL, y REAL, z REAL, v REAL, PRIMARY KEY (cell, dskey, dsindex))"));
+        if (!q.exec("CREATE TABLE xyzvdata(cell TEXT, dskey TEXT, dsindex INTEGER, x REAL, y REAL, z REAL, v REAL, PRIMARY KEY (cell, dskey, dsindex))"))
         {
-            if (mDatabase->database.lastError().type() !=  QSqlError::NoError)
+            std::string message = "Failied to create data table (dataset) in ";
+            message.append(mStoragePath.toStdString());
+            message.append("\n");
+            message.append(mDatabase->database.lastError().text().toStdString());
+            if (dnGlobal()->updateErrorStatus(DNGlobal::ERROR))
             {
-                std::string message = "Failied to create data table (dataset) in ";
-                message.append(mStoragePath.toStdString());
-                message.append("\n");
-                message.append(mDatabase->database.lastError().text().toStdString());
-                if (dnGlobal()->updateErrorStatus(DNGlobal::ERROR))
-                {
-                    dnGlobal()->setMessage1("Persistent storage initialization error.");
-                    dnGlobal()->setMessage2(message);
-                }
-                return false;
+                dnGlobal()->setMessage1("Persistent storage initialization error.");
+                dnGlobal()->setMessage2(message);
             }
+            return false;
         }
     }