2 files changed, 35 insertions, 11 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index e04f4b1..bdc2762 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -422,174 +422,198 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
   for ( it = begin(); it != end(); ++it ) {
       // for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       if ( ! all ) {
           if ( ! ( uids.contains((*it).uid() ) ))
               continue;
       } 
       KABC::Addressee a = ( *it );
       if ( a.isEmpty() )
           continue;
       if ( all && a.resource() && !a.resource()->includeInSync() )
           continue;
       a.simplifyEmails();
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
       a.simplifyAddresses();
 
       QString vcard;
       QString vcardnew;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
       while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
           int semi = vcard.find(";", next);
           int dopp = vcard.find(":", next);
           int sep;
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           vcardnew +=vcard.mid( start, next - start);
           vcardnew +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       vcardnew += vcard.mid( start,vcard.length() );
       vcard = "";
       start = 0;
       while ( (next = vcardnew.find("ADR", start) )>= 0 ) {
           int sep = vcardnew.find(":", next);
           vcard +=vcardnew.mid( start, next - start+3);
           start = sep;
       }
       vcard += vcardnew.mid( start,vcardnew.length() );
       vcard.replace ( QRegExp(";;;") , "" );
       vcard.replace ( QRegExp(";;") , "" );
       datastream += vcard;
      
   }
   
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       QTextStream t( &outFile );  // use a text stream
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t <<datastream;
       t <<  "\r\n\r\n";
       outFile.close();
           
   } else {
       qDebug("Error open temp file ");
       return false;
   }
   return true;
 
 }
-int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
+int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld, QString resource   )
 {
 
     if ( removeOld )
-        setUntagged( true );
+        setUntagged( true, resource );
     KABC::Addressee::List list;
     QFile file( fileName );
     file.open( IO_ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
     if ( replaceLabel ) { 
         data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
         data.replace ( QRegExp("LABEL") , "ADR" );
         data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
     } else
         data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;
     list =  tool.parseVCards( data );
     KABC::Addressee::List::Iterator it;
+
+    Resource * setRes = 0;
+    if ( !resource.isEmpty() ) {
+        KRES::Manager<Resource>::ActiveIterator it;
+        KRES::Manager<Resource> *manager = d->mManager;
+        for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
+            qDebug("SaveAB::checking resource..." );
+            if ( (*it)->name() == resource  ) {
+                setRes = (*it);
+                qDebug("Inserting imported contacs to resource %s", resource.latin1());
+                break;
+            }
+        }
+    }
     for ( it = list.begin(); it != list.end(); ++it ) {
         QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
         if ( !id.isEmpty() ) 
             (*it).setIDStr(id );
-        (*it).setResource( 0 );
+        (*it).setResource(  setRes );
         if ( replaceLabel )
             (*it).removeVoice();
         if ( removeOld )
             (*it).setTagged( true );
         insertAddressee( (*it), false, true );
     }
     if ( removeOld )
         removeUntagged();
     return list.count();
 }
-void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
+void AddressBook::setUntagged(bool setNonSyncTagged, QString resource) // = false , "")
 {
     Iterator ait;
-    for ( ait = begin(); ait != end(); ++ait ) {
-        if ( setNonSyncTagged ) {
-            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
+    if ( !resource.isEmpty() ) {
+        for ( ait = begin(); ait != end(); ++ait ) {
+            if ( (*ait).resource() && (*ait).resource()->name() == resource ) {
+                (*ait).setTagged( false );
+            }
+            else
                 (*ait).setTagged( true );
+        }
+    } else {
+        for ( ait = begin(); ait != end(); ++ait ) {
+            if ( setNonSyncTagged ) {
+                if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
+                    (*ait).setTagged( true );
+                } else
+                    (*ait).setTagged( false );
             } else
                 (*ait).setTagged( false );
-        } else
-            (*ait).setTagged( false );
+        }
     }
 }
 void AddressBook::removeUntagged()
 {
   Iterator ait;
   bool todelete = false;
   Iterator todel;
   for ( ait = begin(); ait != end(); ++ait ) {
       if ( todelete )
           removeAddressee( todel );
       if (!(*ait).tagged()) {
           todelete = true;
           todel = ait;
       } else
           todelete = false;
   } 
   if ( todelete )
       removeAddressee( todel );
   deleteRemovedAddressees();
 }
 void AddressBook::smplifyAddressees() 
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).simplifyEmails();
         (*ait).simplifyPhoneNumbers();
         (*ait).simplifyPhoneNumberTypes();
         (*ait).simplifyAddresses();
     }
 }
 void AddressBook::removeSyncInfo( QString syncProfile)
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).removeID( syncProfile );
     } 
     if ( syncProfile.isEmpty() ) {
         Iterator it = begin();
         Iterator it2 ;
         while ( it != end() ) {
             if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 it2 = it;
                 //qDebug("removing %s ",(*it).uid().latin1() );
                 ++it;
                 removeAddressee( it2 );
             } else  {
                 //qDebug("skipping %s ",(*it).uid().latin1() );
                 ++it;
             }
         }
     } else { 
         Addressee lse;
         lse =  findByUid( "last-syncAddressee-"+ syncProfile );
         if ( ! lse.isEmpty() )
             removeAddressee( lse );  
     }
 
 }
 void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         QString id = (*ait).IDStr();
         (*ait).setIDStr( ":");
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 4a0d0a3..e6daa5e 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -87,130 +87,130 @@ class AddressBook : public QObject
       @short Address Book Const Iterator
 
       This class provides a const iterator for address book entries.
     */
     class ConstIterator
     {
       public:
         ConstIterator();
         ConstIterator( const ConstIterator & );
               ~ConstIterator();
 
               ConstIterator &operator=( const ConstIterator & );
         const Addressee &operator*() const;
         const Addressee* operator->() const;
         ConstIterator &operator++();
         ConstIterator &operator++(int);
         ConstIterator &operator--();
         ConstIterator &operator--(int);
         bool operator==( const ConstIterator &it );
         bool operator!=( const ConstIterator &it );
 
               struct ConstIteratorData;
         ConstIteratorData *d;
     };
 
     /**
       Constructs a address book object.
 
       @param format File format class.
     */
     AddressBook();
     AddressBook( const QString &config );
     AddressBook( const QString &config, const QString &family );
     virtual ~AddressBook();
 
     /**
       Requests a ticket for saving the addressbook. Calling this function locks
       the addressbook for all other processes. If the address book is already
       locked the function returns 0. You need the returned @ref Ticket object
       for calling the @ref save() function.
 
       @see save()
     */
     Ticket *requestSaveTicket( Resource *resource=0 );
 
     /**
       Load address book from file.
     */
     bool load();
 
     /**
       Save address book. The address book is saved to the file, the Ticket
       object has been requested for by @ref requestSaveTicket().
 
       @param ticket a ticket object returned by @ref requestSaveTicket()
     */
     bool save( Ticket *ticket );
     bool saveAB( );
     bool saveABphone( QString fileName );
     void smplifyAddressees(); 
     void removeSyncInfo( QString syncProfile); 
     void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
     void export2File( QString fileName, QString resourceName = "" );
     bool export2PhoneFormat(  QStringList uids ,QString fileName );
-    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
-    void setUntagged( bool setNonSyncTagged = false );
+    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false, QString resource = "" );
+    void setUntagged( bool setNonSyncTagged = false, QString resource = "" );
     void removeUntagged();
     void findNewExtIds(  QString fileName, QString currentSyncDevice  );
     /**
       Returns a iterator for first entry of address book.
     */
     Iterator begin();
 
     /**
       Returns a const iterator for first entry of address book.
     */
     ConstIterator begin() const;
 
     /**
       Returns a iterator for first entry of address book.
     */
     Iterator end();
 
     /**
       Returns a const iterator for first entry of address book.
     */
     ConstIterator end() const;
 
     /**
       Removes all entries from address book.
     */
     void clear();
 
     /**
       Insert an Addressee object into address book. If an object with the same
       unique id already exists in the address book it it replaced by the new
       one. If not the new object is appended to the address book.
     */
     void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false);
 
     /**
       Removes entry from the address book.
     */
     void removeAddressee( const Addressee & );
 
     /**
       This is like @ref removeAddressee() just above, with the difference that
       the first element is a iterator, returned by @ref begin().
     */
     void removeAddressee( const Iterator & );
 
     /**
       Find the specified entry in address book. Returns end(), if the entry
       couldn't be found.
     */
     Iterator find( const Addressee & );
 
     /**
       Find the entry specified by an unique id. Returns an empty Addressee
       object, if the address book does not contain an entry with this id.
     */
     Addressee findByUid( const QString & );
 
 
     /**
       Returns a list of all addressees in the address book. This list can
       be sorted with @ref KABC::AddresseeList for example.
     */
     Addressee::List allAddressees();