-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 1 | ||||
-rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 6cd63fd..163f2b4 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp | |||
@@ -102,193 +102,192 @@ ResourceFile::ResourceFile( const QString &fileName, bool syncable , | |||
102 | : Resource( 0, syncable ) | 102 | : Resource( 0, syncable ) |
103 | { | 103 | { |
104 | // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); | 104 | // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); |
105 | init( fileName, formatName ); | 105 | init( fileName, formatName ); |
106 | } | 106 | } |
107 | 107 | ||
108 | void ResourceFile::init( const QString &fileName, const QString &formatName ) | 108 | void ResourceFile::init( const QString &fileName, const QString &formatName ) |
109 | { | 109 | { |
110 | mFormatName = formatName; | 110 | mFormatName = formatName; |
111 | 111 | ||
112 | FormatFactory *factory = FormatFactory::self(); | 112 | FormatFactory *factory = FormatFactory::self(); |
113 | mFormat = factory->format( mFormatName ); | 113 | mFormat = factory->format( mFormatName ); |
114 | 114 | ||
115 | if ( !mFormat ) { | 115 | if ( !mFormat ) { |
116 | mFormatName = "vcard"; | 116 | mFormatName = "vcard"; |
117 | mFormat = factory->format( mFormatName ); | 117 | mFormat = factory->format( mFormatName ); |
118 | } | 118 | } |
119 | 119 | ||
120 | #ifndef NO_DIRWATCH | 120 | #ifndef NO_DIRWATCH |
121 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); | 121 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); |
122 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); | 122 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); |
123 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 123 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
124 | #endif | 124 | #endif |
125 | setFileName( fileName ); | 125 | setFileName( fileName ); |
126 | } | 126 | } |
127 | 127 | ||
128 | ResourceFile::~ResourceFile() | 128 | ResourceFile::~ResourceFile() |
129 | { | 129 | { |
130 | delete mFormat; | 130 | delete mFormat; |
131 | mFormat = 0; | 131 | mFormat = 0; |
132 | } | 132 | } |
133 | 133 | ||
134 | void ResourceFile::writeConfig( KConfig *config ) | 134 | void ResourceFile::writeConfig( KConfig *config ) |
135 | { | 135 | { |
136 | 136 | ||
137 | config->setGroup( "Resource_" + identifier() ); | 137 | config->setGroup( "Resource_" + identifier() ); |
138 | Resource::writeConfig( config ); | 138 | Resource::writeConfig( config ); |
139 | 139 | ||
140 | config->writeEntry( "FileName", mFileName ); | 140 | config->writeEntry( "FileName", mFileName ); |
141 | config->writeEntry( "FileFormat", mFormatName ); | 141 | config->writeEntry( "FileFormat", mFormatName ); |
142 | 142 | ||
143 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 143 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
144 | 144 | ||
145 | } | 145 | } |
146 | 146 | ||
147 | Ticket *ResourceFile::requestSaveTicket() | 147 | Ticket *ResourceFile::requestSaveTicket() |
148 | { | 148 | { |
149 | kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl; | 149 | kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl; |
150 | 150 | ||
151 | if ( !addressBook() ) return 0; | 151 | if ( !addressBook() ) return 0; |
152 | 152 | ||
153 | #ifdef ALLOW_LOCKING | 153 | #ifdef ALLOW_LOCKING |
154 | if ( !lock( mFileName ) ) { | 154 | if ( !lock( mFileName ) ) { |
155 | qDebug("unablt to lock file "); | 155 | qDebug("unablt to lock file "); |
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | #endif | 158 | #endif |
159 | return createTicket( this ); | 159 | return createTicket( this ); |
160 | } | 160 | } |
161 | 161 | ||
162 | 162 | ||
163 | bool ResourceFile::doOpen() | 163 | bool ResourceFile::doOpen() |
164 | { | 164 | { |
165 | QFile file( mFileName ); | 165 | QFile file( mFileName ); |
166 | qDebug("ResourceFile::openfile %s ", mFileName.latin1()); | 166 | qDebug("ResourceFile::openfile %s ", mFileName.latin1()); |
167 | 167 | ||
168 | if ( !file.exists() ) { | 168 | if ( !file.exists() ) { |
169 | // try to create the file | 169 | // try to create the file |
170 | bool ok = file.open( IO_WriteOnly ); | 170 | bool ok = file.open( IO_WriteOnly ); |
171 | if ( ok ) | 171 | if ( ok ) |
172 | file.close(); | 172 | file.close(); |
173 | 173 | ||
174 | return ok; | 174 | return ok; |
175 | } else { | 175 | } else { |
176 | if ( !file.open( IO_ReadWrite ) ) | 176 | if ( !file.open( IO_ReadWrite ) ) |
177 | return false; | 177 | return false; |
178 | 178 | ||
179 | if ( file.size() == 0 ) { | 179 | if ( file.size() == 0 ) { |
180 | file.close(); | 180 | file.close(); |
181 | return true; | 181 | return true; |
182 | } | 182 | } |
183 | 183 | ||
184 | bool ok = mFormat->checkFormat( &file ); | 184 | bool ok = mFormat->checkFormat( &file ); |
185 | file.close(); | 185 | file.close(); |
186 | 186 | ||
187 | return ok; | 187 | return ok; |
188 | } | 188 | } |
189 | } | 189 | } |
190 | 190 | ||
191 | void ResourceFile::doClose() | 191 | void ResourceFile::doClose() |
192 | { | 192 | { |
193 | } | 193 | } |
194 | 194 | ||
195 | bool ResourceFile::load() | 195 | bool ResourceFile::load() |
196 | { | 196 | { |
197 | 197 | ||
198 | qDebug("ResourceFile::loadfile %s ", mFileName.latin1()); | ||
199 | QFile file( mFileName ); | 198 | QFile file( mFileName ); |
200 | if ( !file.open( IO_ReadOnly ) ) { | 199 | if ( !file.open( IO_ReadOnly ) ) { |
201 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); | 200 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); |
202 | return false; | 201 | return false; |
203 | } | 202 | } |
204 | 203 | ||
205 | // qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 204 | // qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
206 | 205 | ||
207 | return mFormat->loadAll( addressBook(), this, &file ); | 206 | return mFormat->loadAll( addressBook(), this, &file ); |
208 | } | 207 | } |
209 | 208 | ||
210 | bool ResourceFile::save( Ticket *ticket ) | 209 | bool ResourceFile::save( Ticket *ticket ) |
211 | { | 210 | { |
212 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 211 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
213 | 212 | ||
214 | 213 | ||
215 | // create backup file | 214 | // create backup file |
216 | QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); | 215 | QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); |
217 | 216 | ||
218 | /*US we use a simpler method to create a backupfile | 217 | /*US we use a simpler method to create a backupfile |
219 | 218 | ||
220 | (void) KSaveFile::backupFile( mFileName, QString::null | 219 | (void) KSaveFile::backupFile( mFileName, QString::null |
221 | ,extension ); | 220 | ,extension ); |
222 | 221 | ||
223 | KSaveFile saveFile( mFileName ); | 222 | KSaveFile saveFile( mFileName ); |
224 | bool ok = false; | 223 | bool ok = false; |
225 | if ( saveFile.status() == 0 && saveFile.file() ) | 224 | if ( saveFile.status() == 0 && saveFile.file() ) |
226 | { | 225 | { |
227 | mFormat->saveAll( addressBook(), this, saveFile.file() ); | 226 | mFormat->saveAll( addressBook(), this, saveFile.file() ); |
228 | ok = saveFile.close(); | 227 | ok = saveFile.close(); |
229 | } | 228 | } |
230 | */ | 229 | */ |
231 | 230 | ||
232 | //US ToDo: write backupfile | 231 | //US ToDo: write backupfile |
233 | #ifndef NO_DIRWATCH | 232 | #ifndef NO_DIRWATCH |
234 | mDirWatch.stopScan(); | 233 | mDirWatch.stopScan(); |
235 | #endif | 234 | #endif |
236 | QFile info; | 235 | QFile info; |
237 | info.setName( mFileName ); | 236 | info.setName( mFileName ); |
238 | bool ok = info.open( IO_WriteOnly ); | 237 | bool ok = info.open( IO_WriteOnly ); |
239 | if ( ok ) { | 238 | if ( ok ) { |
240 | mFormat->saveAll( addressBook(), this, &info ); | 239 | mFormat->saveAll( addressBook(), this, &info ); |
241 | 240 | ||
242 | info.close(); | 241 | info.close(); |
243 | ok = true; | 242 | ok = true; |
244 | } | 243 | } |
245 | else { | 244 | else { |
246 | 245 | ||
247 | } | 246 | } |
248 | 247 | ||
249 | if ( !ok ) | 248 | if ( !ok ) |
250 | addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); | 249 | addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); |
251 | #ifndef NO_DIRWATCH | 250 | #ifndef NO_DIRWATCH |
252 | mDirWatch.startScan(); | 251 | mDirWatch.startScan(); |
253 | #endif | 252 | #endif |
254 | delete ticket; | 253 | delete ticket; |
255 | #ifdef ALLOW_LOCKING | 254 | #ifdef ALLOW_LOCKING |
256 | unlock( mFileName ); | 255 | unlock( mFileName ); |
257 | #endif | 256 | #endif |
258 | 257 | ||
259 | return ok; | 258 | return ok; |
260 | } | 259 | } |
261 | 260 | ||
262 | bool ResourceFile::lock( const QString &fileName ) | 261 | bool ResourceFile::lock( const QString &fileName ) |
263 | { | 262 | { |
264 | #ifdef ALLOW_LOCKING | 263 | #ifdef ALLOW_LOCKING |
265 | 264 | ||
266 | 265 | ||
267 | QString fn = fileName; | 266 | QString fn = fileName; |
268 | 267 | ||
269 | //US change the implementation how the lockfilename is getting created | 268 | //US change the implementation how the lockfilename is getting created |
270 | //US fn.replace( QRegExp("/"), "_" ); | 269 | //US fn.replace( QRegExp("/"), "_" ); |
271 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | 270 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); |
272 | 271 | ||
273 | KURL url(fn); | 272 | KURL url(fn); |
274 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 273 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
275 | 274 | ||
276 | 275 | ||
277 | 276 | ||
278 | if (QFile::exists( lockName )) return false; | 277 | if (QFile::exists( lockName )) return false; |
279 | 278 | ||
280 | QString lockUniqueName; | 279 | QString lockUniqueName; |
281 | lockUniqueName = fn + KApplication::randomString( 8 ); | 280 | lockUniqueName = fn + KApplication::randomString( 8 ); |
282 | 281 | ||
283 | url = lockUniqueName; | 282 | url = lockUniqueName; |
284 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); | 283 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); |
285 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); | 284 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); |
286 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; | 285 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; |
287 | 286 | ||
288 | // Create unique file | 287 | // Create unique file |
289 | QFile file( mLockUniqueName ); | 288 | QFile file( mLockUniqueName ); |
290 | file.open( IO_WriteOnly ); | 289 | file.open( IO_WriteOnly ); |
291 | file.close(); | 290 | file.close(); |
292 | 291 | ||
293 | // Create lock file | 292 | // Create lock file |
294 | int result = 0; | 293 | int result = 0; |
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp index d36df20..6418b54 100644 --- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp +++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp | |||
@@ -219,226 +219,226 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
219 | //personal | 219 | //personal |
220 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) ); | 220 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) ); |
221 | 221 | ||
222 | QString gen = db->readField(ZdbAdrs::Gender); | 222 | QString gen = db->readField(ZdbAdrs::Gender); |
223 | //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); | 223 | //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); |
224 | //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); | 224 | //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); |
225 | 225 | ||
226 | if (gen == "male") | 226 | if (gen == "male") |
227 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); | 227 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); |
228 | else if (gen == "female") | 228 | else if (gen == "female") |
229 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); | 229 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); |
230 | 230 | ||
231 | 231 | ||
232 | QDate ann = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Anniversary) ); | 232 | QDate ann = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Anniversary) ); |
233 | if (ann.isValid()) { | 233 | if (ann.isValid()) { |
234 | QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate); | 234 | QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate); |
235 | //qDebug("qtopiaToAddressee annyversary found:%s", dt.latin1()); | 235 | //qDebug("qtopiaToAddressee annyversary found:%s", dt.latin1()); |
236 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 236 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
237 | } | 237 | } |
238 | 238 | ||
239 | 239 | ||
240 | addr.insertCustom( "KADDRESSBOOK", "X-Children", db->readField(ZdbAdrs::Children) ); | 240 | addr.insertCustom( "KADDRESSBOOK", "X-Children", db->readField(ZdbAdrs::Children) ); |
241 | 241 | ||
242 | 242 | ||
243 | QDate birthd = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Birthday) ); | 243 | QDate birthd = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Birthday) ); |
244 | //qDebug("birtd %s ", birthd.toString().latin1()); | 244 | //qDebug("birtd %s ", birthd.toString().latin1()); |
245 | if (birthd.isValid()) | 245 | if (birthd.isValid()) |
246 | addr.setBirthday( birthd ); | 246 | addr.setBirthday( birthd ); |
247 | 247 | ||
248 | addr.setNickName( db->readField(ZdbAdrs::Nickname) ); | 248 | addr.setNickName( db->readField(ZdbAdrs::Nickname) ); |
249 | 249 | ||
250 | // others | 250 | // others |
251 | //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available. | 251 | //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available. |
252 | QString notes = db->readField(ZdbAdrs::Notes); | 252 | QString notes = db->readField(ZdbAdrs::Notes); |
253 | //notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n"; | 253 | //notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n"; |
254 | if ( addr.url().isEmpty() ) | 254 | if ( addr.url().isEmpty() ) |
255 | addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) ); | 255 | addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) ); |
256 | addr.setNote( db->readField(ZdbAdrs::Notes) ); | 256 | addr.setNote( db->readField(ZdbAdrs::Notes) ); |
257 | 257 | ||
258 | 258 | ||
259 | 259 | ||
260 | //US QString groups() const { return find( Qtopia::Groups ); } | 260 | //US QString groups() const { return find( Qtopia::Groups ); } |
261 | //US QStringList groupList() const; | 261 | //US QStringList groupList() const; |
262 | 262 | ||
263 | //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" ); | 263 | //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" ); |
264 | QArray<int> catArray = db->readCategories(); | 264 | QArray<int> catArray = db->readCategories(); |
265 | QString cat; | 265 | QString cat; |
266 | 266 | ||
267 | for ( unsigned int i=0; i < catArray.size(); i++ ) { | 267 | for ( unsigned int i=0; i < catArray.size(); i++ ) { |
268 | cat = catDB->label(catArray[i]); | 268 | cat = catDB->label(catArray[i]); |
269 | if ( cat.isEmpty() ) | 269 | if ( cat.isEmpty() ) |
270 | addr.insertCategory(QString::number(catArray[i])); | 270 | addr.insertCategory(QString::number(catArray[i])); |
271 | else | 271 | else |
272 | addr.insertCategory( cat ); | 272 | addr.insertCategory( cat ); |
273 | } | 273 | } |
274 | 274 | ||
275 | return true; | 275 | return true; |
276 | } | 276 | } |
277 | 277 | ||
278 | bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) | 278 | bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) |
279 | { | 279 | { |
280 | bool cellHome = false, cellWork = false; | 280 | bool cellHome = false, cellWork = false; |
281 | // name | 281 | // name |
282 | database->writeField(ZdbAdrs::LastName, addr.familyName()); | 282 | database->writeField(ZdbAdrs::LastName, addr.familyName()); |
283 | database->writeField(ZdbAdrs::FirstName, addr.givenName()); | 283 | database->writeField(ZdbAdrs::FirstName, addr.givenName()); |
284 | database->writeField(ZdbAdrs::MiddleName, addr.additionalName()); | 284 | database->writeField(ZdbAdrs::MiddleName, addr.additionalName()); |
285 | database->writeField(ZdbAdrs::Title, addr.prefix()); | 285 | database->writeField(ZdbAdrs::Title, addr.prefix()); |
286 | database->writeField(ZdbAdrs::Suffix, addr.suffix()); | 286 | database->writeField(ZdbAdrs::Suffix, addr.suffix()); |
287 | 287 | ||
288 | //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); | 288 | //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); |
289 | QString formattedName = addr.formattedName(); | 289 | QString formattedName = addr.formattedName(); |
290 | if ( formattedName.isEmpty() ) { | 290 | if ( formattedName.isEmpty() ) { |
291 | if ( !addr.familyName().isEmpty() ) { | 291 | if ( !addr.familyName().isEmpty() ) { |
292 | formattedName = addr.familyName(); | 292 | formattedName = addr.familyName(); |
293 | if ( !addr.givenName().isEmpty() ) { | 293 | if ( !addr.givenName().isEmpty() ) { |
294 | formattedName += ", "; | 294 | formattedName += ", "; |
295 | formattedName += addr.givenName(); | 295 | formattedName += addr.givenName(); |
296 | } | 296 | } |
297 | } else | 297 | } else |
298 | formattedName = addr.givenName(); | 298 | formattedName = addr.givenName(); |
299 | } | 299 | } |
300 | database->writeField(ZdbAdrs::FileAs, formattedName); | 300 | database->writeField(ZdbAdrs::FileAs, formattedName); |
301 | database->writeField(ZdbAdrs::FullName, formattedName); | 301 | database->writeField(ZdbAdrs::FullName, formattedName); |
302 | 302 | ||
303 | 303 | ||
304 | //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!"); | 304 | //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!"); |
305 | //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee"); | 305 | //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee"); |
306 | QString emails = addr.emails().join(" "); | 306 | QString emails = addr.emails().join(" "); |
307 | database->writeField(ZdbAdrs::Emails, emails ); | 307 | database->writeField(ZdbAdrs::Emails, emails ); |
308 | 308 | ||
309 | database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() ); | 309 | database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() ); |
310 | 310 | ||
311 | 311 | ||
312 | // home | 312 | // home |
313 | const Address homeaddress = addr.address(Address::Home); | 313 | const Address homeaddress = addr.address(Address::Home); |
314 | if (!homeaddress.isEmpty()) { | 314 | if (!homeaddress.isEmpty()) { |
315 | qDebug("write home address "); | 315 | //qDebug("write home address "); |
316 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); | 316 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); |
317 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); | 317 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); |
318 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); | 318 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); |
319 | database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode()); | 319 | database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode()); |
320 | database->writeField(ZdbAdrs::HomeCountry, homeaddress.country()); | 320 | database->writeField(ZdbAdrs::HomeCountry, homeaddress.country()); |
321 | } | 321 | } |
322 | 322 | ||
323 | PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home ); | 323 | PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home ); |
324 | if (!homephone.number().isEmpty()) | 324 | if (!homephone.number().isEmpty()) |
325 | database->writeField(ZdbAdrs::HomePhone, homephone.number()); | 325 | database->writeField(ZdbAdrs::HomePhone, homephone.number()); |
326 | 326 | ||
327 | PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ); | 327 | PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ); |
328 | if (!homefax.number().isEmpty()) | 328 | if (!homefax.number().isEmpty()) |
329 | database->writeField(ZdbAdrs::HomeFax, homefax.number()); | 329 | database->writeField(ZdbAdrs::HomeFax, homefax.number()); |
330 | 330 | ||
331 | PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell ); | 331 | PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell ); |
332 | if (!homemobile.number().isEmpty()) { | 332 | if (!homemobile.number().isEmpty()) { |
333 | database->writeField(ZdbAdrs::HomeMobile, homemobile.number()); | 333 | database->writeField(ZdbAdrs::HomeMobile, homemobile.number()); |
334 | cellHome = true; | 334 | cellHome = true; |
335 | } | 335 | } |
336 | 336 | ||
337 | database->writeField(ZdbAdrs::HomeWebPage, addr.url().url()); | 337 | database->writeField(ZdbAdrs::HomeWebPage, addr.url().url()); |
338 | 338 | ||
339 | 339 | ||
340 | // business | 340 | // business |
341 | const Address businessaddress = addr.address(Address::Work); | 341 | const Address businessaddress = addr.address(Address::Work); |
342 | if (!businessaddress.isEmpty()) { | 342 | if (!businessaddress.isEmpty()) { |
343 | qDebug("write business address "); | 343 | //qDebug("write business address "); |
344 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); | 344 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); |
345 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); | 345 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); |
346 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); | 346 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); |
347 | database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode()); | 347 | database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode()); |
348 | database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country()); | 348 | database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country()); |
349 | } | 349 | } |
350 | 350 | ||
351 | PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work ); | 351 | PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work ); |
352 | if (!businessphone.number().isEmpty()) | 352 | if (!businessphone.number().isEmpty()) |
353 | database->writeField(ZdbAdrs::BusinessPhone, businessphone.number()); | 353 | database->writeField(ZdbAdrs::BusinessPhone, businessphone.number()); |
354 | 354 | ||
355 | PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ); | 355 | PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ); |
356 | if (!businessfax.number().isEmpty()) | 356 | if (!businessfax.number().isEmpty()) |
357 | database->writeField(ZdbAdrs::BusinessFax, businessfax.number()); | 357 | database->writeField(ZdbAdrs::BusinessFax, businessfax.number()); |
358 | 358 | ||
359 | PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell ); | 359 | PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell ); |
360 | if (!businessmobile.number().isEmpty()) { | 360 | if (!businessmobile.number().isEmpty()) { |
361 | cellWork = true; | 361 | cellWork = true; |
362 | database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number()); | 362 | database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number()); |
363 | } | 363 | } |
364 | PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell ); | 364 | PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell ); |
365 | if (! mobile.number().isEmpty()) { | 365 | if (! mobile.number().isEmpty()) { |
366 | if ( ! cellHome ) | 366 | if ( ! cellHome ) |
367 | database->writeField(ZdbAdrs::HomeMobile, mobile.number()); | 367 | database->writeField(ZdbAdrs::HomeMobile, mobile.number()); |
368 | else if (! cellWork ) | 368 | else if (! cellWork ) |
369 | database->writeField(ZdbAdrs::BusinessMobile, mobile.number()); | 369 | database->writeField(ZdbAdrs::BusinessMobile, mobile.number()); |
370 | } | 370 | } |
371 | 371 | ||
372 | PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager ); | 372 | PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager ); |
373 | if (!businesspager.number().isEmpty()) | 373 | if (!businesspager.number().isEmpty()) |
374 | database->writeField(ZdbAdrs::BusinessPager, businesspager.number()); | 374 | database->writeField(ZdbAdrs::BusinessPager, businesspager.number()); |
375 | 375 | ||
376 | database->writeField(ZdbAdrs::JobTitle, addr.role()); | 376 | database->writeField(ZdbAdrs::JobTitle, addr.role()); |
377 | database->writeField(ZdbAdrs::Company, addr.organization()); | 377 | database->writeField(ZdbAdrs::Company, addr.organization()); |
378 | 378 | ||
379 | database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" )); | 379 | database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" )); |
380 | database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); | 380 | database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); |
381 | database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" )); | 381 | database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" )); |
382 | database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" )); | 382 | database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" )); |
383 | database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" )); | 383 | database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" )); |
384 | 384 | ||
385 | //personal | 385 | //personal |
386 | database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" )); | 386 | database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" )); |
387 | 387 | ||
388 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); | 388 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); |
389 | //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); | 389 | //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); |
390 | //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); | 390 | //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); |
391 | //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); | 391 | //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); |
392 | if (gt == "male") | 392 | if (gt == "male") |
393 | database->writeField(ZdbAdrs::Gender, "male"); | 393 | database->writeField(ZdbAdrs::Gender, "male"); |
394 | else if (gt == "female") | 394 | else if (gt == "female") |
395 | database->writeField(ZdbAdrs::Gender, "female"); | 395 | database->writeField(ZdbAdrs::Gender, "female"); |
396 | else | 396 | else |
397 | database->writeField(ZdbAdrs::Gender, ""); | 397 | database->writeField(ZdbAdrs::Gender, ""); |
398 | 398 | ||
399 | 399 | ||
400 | QDate dt = KGlobal::locale()->readDate( | 400 | QDate dt = KGlobal::locale()->readDate( |
401 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate | 401 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate |
402 | if ( dt.isValid() ) { | 402 | if ( dt.isValid() ) { |
403 | QString dateS = KGlobal::locale()->formatDate(dt, true ); | 403 | QString dateS = KGlobal::locale()->formatDate(dt, true ); |
404 | database->writeField(ZdbAdrs::Anniversary, dateS ); | 404 | database->writeField(ZdbAdrs::Anniversary, dateS ); |
405 | } | 405 | } |
406 | database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" )); | 406 | database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" )); |
407 | dt = addr.birthday().date(); | 407 | dt = addr.birthday().date(); |
408 | if ( dt.isValid() ) { | 408 | if ( dt.isValid() ) { |
409 | QString dateS = KGlobal::locale()->formatDate(dt, true ); | 409 | QString dateS = KGlobal::locale()->formatDate(dt, true ); |
410 | database->writeField(ZdbAdrs::Birthday, dateS); | 410 | database->writeField(ZdbAdrs::Birthday, dateS); |
411 | } | 411 | } |
412 | database->writeField(ZdbAdrs::Nickname, addr.nickName()); | 412 | database->writeField(ZdbAdrs::Nickname, addr.nickName()); |
413 | 413 | ||
414 | // other | 414 | // other |
415 | database->writeField(ZdbAdrs::Notes, addr.note()); | 415 | database->writeField(ZdbAdrs::Notes, addr.note()); |
416 | 416 | ||
417 | //US QString groups() const { return find( Qtopia::Groups ); } | 417 | //US QString groups() const { return find( Qtopia::Groups ); } |
418 | //US QStringList groupList() const; | 418 | //US QStringList groupList() const; |
419 | 419 | ||
420 | 420 | ||
421 | //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); | 421 | //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); |
422 | 422 | ||
423 | QStringList cats = addr.categories(); | 423 | QStringList cats = addr.categories(); |
424 | int ii; | 424 | int ii; |
425 | for ( ii = 0; ii < cats.count() ;++ii ) { | 425 | for ( ii = 0; ii < cats.count() ;++ii ) { |
426 | if ( !catDB->exists( cats[ii] )) | 426 | if ( !catDB->exists( cats[ii] )) |
427 | catDB->addCategory(cats[ii]); | 427 | catDB->addCategory(cats[ii]); |
428 | } | 428 | } |
429 | QArray<int> iar; | 429 | QArray<int> iar; |
430 | if ( !cats.isEmpty() ) { | 430 | if ( !cats.isEmpty() ) { |
431 | QArray<int> iar = catDB->ids(cats); | 431 | QArray<int> iar = catDB->ids(cats); |
432 | qDebug("***cat count is %d ", iar.count()); | 432 | //qDebug("***cat count is %d ", iar.count()); |
433 | database->updateCategories(contact, iar); | 433 | database->updateCategories(contact, iar); |
434 | } | 434 | } |
435 | 435 | ||
436 | return true; | 436 | return true; |
437 | } | 437 | } |
438 | 438 | ||
439 | QDate SharpDTMConverter::convertDate( QString s) | 439 | QDate SharpDTMConverter::convertDate( QString s) |
440 | { | 440 | { |
441 | QDate dt = KGlobal::locale()->readDate( s ); | 441 | QDate dt = KGlobal::locale()->readDate( s ); |
442 | return dt; | 442 | return dt; |
443 | return QDate (); | 443 | return QDate (); |
444 | } | 444 | } |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c2f031a..4ebd6a8 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2462,202 +2462,202 @@ void KABCore::edit_sync_options() | |||
2462 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 2462 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
2463 | switch ( KABPrefs::instance()->mSyncAlgoPrefs ) { | 2463 | switch ( KABPrefs::instance()->mSyncAlgoPrefs ) { |
2464 | case 0: | 2464 | case 0: |
2465 | loc.setChecked( true); | 2465 | loc.setChecked( true); |
2466 | break; | 2466 | break; |
2467 | case 1: | 2467 | case 1: |
2468 | rem.setChecked( true ); | 2468 | rem.setChecked( true ); |
2469 | break; | 2469 | break; |
2470 | case 2: | 2470 | case 2: |
2471 | newest.setChecked( true); | 2471 | newest.setChecked( true); |
2472 | break; | 2472 | break; |
2473 | case 3: | 2473 | case 3: |
2474 | ask.setChecked( true); | 2474 | ask.setChecked( true); |
2475 | break; | 2475 | break; |
2476 | case 4: | 2476 | case 4: |
2477 | f_loc.setChecked( true); | 2477 | f_loc.setChecked( true); |
2478 | break; | 2478 | break; |
2479 | case 5: | 2479 | case 5: |
2480 | f_rem.setChecked( true); | 2480 | f_rem.setChecked( true); |
2481 | break; | 2481 | break; |
2482 | case 6: | 2482 | case 6: |
2483 | // both.setChecked( true); | 2483 | // both.setChecked( true); |
2484 | break; | 2484 | break; |
2485 | default: | 2485 | default: |
2486 | break; | 2486 | break; |
2487 | } | 2487 | } |
2488 | if ( dia.exec() ) { | 2488 | if ( dia.exec() ) { |
2489 | KABPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; | 2489 | KABPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; |
2490 | } | 2490 | } |
2491 | 2491 | ||
2492 | 2492 | ||
2493 | } | 2493 | } |
2494 | QString KABCore::getPassword( ) | 2494 | QString KABCore::getPassword( ) |
2495 | { | 2495 | { |
2496 | QString retfile = ""; | 2496 | QString retfile = ""; |
2497 | QDialog dia ( this, "input-dialog", true ); | 2497 | QDialog dia ( this, "input-dialog", true ); |
2498 | QLineEdit lab ( &dia ); | 2498 | QLineEdit lab ( &dia ); |
2499 | lab.setEchoMode( QLineEdit::Password ); | 2499 | lab.setEchoMode( QLineEdit::Password ); |
2500 | QVBoxLayout lay( &dia ); | 2500 | QVBoxLayout lay( &dia ); |
2501 | lay.setMargin(7); | 2501 | lay.setMargin(7); |
2502 | lay.setSpacing(7); | 2502 | lay.setSpacing(7); |
2503 | lay.addWidget( &lab); | 2503 | lay.addWidget( &lab); |
2504 | dia.setFixedSize( 230,50 ); | 2504 | dia.setFixedSize( 230,50 ); |
2505 | dia.setCaption( i18n("Enter password") ); | 2505 | dia.setCaption( i18n("Enter password") ); |
2506 | QPushButton pb ( "OK", &dia); | 2506 | QPushButton pb ( "OK", &dia); |
2507 | lay.addWidget( &pb ); | 2507 | lay.addWidget( &pb ); |
2508 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 2508 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
2509 | dia.show(); | 2509 | dia.show(); |
2510 | int res = dia.exec(); | 2510 | int res = dia.exec(); |
2511 | if ( res ) | 2511 | if ( res ) |
2512 | retfile = lab.text(); | 2512 | retfile = lab.text(); |
2513 | dia.hide(); | 2513 | dia.hide(); |
2514 | qApp->processEvents(); | 2514 | qApp->processEvents(); |
2515 | return retfile; | 2515 | return retfile; |
2516 | 2516 | ||
2517 | } | 2517 | } |
2518 | #include <libkcal/syncdefines.h> | 2518 | #include <libkcal/syncdefines.h> |
2519 | 2519 | ||
2520 | KABC::Addressee KABCore::getLastSyncAddressee() | 2520 | KABC::Addressee KABCore::getLastSyncAddressee() |
2521 | { | 2521 | { |
2522 | Addressee lse; | 2522 | Addressee lse; |
2523 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 2523 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
2524 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2524 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2525 | if (lse.isEmpty()) { | 2525 | if (lse.isEmpty()) { |
2526 | qDebug("Creating new last-syncAddressee "); | 2526 | qDebug("Creating new last-syncAddressee "); |
2527 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2527 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2528 | QString sum = ""; | 2528 | QString sum = ""; |
2529 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 2529 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
2530 | sum = "E: "; | 2530 | sum = "E: "; |
2531 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); | 2531 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); |
2532 | lse.setRevision( mLastAddressbookSync ); | 2532 | lse.setRevision( mLastAddressbookSync ); |
2533 | lse.setCategories( i18n("SyncEvent") ); | 2533 | lse.setCategories( i18n("SyncEvent") ); |
2534 | mAddressBook->insertAddressee( lse ); | 2534 | mAddressBook->insertAddressee( lse ); |
2535 | } | 2535 | } |
2536 | return lse; | 2536 | return lse; |
2537 | } | 2537 | } |
2538 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) | 2538 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) |
2539 | { | 2539 | { |
2540 | 2540 | ||
2541 | //void setZaurusId(int id); | 2541 | //void setZaurusId(int id); |
2542 | // int zaurusId() const; | 2542 | // int zaurusId() const; |
2543 | // void setZaurusUid(int id); | 2543 | // void setZaurusUid(int id); |
2544 | // int zaurusUid() const; | 2544 | // int zaurusUid() const; |
2545 | // void setZaurusStat(int id); | 2545 | // void setZaurusStat(int id); |
2546 | // int zaurusStat() const; | 2546 | // int zaurusStat() const; |
2547 | // 0 equal | 2547 | // 0 equal |
2548 | // 1 take local | 2548 | // 1 take local |
2549 | // 2 take remote | 2549 | // 2 take remote |
2550 | // 3 cancel | 2550 | // 3 cancel |
2551 | QDateTime lastSync = mLastAddressbookSync; | 2551 | QDateTime lastSync = mLastAddressbookSync; |
2552 | QDateTime localMod = local->revision(); | 2552 | QDateTime localMod = local->revision(); |
2553 | QDateTime remoteMod = remote->revision(); | 2553 | QDateTime remoteMod = remote->revision(); |
2554 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2554 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2555 | bool remCh, locCh; | 2555 | bool remCh, locCh; |
2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2557 | 2557 | ||
2558 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2558 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
2559 | locCh = ( localMod > mLastAddressbookSync ); | 2559 | locCh = ( localMod > mLastAddressbookSync ); |
2560 | if ( !remCh && ! locCh ) { | 2560 | if ( !remCh && ! locCh ) { |
2561 | qDebug("both not changed "); | 2561 | //qDebug("both not changed "); |
2562 | lastSync = localMod.addDays(1); | 2562 | lastSync = localMod.addDays(1); |
2563 | if ( mode <= SYNC_PREF_ASK ) | 2563 | if ( mode <= SYNC_PREF_ASK ) |
2564 | return 0; | 2564 | return 0; |
2565 | } else { | 2565 | } else { |
2566 | if ( locCh ) { | 2566 | if ( locCh ) { |
2567 | qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); | 2567 | //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); |
2568 | lastSync = localMod.addDays( -1 ); | 2568 | lastSync = localMod.addDays( -1 ); |
2569 | if ( !remCh ) | 2569 | if ( !remCh ) |
2570 | remoteMod =( lastSync.addDays( -1 ) ); | 2570 | remoteMod =( lastSync.addDays( -1 ) ); |
2571 | } else { | 2571 | } else { |
2572 | //qDebug(" not loc changed "); | 2572 | //qDebug(" not loc changed "); |
2573 | lastSync = localMod.addDays( 1 ); | 2573 | lastSync = localMod.addDays( 1 ); |
2574 | if ( remCh ) | 2574 | if ( remCh ) |
2575 | remoteMod =( lastSync.addDays( 1 ) ); | 2575 | remoteMod =( lastSync.addDays( 1 ) ); |
2576 | 2576 | ||
2577 | } | 2577 | } |
2578 | } | 2578 | } |
2579 | full = true; | 2579 | full = true; |
2580 | if ( mode < SYNC_PREF_ASK ) | 2580 | if ( mode < SYNC_PREF_ASK ) |
2581 | mode = SYNC_PREF_ASK; | 2581 | mode = SYNC_PREF_ASK; |
2582 | } else { | 2582 | } else { |
2583 | if ( localMod == remoteMod ) | 2583 | if ( localMod == remoteMod ) |
2584 | return 0; | 2584 | return 0; |
2585 | 2585 | ||
2586 | } | 2586 | } |
2587 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); | 2587 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); |
2588 | 2588 | ||
2589 | //qDebug("%s %d %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod); | 2589 | //qDebug("%s %d %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod); |
2590 | //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(), remote->lastModified().time().second(), remote->lastModified().time().msec() ); | 2590 | //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(), remote->lastModified().time().second(), remote->lastModified().time().msec() ); |
2591 | //full = true; //debug only | 2591 | //full = true; //debug only |
2592 | if ( full ) { | 2592 | if ( full ) { |
2593 | bool equ = ( (*local) == (*remote) ); | 2593 | bool equ = ( (*local) == (*remote) ); |
2594 | if ( equ ) { | 2594 | if ( equ ) { |
2595 | //qDebug("equal "); | 2595 | //qDebug("equal "); |
2596 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2596 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2597 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); | 2597 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
2598 | } | 2598 | } |
2599 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 2599 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
2600 | return 0; | 2600 | return 0; |
2601 | 2601 | ||
2602 | }//else //debug only | 2602 | }//else //debug only |
2603 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); | 2603 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); |
2604 | } | 2604 | } |
2605 | int result; | 2605 | int result; |
2606 | bool localIsNew; | 2606 | bool localIsNew; |
2607 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , local->lastModified().toString().latin1() , remote->lastModified().toString().latin1() ); | 2607 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , local->lastModified().toString().latin1() , remote->lastModified().toString().latin1() ); |
2608 | 2608 | ||
2609 | if ( full && mode < SYNC_PREF_NEWEST ) | 2609 | if ( full && mode < SYNC_PREF_NEWEST ) |
2610 | mode = SYNC_PREF_ASK; | 2610 | mode = SYNC_PREF_ASK; |
2611 | 2611 | ||
2612 | switch( mode ) { | 2612 | switch( mode ) { |
2613 | case SYNC_PREF_LOCAL: | 2613 | case SYNC_PREF_LOCAL: |
2614 | if ( lastSync > remoteMod ) | 2614 | if ( lastSync > remoteMod ) |
2615 | return 1; | 2615 | return 1; |
2616 | if ( lastSync > localMod ) | 2616 | if ( lastSync > localMod ) |
2617 | return 2; | 2617 | return 2; |
2618 | return 1; | 2618 | return 1; |
2619 | break; | 2619 | break; |
2620 | case SYNC_PREF_REMOTE: | 2620 | case SYNC_PREF_REMOTE: |
2621 | if ( lastSync > remoteMod ) | 2621 | if ( lastSync > remoteMod ) |
2622 | return 1; | 2622 | return 1; |
2623 | if ( lastSync > localMod ) | 2623 | if ( lastSync > localMod ) |
2624 | return 2; | 2624 | return 2; |
2625 | return 2; | 2625 | return 2; |
2626 | break; | 2626 | break; |
2627 | case SYNC_PREF_NEWEST: | 2627 | case SYNC_PREF_NEWEST: |
2628 | if ( localMod > remoteMod ) | 2628 | if ( localMod > remoteMod ) |
2629 | return 1; | 2629 | return 1; |
2630 | else | 2630 | else |
2631 | return 2; | 2631 | return 2; |
2632 | break; | 2632 | break; |
2633 | case SYNC_PREF_ASK: | 2633 | case SYNC_PREF_ASK: |
2634 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 2634 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
2635 | if ( lastSync > remoteMod ) | 2635 | if ( lastSync > remoteMod ) |
2636 | return 1; | 2636 | return 1; |
2637 | if ( lastSync > localMod ) | 2637 | if ( lastSync > localMod ) |
2638 | return 2; | 2638 | return 2; |
2639 | localIsNew = localMod >= remoteMod; | 2639 | localIsNew = localMod >= remoteMod; |
2640 | //qDebug("conflict! ************************************** "); | 2640 | //qDebug("conflict! ************************************** "); |
2641 | { | 2641 | { |
2642 | KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); | 2642 | KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); |
2643 | result = acd.executeD(localIsNew); | 2643 | result = acd.executeD(localIsNew); |
2644 | return result; | 2644 | return result; |
2645 | } | 2645 | } |
2646 | break; | 2646 | break; |
2647 | case SYNC_PREF_FORCE_LOCAL: | 2647 | case SYNC_PREF_FORCE_LOCAL: |
2648 | return 1; | 2648 | return 1; |
2649 | break; | 2649 | break; |
2650 | case SYNC_PREF_FORCE_REMOTE: | 2650 | case SYNC_PREF_FORCE_REMOTE: |
2651 | return 2; | 2651 | return 2; |
2652 | break; | 2652 | break; |
2653 | 2653 | ||
2654 | default: | 2654 | default: |
2655 | // SYNC_PREF_TAKE_BOTH not implemented | 2655 | // SYNC_PREF_TAKE_BOTH not implemented |
2656 | break; | 2656 | break; |
2657 | } | 2657 | } |
2658 | return 0; | 2658 | return 0; |
2659 | } | 2659 | } |
2660 | bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode) | 2660 | bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode) |
2661 | { | 2661 | { |
2662 | bool syncOK = true; | 2662 | bool syncOK = true; |
2663 | int addedAddressee = 0; | 2663 | int addedAddressee = 0; |