fixes

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
@@ -667,36 +667,36 @@ 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;
           
     }
   }
   return ok;
 }
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
@@ -133,22 +133,22 @@ void ResourceSharpDTM::doClose()
 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;
             res = mConverter->sharpToAddressee( id, mAccess, addressee );
             if ( !addressee.isEmpty() && res )
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
@@ -415,72 +415,30 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab
 {  
     QStringList list = addr.categories();
 
 	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 ");
-
-    return res;
-}
 
-#if 0
-	m_pCategories = new SlCategories;
-catDB
+    if ( !(res = database->updateCategories(contact, ids) ))
+        qDebug("SharpDTMConverter::Error updating categories");
 
-	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 res;
 	}
-	return true;
-#endif
 
 QDate SharpDTMConverter::convertDate( QString  s)
 {
     QDate dt = KGlobal::locale()->readDate( s ); 
     return dt;
     return QDate ();
 }