summaryrefslogtreecommitdiffabout
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
parentc3ec0a5a43fb328f2d190b8adee1ef662746fb41 (diff)
downloadkdepimpi-ab91893abef351f53275248a50032a6d5175132a.zip
kdepimpi-ab91893abef351f53275248a50032a6d5175132a.tar.gz
kdepimpi-ab91893abef351f53275248a50032a6d5175132a.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp10
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.cpp4
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.cpp52
3 files changed, 12 insertions, 54 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 9e61261..f3744bc 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -669,32 +669,32 @@ bool AddressBook::saveAB()
KRES::Manager<Resource>::ActiveIterator it;
KRES::Manager<Resource> *manager = d->mManager;
qDebug("SaveAB::saving..." );
for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
qDebug("SaveAB::checking resource..." );
if ( (*it)->readOnly() )
- qDebug("resource is readonly." );
+ qDebug("SaveAB::resource is readonly." );
if ( (*it)->isOpen() )
- qDebug("resource is open" );
+ qDebug("SaveAB::resource is open" );
if ( !(*it)->readOnly() && (*it)->isOpen() ) {
Ticket *ticket = requestSaveTicket( *it );
- qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
+ qDebug("SaveAB::StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
if ( !ticket ) {
- qDebug( i18n( "Unable to save to resource '%1'. It is locked." )
+ qDebug( i18n( "SaveAB::Unable to save to resource '%1'. It is locked." )
.arg( (*it)->resourceName() ) );
return false;
}
//if ( !save( ticket ) )
if ( ticket->resource() ) {
QString name = ticket->resource()->resourceName();
if ( ! ticket->resource()->save( ticket ) )
ok = false;
else
- qDebug("StdAddressBook::resource saved '%s'", name.latin1() );
+ qDebug("SaveAB::resource saved '%s'", name.latin1() );
} else
ok = false;
}
}
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
@@ -135,18 +135,18 @@ bool ResourceSharpDTM::load()
if (!mConverter)
return false;
QString fileN = SlZDataBase::addressbookFileName();
if ( ! mAccess ) {
mAccess = new SlZDataBase(fileN,
SlZDataBase::addressbookItems(),
- 0, false);
+ 0, true);
}
if(mAccess == 0)
return false;
- qDebug("%xResourceSharpDTM::load: %s",this, fileName().latin1());
+ qDebug("ResourceSharpDTM:: %x load: %s",this, fileName().latin1());
bool res = false;
CardId id;
for (bool res=mAccess->first(); res == true; res=mAccess->next())
{
id = mAccess->cardId();
KABC::Addressee addressee;
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
@@ -417,70 +417,28 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
QArray<int> ids(list.count());
uint index = 0;
for(uint i=0; i<ids.size(); i++){
if(catDB->exists(list[i])){
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++;
} else {
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++;
}
}
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");
return res;
}
-#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)
{
QDate dt = KGlobal::locale()->readDate( s );
return dt;
return QDate ();
}