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

List:       kde-commits
Subject:    playground/office/alkimia
From:       Klaas Freitag <freitag () suse ! de>
Date:       2011-05-16 6:58:09
Message-ID: 20110516065809.69CEDAC87C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1232218 by freitag:

Some trivial patching, ie. in connect()

 M  +20 -22    alkdbus/AlkRecord/AlkRecord.cpp  
 M  +4 -2      alkdbus/AlkRecord/AlkRecord.h  
 M  +4 -4      alkdbus/AlkRecord/CMakeLists.txt  
 M  +1 -1      alkquotes/backend/org.kde.alkimia.quotes.service  


--- trunk/playground/office/alkimia/alkdbus/AlkRecord/AlkRecord.cpp #1232217:1232218
@@ -18,20 +18,17 @@
 #include "AlkRecord.h"
 #include "AlkData.h"
 
-QSqlDatabase AlkRecord::db;
+QSqlDatabase AlkRecord::mDb;
 
 
 AlkRecord::AlkRecord()
 {
-  connect(":ALK_DBASE:");
 }
 
 
 
 AlkRecord::AlkRecord(QString const& Source, QString const& Memo, QString const& \
Amount)  {
-  connect(":ALK_DBASE:");
-
   m_source = Source;
   m_memo = Memo;
   m_amount = Amount;
@@ -40,7 +37,6 @@
 
 AlkRecord::AlkRecord(QString const& Source, QString const& Memo, QString const& \
Amount, QDateTime const& DueDate)  {
-  connect(":ALK_DBASE:");
   m_source = Source;
   m_memo = Memo;
   m_amount = Amount;
@@ -58,36 +54,34 @@
 
 ///Function to establish a database Connection
 
-bool AlkRecord::connect(QString const& database)
+bool AlkRecord::connect()
 {
-  //db=QSqlDatabase();
-  db = QSqlDatabase::addDatabase("QSQLITE");
-  db.setDatabaseName(database);
+  //mDb=QSqlDatabase();
+  if( !mDb.isOpen() ) {
+    mDb = QSqlDatabase::addDatabase("QSQLITE");
+    mDb.setDatabaseName(ALK_TRANS_DB);
 
-  if (!db.isOpen())
-    if (!db.open())
+    if (!mDb.open()) {
       return false;
-    else {
-      // printf("Connected");
+    } 
+  }
       return true;
     }
 
-}
-
 //Function to disconnect from a database connection
 
 void AlkRecord::disconnect()
 {
+  if (mDb.isOpen())
+    mDb.close();
 
-  if (db.isOpen())
-    db.close();
-
 }
 
 
 //Function to Update the status of a AlkData to specify if it is read or unread. \
Higher order method defined later  bool AlkRecord::UpdateStatus(int const& tid, \
status const& sts)  {
+  if( ! connect() ) return false;
 
   QSqlQuery query;
   query.prepare("UPDATE RECORD  status=:status WHERE tid=:tid");
@@ -106,6 +100,7 @@
 //Function to register a transaction in database.Higher order methods \
registerExpense ,registerInvoice and registerPayment call this functio.n  bool \
AlkRecord::registerTransaction(transactiontype const& ttype)  {
+  if( ! connect() ) return false;
 
   QSqlQuery query;
   query.prepare("Insert Into RECORD \
Values(NULL,:source,:memo,:amount,:currentdate,0,:duedate,:transactiontype)"); @@ \
-135,6 +130,7 @@  AlkData rec;
   QSqlQuery query;
 
+  if( connect() ) {
   query.prepare("Select * FROM RECORD where duedate>:fromduedate AND \
duedate<:toduedate AND transactiontype=:transactiontype");  \
query.bindValue(":fromduedate", fromduedate.toTime_t());  \
query.bindValue(":toduedate", toduedate.toTime_t()); @@ -156,6 +152,7 @@
 
     listofrecords.append(rec);
   }
+  }
 
   return listofrecords;
 }
@@ -191,8 +188,8 @@
 //Query a single AlkData by transactionid
 AlkData AlkRecord::queryTransaction(int transactionid)
 {
-
   AlkData rec;
+  if( connect() ) {
   QSqlQuery query;
   query.prepare("Select *from RECORD where tid=:transactionid");
   query.bindValue(":transactionid", transactionid);
@@ -210,7 +207,7 @@
   rec.setDueDate(QDateTime::fromTime_t(sqldata.value("duedate").toInt()));
   rec.setStatus(sqldata.value("status").toInt());
   rec.setTransactionType(sqldata.value("transactiontype").toInt());
-
+  }
   return rec;
 
 }
@@ -242,8 +239,9 @@
 //Query all records
 QList<AlkData> AlkRecord::queryallTransactions()
 {
-
   QList<AlkData> listofrecords;
+ 
+  if( connect() ) {
   AlkData rec;
   QSqlQuery query;
   query.prepare("Select * FROM RECORD");
@@ -262,8 +260,8 @@
     rec.setTransactionType(sqldata.value("transactiontype").toInt());
 
     listofrecords.append(rec);
-
   }
+  }
 
   return listofrecords;
 }
--- trunk/playground/office/alkimia/alkdbus/AlkRecord/AlkRecord.h #1232217:1232218
@@ -24,6 +24,8 @@
 #include <QDateTime>
 #include "AlkData.h"
 
+#define ALK_TRANS_DB "alkTrans.sqlite"
+
 //! AlkRecord Class
 /**
 * This class handles all database related operations for the alkimia dbus server
@@ -87,8 +89,8 @@
   QDateTime m_duedate; /**<  duedate variable represents due date for transactions \
like invoices and payments                           */  
 
-  static QSqlDatabase db; /**<  Static Database Object  .This object handles \
                operations related to database connections    */
-  static bool connect(QString const& database);/**<  Member Function to establish a \
database connection */ +  static QSqlDatabase mDb; /**<  Static Database Object  \
.This object handles operations related to database connections    */ +  static bool \
connect();/**<  Member Function to establish a database connection */  static void \
disconnect(); /**< Member Function to destroy a database connection */  
   bool UpdateStatus(int const& tid, status const& sts);/**< Private method to Update \
                status of a record as read or unread       */
--- trunk/playground/office/alkimia/alkdbus/AlkRecord/CMakeLists.txt #1232217:1232218
@@ -6,7 +6,7 @@
 include(${QT_USE_FILE})
 add_definitions( ${QT_DEFINITIONS} )
 # tell cmake to process CMakeLists.txt in that subdirectory
-add_executable(Console main.cpp AlkRecord.h AlkRecord.cpp)
+add_executable(AlkConsole main.cpp AlkRecord.h AlkRecord.cpp)
 
 INCLUDE_DIRECTORIES(
    ${QT_INCLUDE_DIR}
@@ -25,10 +25,10 @@
 INCLUDE_DIRECTORIES(${QT_QTNETWORK_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${QT_QTTEST_INCLUDE_DIR})
 
-add_executable(Console main.cpp ${HDRS} ${SRCS} ${QM})
+add_executable(AlkConsole main.cpp ${HDRS} ${SRCS} ${QM})
 
-target_link_libraries(Console ${QT_LIBRARIES} )
-target_link_libraries(Console ${QT_QTSQL_LIBRARY})
+target_link_libraries(AlkConsole ${QT_LIBRARIES} )
+target_link_libraries(AlkConsole ${QT_QTSQL_LIBRARY})
 
 
 
--- trunk/playground/office/alkimia/alkquotes/backend/org.kde.alkimia.quotes.service \
#1232217:1232218 @@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.kde.alkimia.quotes
-Exec=/usr/bin/quotebackend
\ No newline at end of file
+Exec=/usr/local/bin/quotebackend


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