summaryrefslogtreecommitdiffabout
path: root/kabc/plugins
authorzautrix <zautrix>2005-01-26 01:11:54 (UTC)
committer zautrix <zautrix>2005-01-26 01:11:54 (UTC)
commitab91893abef351f53275248a50032a6d5175132a (patch) (side-by-side diff)
tree7ecb1aba3741dbffb34ad28787538db942e4d448 /kabc/plugins
parentc3ec0a5a43fb328f2d190b8adee1ef662746fb41 (diff)
downloadkdepimpi-ab91893abef351f53275248a50032a6d5175132a.zip
kdepimpi-ab91893abef351f53275248a50032a6d5175132a.tar.gz
kdepimpi-ab91893abef351f53275248a50032a6d5175132a.tar.bz2
fixes
Diffstat (limited to 'kabc/plugins') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.cpp4
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.cpp52
2 files changed, 7 insertions, 49 deletions
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 6413b42..e8f8bdd 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -140,3 +140,3 @@ bool ResourceSharpDTM::load()
SlZDataBase::addressbookItems(),
- 0, false);
+ 0, true);
}
@@ -145,3 +145,3 @@ bool ResourceSharpDTM::load()
- qDebug("%xResourceSharpDTM::load: %s",this, fileName().latin1());
+ qDebug("ResourceSharpDTM:: %x load: %s",this, fileName().latin1());
bool res = false;
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 95e16b6..4adcae4 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -422,3 +422,3 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
ids[index] = catDB->id(list[i]);
- qDebug("set ex cat %d %s ",ids[index] , list[i].latin1());
+ //qDebug("set exist cat %d %s ",ids[index] , list[i].latin1());
index++;
@@ -426,3 +426,3 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
ids[index] = catDB->addCategory(list[i]);
- qDebug("add new cat %d %s ",ids[index] , list[i].latin1());
+ //qDebug("add new cat %d %s ",ids[index] , list[i].latin1());
index++;
@@ -431,6 +431,5 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
bool res ;
- if ( res = database->updateCategories(contact, ids) )
- qDebug("cat updated ");
- else
- qDebug("error cat updating ");
+
+ if ( !(res = database->updateCategories(contact, ids) ))
+ qDebug("SharpDTMConverter::Error updating categories");
@@ -439,43 +438,2 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
-#if 0
- m_pCategories = new SlCategories;
-catDB
-
- if(categories == QString::null) return true;
- QStringList list = CSVParser::parse(categories);
- QArray<int> ids(list.count());
- uint index = 0;
- for(uint i=0; i<ids.size(); i++){
-#if 0
- bool ok;
- ids[index] = list[i].toInt(&ok);
- if(ok){
- index++;
- } else {
- if(m_pCategories->exists(list[i])){
- ids[index] = m_pCategories->id(list[i]);
- index++;
- }
- }
-#else
- if(m_pCategories->exists(list[i])){
- ids[index] = m_pCategories->id(list[i]);
- index++;
- } else if(m_addCategory){
- ids[index] = m_pCategories->addCategory(list[i]);
- index++;
- }
-#endif
- }
- if(ids.size() > 0 && index == 0){
- return true;
- } else if(index != ids.size()){
- ids.resize(index);
- }
- if(!m_pZdb->updateCategories(id, ids)){
- return false;
- }
- return true;
-#endif
-
QDate SharpDTMConverter::convertDate( QString s)