summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/opimcache.h4
-rw-r--r--libopie/pim/otodoaccesssql.cpp81
-rw-r--r--libopie/pim/otodoaccesssql.h3
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.cpp81
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.h3
-rw-r--r--libopie2/opiepim/core/opimcache.h4
6 files changed, 162 insertions, 14 deletions
diff --git a/libopie/pim/opimcache.h b/libopie/pim/opimcache.h
index 067f6e7..839550c 100644
--- a/libopie/pim/opimcache.h
+++ b/libopie/pim/opimcache.h
@@ -58,13 +58,15 @@ T OPimCacheItem<T>::record()const {
template <class T>
void OPimCacheItem<T>::setRecord( const T& t ) {
m_t = t;
}
// Cache
template <class T>
-OPimCache<T>::OPimCache() {
+OPimCache<T>::OPimCache()
+ : m_cache(100, 53 )
+{
m_cache.setAutoDelete( TRUE );
}
template <class T>
OPimCache<T>::~OPimCache() {
}
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp
index 8add9f7..a059dab 100644
--- a/libopie/pim/otodoaccesssql.cpp
+++ b/libopie/pim/otodoaccesssql.cpp
@@ -78,15 +78,19 @@ namespace {
/**
* a find query
*/
class FindQuery : public OSQLQuery {
public:
FindQuery(int uid);
+ FindQuery(const QArray<int>& );
~FindQuery();
QString query()const;
private:
+ QString single()const;
+ QString multi()const;
+ QArray<int> m_uids;
int m_uid;
};
/**
* overdue query
*/
@@ -135,12 +139,13 @@ namespace {
}
/*
* converts from a OTodo to a query
* we leave out X-Ref + Alarms
*/
QString InsertQuery::query()const{
+
int year, month, day;
year = month = day = 0;
if (m_todo.hasDueDate() ) {
QDate date = m_todo.dueDate();
year = date.year();
month = date.month();
@@ -172,19 +177,37 @@ namespace {
QString qu = "drop table todolist";
return qu;
}
FindQuery::FindQuery(int uid)
: OSQLQuery(), m_uid(uid ) {
}
+ FindQuery::FindQuery(const QArray<int>& ints)
+ : OSQLQuery(), m_uids(ints){
+ }
FindQuery::~FindQuery() {
}
QString FindQuery::query()const{
+ if (m_uids.count() == 0 )
+ return single();
+ else
+ return multi();
+ }
+ QString FindQuery::single()const{
QString qu = "select uid, categories, completed, progress, summary, ";
qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid);
return qu;
}
+ QString FindQuery::multi()const {
+ QString qu = "select uid, categories, completed, progress, summary, ";
+ qu += "DueDate, priority, description from todolist where ";
+ for (uint i = 0; i < m_uids.count(); i++ ) {
+ qu += " UID = " + QString::number( m_uids[i] ) + " OR";
+ }
+ qu.remove( qu.length()-2, 2 );
+ return qu;
+ }
OverDueQuery::OverDueQuery(): OSQLQuery() {}
OverDueQuery::~OverDueQuery() {}
QString OverDueQuery::query()const {
QDate date = QDate::currentDate();
QString str;
@@ -258,12 +281,45 @@ QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int ){
}
OTodo OTodoAccessBackendSQL::find(int uid ) const{
FindQuery query( uid );
return todo( m_driver->query(&query) );
}
+OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
+ uint cur, Frontend::CacheDirection dir ) const{
+ qWarning("searching for %d", uid );
+ QArray<int> search( 8 );
+ uint size =0;
+ OTodo to;
+
+ // we try to cache 8 items
+ switch( dir ) {
+ /* forward */
+ case 0:
+ for (uint i = cur; i < ints.count() && size < 8; i++ ) {
+ qWarning("size %d %d", size, ints[i] );
+ search[size] = ints[i];
+ size++;
+ }
+ break;
+ /* reverse */
+ case 1:
+ for (uint i = cur; i >= 0 && size < 8; i-- ) {
+ search[size] = ints[i];
+ size++;
+ }
+ break;
+ }
+ search.resize( size );
+ FindQuery query( search );
+ OSQLResult res = m_driver->query( &query );
+ if ( res.state() != OSQLResult::Success )
+ return to;
+
+ return todo( res );
+}
void OTodoAccessBackendSQL::clear() {
ClearQuery cle;
OSQLResult res = m_driver->query( &cle );
CreateQuery qu;
res = m_driver->query(&qu);
}
@@ -390,20 +446,33 @@ OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{
OTodo to;
return to;
}
OSQLResultItem::ValueList list = res.results();
OSQLResultItem::ValueList::Iterator it = list.begin();
-
+ qWarning("todo1");
+ OTodo to = todo( (*it) );
+ cache( to );
+ ++it;
+
+ for ( ; it != list.end(); ++it ) {
+ qWarning("caching");
+ cache( todo( (*it) ) );
+ }
+ return to;
+}
+OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
+ qWarning("todo");
bool has = false; QDate da = QDate::currentDate();
- has = date( da, (*it).data("DueDate") );
- QStringList cats = QStringList::split(";", (*it).data("categories") );
+ has = date( da, item.data("DueDate") );
+ QStringList cats = QStringList::split(";", item.data("categories") );
- OTodo to( (bool)(*it).data("completed").toInt(), (*it).data("priority").toInt(),
- cats, (*it).data("summary"), (*it).data("description"),
- (*it).data("progress").toUShort(), has, da, (*it).data("uid").toInt() );
+ OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
+ cats, item.data("summary"), item.data("description"),
+ item.data("progress").toUShort(), has, da,
+ item.data("uid").toInt() );
return to;
}
OTodo OTodoAccessBackendSQL::todo( int uid )const {
FindQuery find( uid );
return todo( m_driver->query(&find) );
}
diff --git a/libopie/pim/otodoaccesssql.h b/libopie/pim/otodoaccesssql.h
index 6c5f50a..c1aa2ed 100644
--- a/libopie/pim/otodoaccesssql.h
+++ b/libopie/pim/otodoaccesssql.h
@@ -4,24 +4,26 @@
#include <qasciidict.h>
#include "otodoaccessbackend.h"
class OSQLDriver;
class OSQLResult;
+class OSQLResultItem;
class OTodoAccessBackendSQL : public OTodoAccessBackend {
public:
OTodoAccessBackendSQL( const QString& file );
~OTodoAccessBackendSQL();
bool load();
bool reload();
bool save();
QArray<int> allRecords()const;
QArray<int> queryByExample( const OTodo& t, int sort );
OTodo find(int uid)const;
+ OTodo find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
void clear();
bool add( const OTodo& t );
bool remove( int uid );
bool replace( const OTodo& t );
QArray<int> overDue();
@@ -31,12 +33,13 @@ public:
private:
void update();
void fillDict();
inline bool date( QDate& date, const QString& )const;
inline OTodo todo( const OSQLResult& )const;
+ inline OTodo todo( OSQLResultItem& )const;
inline QArray<int> uids( const OSQLResult& )const;
OTodo todo( int uid )const;
QAsciiDict<int> m_dict;
OSQLDriver* m_driver;
QArray<int> m_uids;
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 8add9f7..a059dab 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -78,15 +78,19 @@ namespace {
/**
* a find query
*/
class FindQuery : public OSQLQuery {
public:
FindQuery(int uid);
+ FindQuery(const QArray<int>& );
~FindQuery();
QString query()const;
private:
+ QString single()const;
+ QString multi()const;
+ QArray<int> m_uids;
int m_uid;
};
/**
* overdue query
*/
@@ -135,12 +139,13 @@ namespace {
}
/*
* converts from a OTodo to a query
* we leave out X-Ref + Alarms
*/
QString InsertQuery::query()const{
+
int year, month, day;
year = month = day = 0;
if (m_todo.hasDueDate() ) {
QDate date = m_todo.dueDate();
year = date.year();
month = date.month();
@@ -172,19 +177,37 @@ namespace {
QString qu = "drop table todolist";
return qu;
}
FindQuery::FindQuery(int uid)
: OSQLQuery(), m_uid(uid ) {
}
+ FindQuery::FindQuery(const QArray<int>& ints)
+ : OSQLQuery(), m_uids(ints){
+ }
FindQuery::~FindQuery() {
}
QString FindQuery::query()const{
+ if (m_uids.count() == 0 )
+ return single();
+ else
+ return multi();
+ }
+ QString FindQuery::single()const{
QString qu = "select uid, categories, completed, progress, summary, ";
qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid);
return qu;
}
+ QString FindQuery::multi()const {
+ QString qu = "select uid, categories, completed, progress, summary, ";
+ qu += "DueDate, priority, description from todolist where ";
+ for (uint i = 0; i < m_uids.count(); i++ ) {
+ qu += " UID = " + QString::number( m_uids[i] ) + " OR";
+ }
+ qu.remove( qu.length()-2, 2 );
+ return qu;
+ }
OverDueQuery::OverDueQuery(): OSQLQuery() {}
OverDueQuery::~OverDueQuery() {}
QString OverDueQuery::query()const {
QDate date = QDate::currentDate();
QString str;
@@ -258,12 +281,45 @@ QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int ){
}
OTodo OTodoAccessBackendSQL::find(int uid ) const{
FindQuery query( uid );
return todo( m_driver->query(&query) );
}
+OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
+ uint cur, Frontend::CacheDirection dir ) const{
+ qWarning("searching for %d", uid );
+ QArray<int> search( 8 );
+ uint size =0;
+ OTodo to;
+
+ // we try to cache 8 items
+ switch( dir ) {
+ /* forward */
+ case 0:
+ for (uint i = cur; i < ints.count() && size < 8; i++ ) {
+ qWarning("size %d %d", size, ints[i] );
+ search[size] = ints[i];
+ size++;
+ }
+ break;
+ /* reverse */
+ case 1:
+ for (uint i = cur; i >= 0 && size < 8; i-- ) {
+ search[size] = ints[i];
+ size++;
+ }
+ break;
+ }
+ search.resize( size );
+ FindQuery query( search );
+ OSQLResult res = m_driver->query( &query );
+ if ( res.state() != OSQLResult::Success )
+ return to;
+
+ return todo( res );
+}
void OTodoAccessBackendSQL::clear() {
ClearQuery cle;
OSQLResult res = m_driver->query( &cle );
CreateQuery qu;
res = m_driver->query(&qu);
}
@@ -390,20 +446,33 @@ OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{
OTodo to;
return to;
}
OSQLResultItem::ValueList list = res.results();
OSQLResultItem::ValueList::Iterator it = list.begin();
-
+ qWarning("todo1");
+ OTodo to = todo( (*it) );
+ cache( to );
+ ++it;
+
+ for ( ; it != list.end(); ++it ) {
+ qWarning("caching");
+ cache( todo( (*it) ) );
+ }
+ return to;
+}
+OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
+ qWarning("todo");
bool has = false; QDate da = QDate::currentDate();
- has = date( da, (*it).data("DueDate") );
- QStringList cats = QStringList::split(";", (*it).data("categories") );
+ has = date( da, item.data("DueDate") );
+ QStringList cats = QStringList::split(";", item.data("categories") );
- OTodo to( (bool)(*it).data("completed").toInt(), (*it).data("priority").toInt(),
- cats, (*it).data("summary"), (*it).data("description"),
- (*it).data("progress").toUShort(), has, da, (*it).data("uid").toInt() );
+ OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
+ cats, item.data("summary"), item.data("description"),
+ item.data("progress").toUShort(), has, da,
+ item.data("uid").toInt() );
return to;
}
OTodo OTodoAccessBackendSQL::todo( int uid )const {
FindQuery find( uid );
return todo( m_driver->query(&find) );
}
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index 6c5f50a..c1aa2ed 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -4,24 +4,26 @@
#include <qasciidict.h>
#include "otodoaccessbackend.h"
class OSQLDriver;
class OSQLResult;
+class OSQLResultItem;
class OTodoAccessBackendSQL : public OTodoAccessBackend {
public:
OTodoAccessBackendSQL( const QString& file );
~OTodoAccessBackendSQL();
bool load();
bool reload();
bool save();
QArray<int> allRecords()const;
QArray<int> queryByExample( const OTodo& t, int sort );
OTodo find(int uid)const;
+ OTodo find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
void clear();
bool add( const OTodo& t );
bool remove( int uid );
bool replace( const OTodo& t );
QArray<int> overDue();
@@ -31,12 +33,13 @@ public:
private:
void update();
void fillDict();
inline bool date( QDate& date, const QString& )const;
inline OTodo todo( const OSQLResult& )const;
+ inline OTodo todo( OSQLResultItem& )const;
inline QArray<int> uids( const OSQLResult& )const;
OTodo todo( int uid )const;
QAsciiDict<int> m_dict;
OSQLDriver* m_driver;
QArray<int> m_uids;
diff --git a/libopie2/opiepim/core/opimcache.h b/libopie2/opiepim/core/opimcache.h
index 067f6e7..839550c 100644
--- a/libopie2/opiepim/core/opimcache.h
+++ b/libopie2/opiepim/core/opimcache.h
@@ -58,13 +58,15 @@ T OPimCacheItem<T>::record()const {
template <class T>
void OPimCacheItem<T>::setRecord( const T& t ) {
m_t = t;
}
// Cache
template <class T>
-OPimCache<T>::OPimCache() {
+OPimCache<T>::OPimCache()
+ : m_cache(100, 53 )
+{
m_cache.setAutoDelete( TRUE );
}
template <class T>
OPimCache<T>::~OPimCache() {
}