author | zautrix <zautrix> | 2004-09-21 11:17:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-21 11:17:18 (UTC) |
commit | ba89a5d20eb054054d9cfae3723a4d62b9f62efd (patch) (unidiff) | |
tree | ee1a42079e3204dbab6f45762f83cb4c1712579e /kabc/plugins | |
parent | 19f445f0b6e7d4591db46b89e877ed9f4332ecd4 (diff) | |
download | kdepimpi-ba89a5d20eb054054d9cfae3723a4d62b9f62efd.zip kdepimpi-ba89a5d20eb054054d9cfae3723a4d62b9f62efd.tar.gz kdepimpi-ba89a5d20eb054054d9cfae3723a4d62b9f62efd.tar.bz2 |
DTM fix
-rw-r--r-- | kabc/plugins/sharpdtm/resourcesharpdtm.cpp | 1 | ||||
-rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp index 437bda8..adc7256 100644 --- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp +++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp | |||
@@ -1,442 +1,441 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <sys/types.h> | 28 | #include <sys/types.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <unistd.h> | 30 | #include <unistd.h> |
31 | 31 | ||
32 | #include <qdir.h> | 32 | #include <qdir.h> |
33 | #include <qfile.h> | 33 | #include <qfile.h> |
34 | #include <qfileinfo.h> | 34 | #include <qfileinfo.h> |
35 | #include <qregexp.h> | 35 | #include <qregexp.h> |
36 | //US #include <qtimer.h> | 36 | //US #include <qtimer.h> |
37 | 37 | ||
38 | #include <kapplication.h> | 38 | #include <kapplication.h> |
39 | #include <kconfig.h> | 39 | #include <kconfig.h> |
40 | #include <kdebug.h> | 40 | #include <kdebug.h> |
41 | #include <klocale.h> | 41 | #include <klocale.h> |
42 | //US #include <ksavefile.h> | 42 | //US #include <ksavefile.h> |
43 | #include <kstandarddirs.h> | 43 | #include <kstandarddirs.h> |
44 | #include <kmessagebox.h> | 44 | #include <kmessagebox.h> |
45 | 45 | ||
46 | #include <sl/slzdb.h> | 46 | #include <sl/slzdb.h> |
47 | 47 | ||
48 | #include <libkdepim/ksyncprofile.h> | 48 | #include <libkdepim/ksyncprofile.h> |
49 | 49 | ||
50 | #include "resourcesharpdtmconfig.h" | 50 | #include "resourcesharpdtmconfig.h" |
51 | #include "resourcesharpdtm.h" | 51 | #include "resourcesharpdtm.h" |
52 | 52 | ||
53 | #include "syncprefwidget.h" | 53 | #include "syncprefwidget.h" |
54 | 54 | ||
55 | #include "stdaddressbook.h" | 55 | #include "stdaddressbook.h" |
56 | 56 | ||
57 | #include "sharpdtmconverter.h" | 57 | #include "sharpdtmconverter.h" |
58 | //#define ALLOW_LOCKING | 58 | //#define ALLOW_LOCKING |
59 | using namespace KABC; | 59 | using namespace KABC; |
60 | extern "C" | 60 | extern "C" |
61 | { | 61 | { |
62 | void *init_microkabc_sharpdtm() | 62 | void *init_microkabc_sharpdtm() |
63 | { | 63 | { |
64 | return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidgetContainer>(); | 64 | return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidgetContainer>(); |
65 | } | 65 | } |
66 | } | 66 | } |
67 | 67 | ||
68 | ResourceSharpDTM::ResourceSharpDTM( const KConfig *config, bool syncable ) | 68 | ResourceSharpDTM::ResourceSharpDTM( const KConfig *config, bool syncable ) |
69 | : Resource( config, syncable ), mConverter (0) | 69 | : Resource( config, syncable ), mConverter (0) |
70 | { | 70 | { |
71 | // we can not choose the filename. Therefore use the default to display | 71 | // we can not choose the filename. Therefore use the default to display |
72 | 72 | ||
73 | QString fileName = SlZDataBase::addressbookFileName(); | 73 | QString fileName = SlZDataBase::addressbookFileName(); |
74 | init( fileName ); | 74 | init( fileName ); |
75 | } | 75 | } |
76 | 76 | ||
77 | ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable ) | 77 | ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable ) |
78 | : Resource( 0, syncable ) | 78 | : Resource( 0, syncable ) |
79 | { | 79 | { |
80 | init( fileName ); | 80 | init( fileName ); |
81 | } | 81 | } |
82 | 82 | ||
83 | void ResourceSharpDTM::init( const QString &fileName ) | 83 | void ResourceSharpDTM::init( const QString &fileName ) |
84 | { | 84 | { |
85 | 85 | ||
86 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); | 86 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); |
87 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); | 87 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); |
88 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 88 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
89 | 89 | ||
90 | setFileName( fileName ); | 90 | setFileName( fileName ); |
91 | } | 91 | } |
92 | 92 | ||
93 | ResourceSharpDTM::~ResourceSharpDTM() | 93 | ResourceSharpDTM::~ResourceSharpDTM() |
94 | { | 94 | { |
95 | if (mConverter != 0) | 95 | if (mConverter != 0) |
96 | delete mConverter; | 96 | delete mConverter; |
97 | 97 | ||
98 | if(mAccess != 0) | 98 | if(mAccess != 0) |
99 | delete mAccess; | 99 | delete mAccess; |
100 | } | 100 | } |
101 | 101 | ||
102 | void ResourceSharpDTM::writeConfig( KConfig *config ) | 102 | void ResourceSharpDTM::writeConfig( KConfig *config ) |
103 | { | 103 | { |
104 | Resource::writeConfig( config ); | 104 | Resource::writeConfig( config ); |
105 | } | 105 | } |
106 | 106 | ||
107 | Ticket *ResourceSharpDTM::requestSaveTicket() | 107 | Ticket *ResourceSharpDTM::requestSaveTicket() |
108 | { | 108 | { |
109 | 109 | ||
110 | 110 | ||
111 | qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1()); | 111 | qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1()); |
112 | 112 | ||
113 | if ( !addressBook() ) return 0; | 113 | if ( !addressBook() ) return 0; |
114 | 114 | ||
115 | #ifdef ALLOW_LOCKING | 115 | #ifdef ALLOW_LOCKING |
116 | if ( !lock( fileName() ) ) { | 116 | if ( !lock( fileName() ) ) { |
117 | qDebug("ResourceSharpDTM::requestSaveTicket(): Unable to lock file "); | 117 | qDebug("ResourceSharpDTM::requestSaveTicket(): Unable to lock file "); |
118 | return 0; | 118 | return 0; |
119 | } | 119 | } |
120 | #endif | 120 | #endif |
121 | return createTicket( this ); | 121 | return createTicket( this ); |
122 | } | 122 | } |
123 | 123 | ||
124 | 124 | ||
125 | bool ResourceSharpDTM::doOpen() | 125 | bool ResourceSharpDTM::doOpen() |
126 | { | 126 | { |
127 | qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1()); | 127 | qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1()); |
128 | 128 | ||
129 | // the last parameter in the SlZDataBase constructor means "readonly" | 129 | // the last parameter in the SlZDataBase constructor means "readonly" |
130 | mAccess = new SlZDataBase(fileName(), | 130 | mAccess = new SlZDataBase(fileName(), |
131 | SlZDataBase::addressbookItems(), | 131 | SlZDataBase::addressbookItems(), |
132 | NULL, false); | 132 | NULL, false); |
133 | 133 | ||
134 | if ( !mAccess ) { | 134 | if ( !mAccess ) { |
135 | qDebug("Unable to load file() %s", fileName().latin1()); | 135 | qDebug("Unable to load file() %s", fileName().latin1()); |
136 | return false; | 136 | return false; |
137 | } | 137 | } |
138 | 138 | ||
139 | if (mConverter == 0) | 139 | if (mConverter == 0) |
140 | { | 140 | { |
141 | mConverter = new SharpDTMConverter(); | 141 | mConverter = new SharpDTMConverter(); |
142 | bool res = mConverter->init(); | 142 | bool res = mConverter->init(); |
143 | if ( !res ) | 143 | if ( !res ) |
144 | { | 144 | { |
145 | QString msg("Unable to initialize sharp converter. Most likely a problem with the category file"); | 145 | QString msg("Unable to initialize sharp converter. Most likely a problem with the category file"); |
146 | 146 | ||
147 | qDebug(msg); | 147 | qDebug(msg); |
148 | delete mAccess; | 148 | delete mAccess; |
149 | mAccess = 0; | 149 | mAccess = 0; |
150 | return false; | 150 | return false; |
151 | } | 151 | } |
152 | } | 152 | } |
153 | 153 | ||
154 | return true; | 154 | return true; |
155 | } | 155 | } |
156 | 156 | ||
157 | void ResourceSharpDTM::doClose() | 157 | void ResourceSharpDTM::doClose() |
158 | { | 158 | { |
159 | qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1()); | 159 | qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1()); |
160 | 160 | ||
161 | if(mAccess) | 161 | if(mAccess) |
162 | { | 162 | { |
163 | delete mAccess; | 163 | delete mAccess; |
164 | mAccess = 0; | 164 | mAccess = 0; |
165 | } | 165 | } |
166 | // it seems so, that deletion of access deletes backend as well | 166 | // it seems so, that deletion of access deletes backend as well |
167 | //delete backend; | 167 | //delete backend; |
168 | 168 | ||
169 | return; | 169 | return; |
170 | } | 170 | } |
171 | 171 | ||
172 | bool ResourceSharpDTM::load() | 172 | bool ResourceSharpDTM::load() |
173 | { | 173 | { |
174 | qDebug("ResourceSharpDTM::load: %s", fileName().latin1()); | 174 | qDebug("ResourceSharpDTM::load: %s", fileName().latin1()); |
175 | 175 | ||
176 | bool res = false; | 176 | bool res = false; |
177 | 177 | ||
178 | CardId id; | 178 | CardId id; |
179 | 179 | ||
180 | for (bool res=mAccess->first(); res == true; res=mAccess->next()) | 180 | for (bool res=mAccess->first(); res == true; res=mAccess->next()) |
181 | { | 181 | { |
182 | id = mAccess->cardId(); | 182 | id = mAccess->cardId(); |
183 | 183 | ||
184 | KABC::Addressee addressee; | 184 | KABC::Addressee addressee; |
185 | 185 | ||
186 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); | 186 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); |
187 | 187 | ||
188 | if ( !addressee.isEmpty() && res ) | 188 | if ( !addressee.isEmpty() && res ) |
189 | { | 189 | { |
190 | addressee.setResource( this ); | 190 | addressee.setResource( this ); |
191 | addressBook()->insertAddressee( addressee ); | 191 | addressBook()->insertAddressee( addressee ); |
192 | } | 192 | } |
193 | } | 193 | } |
194 | 194 | ||
195 | return true; | 195 | return true; |
196 | } | 196 | } |
197 | 197 | ||
198 | bool ResourceSharpDTM::save( Ticket *ticket ) | 198 | bool ResourceSharpDTM::save( Ticket *ticket ) |
199 | { | 199 | { |
200 | qDebug("ResourceSharpDTM::save: %s", fileName().latin1()); | 200 | qDebug("ResourceSharpDTM::save: %s", fileName().latin1()); |
201 | 201 | ||
202 | mDirWatch.stopScan(); | 202 | mDirWatch.stopScan(); |
203 | 203 | ||
204 | KABC::AddressBook::Iterator it; | 204 | KABC::AddressBook::Iterator it; |
205 | bool res; | 205 | bool res; |
206 | KABC::Addressee::List changedAddressees; | 206 | KABC::Addressee::List changedAddressees; |
207 | typedef QMap<int,QString> AddresseeMap; | 207 | typedef QMap<int,QString> AddresseeMap; |
208 | AddresseeMap map; | 208 | AddresseeMap map; |
209 | CardId id ; | 209 | CardId id ; |
210 | 210 | ||
211 | for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { | 211 | for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { |
212 | 212 | ||
213 | if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | 213 | if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { |
214 | QString uid = (*it).originalExternalUID(); | 214 | QString uid = (*it).originalExternalUID(); |
215 | bool res; | 215 | bool res; |
216 | if ( uid.isEmpty() ) | 216 | if ( uid.isEmpty() ) |
217 | id = 0; | 217 | id = 0; |
218 | else | 218 | else |
219 | id = uid.toUInt(); | 219 | id = uid.toUInt(); |
220 | KABC::Addressee addressee = (*it); | 220 | KABC::Addressee addressee = (*it); |
221 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) { | 221 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) { |
222 | res = mAccess->startEditCard(id); | 222 | res = mAccess->startEditCard(id); |
223 | if (res == true) | 223 | if (res == true) |
224 | { | 224 | { |
225 | res = mConverter->addresseeToSharp( (*it), mAccess, id ); | 225 | res = mConverter->addresseeToSharp( (*it), mAccess, id ); |
226 | if (res == true) | 226 | if (res == true) |
227 | { | 227 | { |
228 | res = mAccess->finishEditCard(&id); | 228 | res = mAccess->finishEditCard(&id); |
229 | //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 229 | //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
230 | //(*it).setExternalUID( QString::number( id ) ); | 230 | //(*it).setExternalUID( QString::number( id ) ); |
231 | //(*it).setOriginalExternalUID( QString::number( id ) ); | 231 | //(*it).setOriginalExternalUID( QString::number( id ) ); |
232 | map.insert(id,(*it).uid()); | 232 | map.insert(id,(*it).uid()); |
233 | 233 | ||
234 | #if 0 | 234 | #if 0 |
235 | KABC::Addressee addressee; | 235 | KABC::Addressee addressee; |
236 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); | 236 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); |
237 | addressee.setUid((*it).uid() ); | 237 | addressee.setUid((*it).uid() ); |
238 | (it*).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 238 | (it*).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
239 | res = mAccess->finishEditCard(&id); | 239 | res = mAccess->finishEditCard(&id); |
240 | //qDebug("2NEW id is %d", id); | 240 | //qDebug("2NEW id is %d", id); |
241 | addressee.setExternalUID( QString::number( id ) ); | 241 | addressee.setExternalUID( QString::number( id ) ); |
242 | addressee.setOriginalExternalUID( QString::number( id ) ); | 242 | addressee.setOriginalExternalUID( QString::number( id ) ); |
243 | changedAddressees.append( addressee ); | 243 | changedAddressees.append( addressee ); |
244 | #endif | 244 | #endif |
245 | 245 | ||
246 | if (res == false) | 246 | if (res == false) |
247 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); | 247 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); |
248 | 248 | ||
249 | } | 249 | } |
250 | else | 250 | else |
251 | { | 251 | { |
252 | qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); | 252 | qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); |
253 | mAccess->cancelEditCard(); | 253 | mAccess->cancelEditCard(); |
254 | } | 254 | } |
255 | } | 255 | } |
256 | 256 | ||
257 | } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { | 257 | } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { |
258 | res = mAccess->deleteCard(&id); | 258 | res = mAccess->deleteCard(&id); |
259 | if ( res ) | 259 | if ( res ) |
260 | qDebug("delete success "); | 260 | qDebug("delete success "); |
261 | else | 261 | else |
262 | qDebug("delete error "); | 262 | qDebug("delete error "); |
263 | 263 | ||
264 | 264 | ||
265 | } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | 265 | } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { |
266 | //changed | 266 | //changed |
267 | qDebug("changed ****"); | 267 | qDebug("changed ****"); |
268 | res = mAccess->startEditCard(id); | 268 | res = mAccess->startEditCard(id); |
269 | if (res == true) | 269 | if (res == true) |
270 | { | 270 | { |
271 | res = mConverter->addresseeToSharp( (*it), mAccess, id ); | 271 | res = mConverter->addresseeToSharp( (*it), mAccess, id ); |
272 | if (res == true) | 272 | if (res == true) |
273 | { | 273 | { |
274 | res = mAccess->finishEditCard(&id); | 274 | res = mAccess->finishEditCard(&id); |
275 | //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); | 275 | //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); |
276 | map.insert(id,(*it).uid()); | 276 | map.insert(id,(*it).uid()); |
277 | 277 | ||
278 | #if 0 | 278 | #if 0 |
279 | KABC::Addressee addressee; | 279 | KABC::Addressee addressee; |
280 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); | 280 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); |
281 | addressee.setUid((*it).uid() ); | 281 | addressee.setUid((*it).uid() ); |
282 | addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); | 282 | addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); |
283 | changedAddressees.append( addressee ); | 283 | changedAddressees.append( addressee ); |
284 | res = mAccess->finishEditCard(&id); | 284 | res = mAccess->finishEditCard(&id); |
285 | #endif | 285 | #endif |
286 | if (res == false) | 286 | if (res == false) |
287 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); | 287 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); |
288 | 288 | ||
289 | } | 289 | } |
290 | else | 290 | else |
291 | { | 291 | { |
292 | qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); | 292 | qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); |
293 | mAccess->cancelEditCard(); | 293 | mAccess->cancelEditCard(); |
294 | } | 294 | } |
295 | } | 295 | } |
296 | } | 296 | } |
297 | } | 297 | } |
298 | 298 | ||
299 | } | 299 | } |
300 | AddresseeMap::Iterator itam; | 300 | AddresseeMap::Iterator itam; |
301 | res; | ||
302 | for ( res=mAccess->first(); res == true; res=mAccess->next()) | 301 | for ( res=mAccess->first(); res == true; res=mAccess->next()) |
303 | { | 302 | { |
304 | id = mAccess->cardId(); | 303 | id = mAccess->cardId(); |
305 | int idint = id; | 304 | int idint = id; |
306 | itam = map.find( idint ); | 305 | itam = map.find( idint ); |
307 | if ( itam != map.end() ) { | 306 | if ( itam != map.end() ) { |
308 | KABC::Addressee addressee; | 307 | KABC::Addressee addressee; |
309 | qDebug("found change %d %s ", idint, itam.data().latin1()); | 308 | qDebug("found change %d %s ", idint, itam.data().latin1()); |
310 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); | 309 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); |
311 | 310 | ||
312 | if ( !addressee.isEmpty() && res ) | 311 | if ( !addressee.isEmpty() && res ) |
313 | { | 312 | { |
314 | addressee.setResource( this ); | 313 | addressee.setResource( this ); |
315 | addressee.setUid( itam.data() ); | 314 | addressee.setUid( itam.data() ); |
316 | addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 315 | addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
317 | addressBook()->insertAddressee( addressee , false ); | 316 | addressBook()->insertAddressee( addressee , false ); |
318 | } | 317 | } |
319 | } | 318 | } |
320 | } | 319 | } |
321 | #if 0 | 320 | #if 0 |
322 | KABC::Addressee::List::Iterator it2; | 321 | KABC::Addressee::List::Iterator it2; |
323 | for ( it2 = changedAddressees.begin(); it2 != changedAddressees.end(); ++it2 ) { | 322 | for ( it2 = changedAddressees.begin(); it2 != changedAddressees.end(); ++it2 ) { |
324 | (*it2).computeCsum( "Sharp_DTM" ); | 323 | (*it2).computeCsum( "Sharp_DTM" ); |
325 | qDebug("CSUM: %s ",(*it2).getCsum( "Sharp_DTM" ).latin1() ); | 324 | qDebug("CSUM: %s ",(*it2).getCsum( "Sharp_DTM" ).latin1() ); |
326 | addressBook()->insertAddressee((*it2)); | 325 | addressBook()->insertAddressee((*it2)); |
327 | } | 326 | } |
328 | #endif | 327 | #endif |
329 | //US mAccess->save(); | 328 | //US mAccess->save(); |
330 | 329 | ||
331 | mDirWatch.startScan(); | 330 | mDirWatch.startScan(); |
332 | delete ticket; | 331 | delete ticket; |
333 | unlock( fileName() ); | 332 | unlock( fileName() ); |
334 | 333 | ||
335 | return true; | 334 | return true; |
336 | } | 335 | } |
337 | 336 | ||
338 | bool ResourceSharpDTM::lock( const QString &lockfileName ) | 337 | bool ResourceSharpDTM::lock( const QString &lockfileName ) |
339 | { | 338 | { |
340 | #ifdef ALLOW_LOCKING | 339 | #ifdef ALLOW_LOCKING |
341 | qDebug("ResourceSharpDTM::lock: %s", fileName().latin1()); | 340 | qDebug("ResourceSharpDTM::lock: %s", fileName().latin1()); |
342 | 341 | ||
343 | kdDebug(5700) << "ResourceSharpDTM::lock()" << endl; | 342 | kdDebug(5700) << "ResourceSharpDTM::lock()" << endl; |
344 | 343 | ||
345 | QString fn = lockfileName; | 344 | QString fn = lockfileName; |
346 | 345 | ||
347 | KURL url(fn); | 346 | KURL url(fn); |
348 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 347 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
349 | 348 | ||
350 | kdDebug(5700) << "-- lock name: " << lockName << endl; | 349 | kdDebug(5700) << "-- lock name: " << lockName << endl; |
351 | 350 | ||
352 | if (QFile::exists( lockName )) | 351 | if (QFile::exists( lockName )) |
353 | { | 352 | { |
354 | qDebug("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName()); | 353 | qDebug("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName()); |
355 | return false; | 354 | return false; |
356 | } | 355 | } |
357 | 356 | ||
358 | 357 | ||
359 | QString lockUniqueName; | 358 | QString lockUniqueName; |
360 | lockUniqueName = fn + KApplication::randomString( 8 ); | 359 | lockUniqueName = fn + KApplication::randomString( 8 ); |
361 | 360 | ||
362 | url = lockUniqueName; | 361 | url = lockUniqueName; |
363 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); | 362 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); |
364 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); | 363 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); |
365 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; | 364 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; |
366 | 365 | ||
367 | // Create unique file | 366 | // Create unique file |
368 | QFile file( mLockUniqueName ); | 367 | QFile file( mLockUniqueName ); |
369 | file.open( IO_WriteOnly ); | 368 | file.open( IO_WriteOnly ); |
370 | file.close(); | 369 | file.close(); |
371 | 370 | ||
372 | // Create lock file | 371 | // Create lock file |
373 | int result = 0; | 372 | int result = 0; |
374 | #ifndef _WIN32_ | 373 | #ifndef _WIN32_ |
375 | result = ::link( QFile::encodeName( mLockUniqueName ), | 374 | result = ::link( QFile::encodeName( mLockUniqueName ), |
376 | QFile::encodeName( lockName ) ); | 375 | QFile::encodeName( lockName ) ); |
377 | #endif | 376 | #endif |
378 | if ( result == 0 ) { | 377 | if ( result == 0 ) { |
379 | addressBook()->emitAddressBookLocked(); | 378 | addressBook()->emitAddressBookLocked(); |
380 | return true; | 379 | return true; |
381 | } | 380 | } |
382 | 381 | ||
383 | // TODO: check stat | 382 | // TODO: check stat |
384 | 383 | ||
385 | return false; | 384 | return false; |
386 | #else | 385 | #else |
387 | return true; | 386 | return true; |
388 | #endif | 387 | #endif |
389 | } | 388 | } |
390 | 389 | ||
391 | void ResourceSharpDTM::unlock( const QString &fileName ) | 390 | void ResourceSharpDTM::unlock( const QString &fileName ) |
392 | { | 391 | { |
393 | #ifdef ALLOW_LOCKING | 392 | #ifdef ALLOW_LOCKING |
394 | qDebug("ResourceSharpDTM::unlock() %s", fileName.latin1()); | 393 | qDebug("ResourceSharpDTM::unlock() %s", fileName.latin1()); |
395 | 394 | ||
396 | QString fn = fileName; | 395 | QString fn = fileName; |
397 | KURL url(fn); | 396 | KURL url(fn); |
398 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 397 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
399 | 398 | ||
400 | QFile::remove( lockName ); | 399 | QFile::remove( lockName ); |
401 | QFile::remove( mLockUniqueName ); | 400 | QFile::remove( mLockUniqueName ); |
402 | addressBook()->emitAddressBookUnlocked(); | 401 | addressBook()->emitAddressBookUnlocked(); |
403 | #endif | 402 | #endif |
404 | } | 403 | } |
405 | 404 | ||
406 | void ResourceSharpDTM::setFileName( const QString &newFileName ) | 405 | void ResourceSharpDTM::setFileName( const QString &newFileName ) |
407 | { | 406 | { |
408 | mDirWatch.stopScan(); | 407 | mDirWatch.stopScan(); |
409 | mDirWatch.removeFile( fileName() ); | 408 | mDirWatch.removeFile( fileName() ); |
410 | 409 | ||
411 | Resource::setFileName( newFileName ); | 410 | Resource::setFileName( newFileName ); |
412 | 411 | ||
413 | mDirWatch.addFile( fileName() ); | 412 | mDirWatch.addFile( fileName() ); |
414 | mDirWatch.startScan(); | 413 | mDirWatch.startScan(); |
415 | 414 | ||
416 | } | 415 | } |
417 | 416 | ||
418 | void ResourceSharpDTM::fileChanged() | 417 | void ResourceSharpDTM::fileChanged() |
419 | { | 418 | { |
420 | // There is a small theoretical chance that KDirWatch calls us before | 419 | // There is a small theoretical chance that KDirWatch calls us before |
421 | // we are fully constructed | 420 | // we are fully constructed |
422 | if (!addressBook()) | 421 | if (!addressBook()) |
423 | return; | 422 | return; |
424 | 423 | ||
425 | QString text( i18n( "Sharp DTM resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) ); | 424 | QString text( i18n( "Sharp DTM resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) ); |
426 | if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { | 425 | if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { |
427 | load(); | 426 | load(); |
428 | addressBook()->emitAddressBookChanged(); | 427 | addressBook()->emitAddressBookChanged(); |
429 | } | 428 | } |
430 | } | 429 | } |
431 | 430 | ||
432 | void ResourceSharpDTM::removeAddressee( const Addressee &addr ) | 431 | void ResourceSharpDTM::removeAddressee( const Addressee &addr ) |
433 | { | 432 | { |
434 | } | 433 | } |
435 | 434 | ||
436 | void ResourceSharpDTM::cleanUp() | 435 | void ResourceSharpDTM::cleanUp() |
437 | { | 436 | { |
438 | unlock( fileName() ); | 437 | unlock( fileName() ); |
439 | } | 438 | } |
440 | 439 | ||
441 | 440 | ||
442 | 441 | ||
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp index fccf625..d36df20 100644 --- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp +++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp | |||
@@ -1,442 +1,444 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "kglobal.h" | 28 | #include "kglobal.h" |
29 | #include <qregexp.h> | 29 | #include <qregexp.h> |
30 | 30 | ||
31 | 31 | ||
32 | #include "sharpdtmconverter.h" | 32 | #include "sharpdtmconverter.h" |
33 | 33 | ||
34 | #include <sl/slcategories.h> | 34 | #include <sl/slcategories.h> |
35 | #include <libkdepim/ksyncprofile.h> | 35 | #include <libkdepim/ksyncprofile.h> |
36 | //US #include <qpe/categoryselect.h> | 36 | //US #include <qpe/categoryselect.h> |
37 | 37 | ||
38 | 38 | ||
39 | using namespace KABC; | 39 | using namespace KABC; |
40 | using namespace SlCategory; | 40 | using namespace SlCategory; |
41 | 41 | ||
42 | SharpDTMConverter::SharpDTMConverter() : catDB(0) | 42 | SharpDTMConverter::SharpDTMConverter() : catDB(0) |
43 | { | 43 | { |
44 | } | 44 | } |
45 | 45 | ||
46 | SharpDTMConverter::~SharpDTMConverter() | 46 | SharpDTMConverter::~SharpDTMConverter() |
47 | { | 47 | { |
48 | deinit(); | 48 | deinit(); |
49 | } | 49 | } |
50 | 50 | ||
51 | bool SharpDTMConverter::init() | 51 | bool SharpDTMConverter::init() |
52 | { | 52 | { |
53 | catDB = new SlCategory::SlCategories(); | 53 | catDB = new SlCategory::SlCategories(); |
54 | 54 | ||
55 | if (!catDB) | 55 | if (!catDB) |
56 | return false; | 56 | return false; |
57 | 57 | ||
58 | // catDB->load( categoryFileName() ); | 58 | // catDB->load( categoryFileName() ); |
59 | return true; | 59 | return true; |
60 | } | 60 | } |
61 | 61 | ||
62 | void SharpDTMConverter::deinit() | 62 | void SharpDTMConverter::deinit() |
63 | { | 63 | { |
64 | if (catDB) | 64 | if (catDB) |
65 | { | 65 | { |
66 | delete catDB; | 66 | delete catDB; |
67 | catDB = 0; | 67 | catDB = 0; |
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) | 71 | bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) |
72 | { | 72 | { |
73 | SlZDataBase* db = (SlZDataBase*)database; | 73 | SlZDataBase* db = (SlZDataBase*)database; |
74 | 74 | ||
75 | // for syncing: we need setting of the two fields | 75 | // for syncing: we need setting of the two fields |
76 | addr.setExternalUID( QString::number( contact ) ); | 76 | addr.setExternalUID( QString::number( contact ) ); |
77 | addr.setOriginalExternalUID( QString::number( contact ) ); | 77 | addr.setOriginalExternalUID( QString::number( contact ) ); |
78 | addr.setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); | 78 | addr.setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); |
79 | 79 | ||
80 | 80 | ||
81 | // name | 81 | // name |
82 | //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); | 82 | //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); |
83 | addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); // needs fix | 83 | addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); // needs fix |
84 | 84 | ||
85 | addr.setFamilyName( db->readField(ZdbAdrs::LastName) ); | 85 | addr.setFamilyName( db->readField(ZdbAdrs::LastName) ); |
86 | addr.setGivenName( db->readField(ZdbAdrs::FirstName) ); | 86 | addr.setGivenName( db->readField(ZdbAdrs::FirstName) ); |
87 | addr.setAdditionalName( db->readField(ZdbAdrs::MiddleName) ); | 87 | addr.setAdditionalName( db->readField(ZdbAdrs::MiddleName) ); |
88 | addr.setPrefix( db->readField(ZdbAdrs::Title) ); | 88 | addr.setPrefix( db->readField(ZdbAdrs::Title) ); |
89 | addr.setSuffix( db->readField(ZdbAdrs::Suffix) ); | 89 | addr.setSuffix( db->readField(ZdbAdrs::Suffix) ); |
90 | 90 | ||
91 | 91 | ||
92 | QString emailstr = db->readField(ZdbAdrs::Emails); | 92 | QString emailstr = db->readField(ZdbAdrs::Emails); |
93 | emailstr.replace( QRegExp(","), " " ); | 93 | emailstr.replace( QRegExp(","), " " ); |
94 | emailstr.replace( QRegExp(";"), " " ); | 94 | emailstr.replace( QRegExp(";"), " " ); |
95 | emailstr.replace( QRegExp(":"), " " ); | 95 | emailstr.replace( QRegExp(":"), " " ); |
96 | //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); | 96 | //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); |
97 | QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); | 97 | QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); |
98 | bool defE = false; | 98 | bool defE = false; |
99 | bool found = false; | 99 | bool found = false; |
100 | for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { | 100 | for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { |
101 | if (found ) | 101 | if (found ) |
102 | defE = false; | 102 | defE = false; |
103 | else | 103 | else |
104 | found = defE = ((*it).lower() == db->readField(ZdbAdrs::DefaultEmail).lower()); | 104 | found = defE = ((*it).lower() == db->readField(ZdbAdrs::DefaultEmail).lower()); |
105 | addr.insertEmail( *it, defE ); | 105 | addr.insertEmail( *it, defE ); |
106 | } | 106 | } |
107 | if ( ! found ) | 107 | if ( ! found ) |
108 | if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty()) | 108 | if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty()) |
109 | addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true); | 109 | addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true); |
110 | 110 | ||
111 | // home | 111 | // home |
112 | if ((!db->readField(ZdbAdrs::HomeStreet).isEmpty()) || | 112 | if ((!db->readField(ZdbAdrs::HomeStreet).isEmpty()) || |
113 | (!db->readField(ZdbAdrs::HomeCity).isEmpty()) || | 113 | (!db->readField(ZdbAdrs::HomeCity).isEmpty()) || |
114 | (!db->readField(ZdbAdrs::HomeState).isEmpty()) || | 114 | (!db->readField(ZdbAdrs::HomeState).isEmpty()) || |
115 | (!db->readField(ZdbAdrs::HomeZip).isEmpty()) || | 115 | (!db->readField(ZdbAdrs::HomeZip).isEmpty()) || |
116 | (!db->readField(ZdbAdrs::HomeCountry).isEmpty())) | 116 | (!db->readField(ZdbAdrs::HomeCountry).isEmpty())) |
117 | { | 117 | { |
118 | Address homeaddress; | 118 | Address homeaddress; |
119 | homeaddress.setType(Address::Home); | 119 | homeaddress.setType(Address::Home); |
120 | //US homeaddress.setPostOfficeBox( "" ); | 120 | //US homeaddress.setPostOfficeBox( "" ); |
121 | //US homeaddress.setExtended( "" ); | 121 | //US homeaddress.setExtended( "" ); |
122 | homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) ); | 122 | homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) ); |
123 | homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) ); | 123 | homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) ); |
124 | homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) ); | 124 | homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) ); |
125 | homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) ); | 125 | homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) ); |
126 | homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) ); | 126 | homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) ); |
127 | 127 | ||
128 | addr.insertAddress( homeaddress ); | 128 | addr.insertAddress( homeaddress ); |
129 | } | 129 | } |
130 | 130 | ||
131 | if (!db->readField(ZdbAdrs::HomePhone).isEmpty()) | 131 | if (!db->readField(ZdbAdrs::HomePhone).isEmpty()) |
132 | { | 132 | { |
133 | PhoneNumber homephone; | 133 | PhoneNumber homephone; |
134 | homephone.setType( PhoneNumber::Home ); | 134 | homephone.setType( PhoneNumber::Home ); |
135 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); | 135 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); |
136 | addr.insertPhoneNumber( homephone ); | 136 | addr.insertPhoneNumber( homephone ); |
137 | } | 137 | } |
138 | 138 | ||
139 | if (!db->readField(ZdbAdrs::HomeFax).isEmpty()) | 139 | if (!db->readField(ZdbAdrs::HomeFax).isEmpty()) |
140 | { | 140 | { |
141 | PhoneNumber homefax; | 141 | PhoneNumber homefax; |
142 | homefax.setType( PhoneNumber::Home | PhoneNumber::Fax ); | 142 | homefax.setType( PhoneNumber::Home | PhoneNumber::Fax ); |
143 | homefax.setNumber( db->readField(ZdbAdrs::HomeFax) ); | 143 | homefax.setNumber( db->readField(ZdbAdrs::HomeFax) ); |
144 | addr.insertPhoneNumber( homefax ); | 144 | addr.insertPhoneNumber( homefax ); |
145 | } | 145 | } |
146 | 146 | ||
147 | if (!db->readField(ZdbAdrs::HomeMobile).isEmpty()) | 147 | if (!db->readField(ZdbAdrs::HomeMobile).isEmpty()) |
148 | { | 148 | { |
149 | PhoneNumber homemobile; | 149 | PhoneNumber homemobile; |
150 | homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell ); | 150 | homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell ); |
151 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); | 151 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); |
152 | addr.insertPhoneNumber( homemobile ); | 152 | addr.insertPhoneNumber( homemobile ); |
153 | } | 153 | } |
154 | 154 | ||
155 | addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) ); | 155 | addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) ); |
156 | 156 | ||
157 | 157 | ||
158 | // business | 158 | // business |
159 | if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) || | 159 | if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) || |
160 | (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) || | 160 | (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) || |
161 | (!db->readField(ZdbAdrs::BusinessState).isEmpty()) || | 161 | (!db->readField(ZdbAdrs::BusinessState).isEmpty()) || |
162 | (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) || | 162 | (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) || |
163 | (!db->readField(ZdbAdrs::BusinessCountry).isEmpty())) | 163 | (!db->readField(ZdbAdrs::BusinessCountry).isEmpty())) |
164 | { | 164 | { |
165 | Address businessaddress; | 165 | Address businessaddress; |
166 | businessaddress.setType(Address::Work); | 166 | businessaddress.setType(Address::Work); |
167 | //US businessaddress.setPostOfficeBox( "" ); | 167 | //US businessaddress.setPostOfficeBox( "" ); |
168 | //US businessaddress.setExtended( "" ); | 168 | //US businessaddress.setExtended( "" ); |
169 | businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) ); | 169 | businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) ); |
170 | businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) ); | 170 | businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) ); |
171 | businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) ); | 171 | businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) ); |
172 | businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) ); | 172 | businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) ); |
173 | businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) ); | 173 | businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) ); |
174 | 174 | ||
175 | addr.insertAddress( businessaddress ); | 175 | addr.insertAddress( businessaddress ); |
176 | } | 176 | } |
177 | 177 | ||
178 | 178 | ||
179 | if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty()) | 179 | if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty()) |
180 | { | 180 | { |
181 | PhoneNumber businessphone; | 181 | PhoneNumber businessphone; |
182 | businessphone.setType( PhoneNumber::Work ); | 182 | businessphone.setType( PhoneNumber::Work ); |
183 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); | 183 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); |
184 | addr.insertPhoneNumber( businessphone ); | 184 | addr.insertPhoneNumber( businessphone ); |
185 | } | 185 | } |
186 | 186 | ||
187 | if (!db->readField(ZdbAdrs::BusinessFax).isEmpty()) | 187 | if (!db->readField(ZdbAdrs::BusinessFax).isEmpty()) |
188 | { | 188 | { |
189 | PhoneNumber businessfax; | 189 | PhoneNumber businessfax; |
190 | businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax ); | 190 | businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax ); |
191 | businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) ); | 191 | businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) ); |
192 | addr.insertPhoneNumber( businessfax ); | 192 | addr.insertPhoneNumber( businessfax ); |
193 | } | 193 | } |
194 | 194 | ||
195 | if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty()) | 195 | if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty()) |
196 | { | 196 | { |
197 | PhoneNumber businessmobile; | 197 | PhoneNumber businessmobile; |
198 | businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell ); | 198 | businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell ); |
199 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); | 199 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); |
200 | addr.insertPhoneNumber( businessmobile ); | 200 | addr.insertPhoneNumber( businessmobile ); |
201 | } | 201 | } |
202 | 202 | ||
203 | if (!db->readField(ZdbAdrs::BusinessPager).isEmpty()) | 203 | if (!db->readField(ZdbAdrs::BusinessPager).isEmpty()) |
204 | { | 204 | { |
205 | PhoneNumber businesspager; | 205 | PhoneNumber businesspager; |
206 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); | 206 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); |
207 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); | 207 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); |
208 | addr.insertPhoneNumber( businesspager ); | 208 | addr.insertPhoneNumber( businesspager ); |
209 | } | 209 | } |
210 | 210 | ||
211 | addr.setRole( db->readField(ZdbAdrs::JobTitle) ); | 211 | addr.setRole( db->readField(ZdbAdrs::JobTitle) ); |
212 | addr.setOrganization( db->readField(ZdbAdrs::Company) ); | 212 | addr.setOrganization( db->readField(ZdbAdrs::Company) ); |
213 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) ); | 213 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) ); |
214 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) ); | 214 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) ); |
215 | addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) ); | 215 | addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) ); |
216 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) ); | 216 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) ); |
217 | addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) ); | 217 | addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) ); |
218 | 218 | ||
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 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); | 316 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); |
316 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); | 317 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); |
317 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); | 318 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); |
318 | database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode()); | 319 | database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode()); |
319 | database->writeField(ZdbAdrs::HomeCountry, homeaddress.country()); | 320 | database->writeField(ZdbAdrs::HomeCountry, homeaddress.country()); |
320 | } | 321 | } |
321 | 322 | ||
322 | PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home ); | 323 | PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home ); |
323 | if (!homephone.number().isEmpty()) | 324 | if (!homephone.number().isEmpty()) |
324 | database->writeField(ZdbAdrs::HomePhone, homephone.number()); | 325 | database->writeField(ZdbAdrs::HomePhone, homephone.number()); |
325 | 326 | ||
326 | PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ); | 327 | PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ); |
327 | if (!homefax.number().isEmpty()) | 328 | if (!homefax.number().isEmpty()) |
328 | database->writeField(ZdbAdrs::HomeFax, homefax.number()); | 329 | database->writeField(ZdbAdrs::HomeFax, homefax.number()); |
329 | 330 | ||
330 | PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell ); | 331 | PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell ); |
331 | if (!homemobile.number().isEmpty()) { | 332 | if (!homemobile.number().isEmpty()) { |
332 | database->writeField(ZdbAdrs::HomeMobile, homemobile.number()); | 333 | database->writeField(ZdbAdrs::HomeMobile, homemobile.number()); |
333 | cellHome = true; | 334 | cellHome = true; |
334 | } | 335 | } |
335 | 336 | ||
336 | database->writeField(ZdbAdrs::HomeWebPage, addr.url().url()); | 337 | database->writeField(ZdbAdrs::HomeWebPage, addr.url().url()); |
337 | 338 | ||
338 | 339 | ||
339 | // business | 340 | // business |
340 | const Address businessaddress = addr.address(Address::Work); | 341 | const Address businessaddress = addr.address(Address::Work); |
341 | if (!businessaddress.isEmpty()) { | 342 | if (!businessaddress.isEmpty()) { |
343 | qDebug("write business address "); | ||
342 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); | 344 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); |
343 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); | 345 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); |
344 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); | 346 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); |
345 | database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode()); | 347 | database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode()); |
346 | database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country()); | 348 | database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country()); |
347 | } | 349 | } |
348 | 350 | ||
349 | PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work ); | 351 | PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work ); |
350 | if (!businessphone.number().isEmpty()) | 352 | if (!businessphone.number().isEmpty()) |
351 | database->writeField(ZdbAdrs::BusinessPhone, businessphone.number()); | 353 | database->writeField(ZdbAdrs::BusinessPhone, businessphone.number()); |
352 | 354 | ||
353 | PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ); | 355 | PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ); |
354 | if (!businessfax.number().isEmpty()) | 356 | if (!businessfax.number().isEmpty()) |
355 | database->writeField(ZdbAdrs::BusinessFax, businessfax.number()); | 357 | database->writeField(ZdbAdrs::BusinessFax, businessfax.number()); |
356 | 358 | ||
357 | PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell ); | 359 | PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell ); |
358 | if (!businessmobile.number().isEmpty()) { | 360 | if (!businessmobile.number().isEmpty()) { |
359 | cellWork = true; | 361 | cellWork = true; |
360 | database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number()); | 362 | database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number()); |
361 | } | 363 | } |
362 | PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell ); | 364 | PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell ); |
363 | if (! mobile.number().isEmpty()) { | 365 | if (! mobile.number().isEmpty()) { |
364 | if ( ! cellHome ) | 366 | if ( ! cellHome ) |
365 | database->writeField(ZdbAdrs::HomeMobile, mobile.number()); | 367 | database->writeField(ZdbAdrs::HomeMobile, mobile.number()); |
366 | else if (! cellWork ) | 368 | else if (! cellWork ) |
367 | database->writeField(ZdbAdrs::BusinessMobile, mobile.number()); | 369 | database->writeField(ZdbAdrs::BusinessMobile, mobile.number()); |
368 | } | 370 | } |
369 | 371 | ||
370 | PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager ); | 372 | PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager ); |
371 | if (!businesspager.number().isEmpty()) | 373 | if (!businesspager.number().isEmpty()) |
372 | database->writeField(ZdbAdrs::BusinessPager, businesspager.number()); | 374 | database->writeField(ZdbAdrs::BusinessPager, businesspager.number()); |
373 | 375 | ||
374 | database->writeField(ZdbAdrs::JobTitle, addr.role()); | 376 | database->writeField(ZdbAdrs::JobTitle, addr.role()); |
375 | database->writeField(ZdbAdrs::Company, addr.organization()); | 377 | database->writeField(ZdbAdrs::Company, addr.organization()); |
376 | 378 | ||
377 | database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" )); | 379 | database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" )); |
378 | database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); | 380 | database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); |
379 | database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" )); | 381 | database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" )); |
380 | database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" )); | 382 | database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" )); |
381 | database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" )); | 383 | database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" )); |
382 | 384 | ||
383 | //personal | 385 | //personal |
384 | database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" )); | 386 | database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" )); |
385 | 387 | ||
386 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); | 388 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); |
387 | //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()); |
388 | //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?"); |
389 | //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); | 391 | //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); |
390 | if (gt == "male") | 392 | if (gt == "male") |
391 | database->writeField(ZdbAdrs::Gender, "male"); | 393 | database->writeField(ZdbAdrs::Gender, "male"); |
392 | else if (gt == "female") | 394 | else if (gt == "female") |
393 | database->writeField(ZdbAdrs::Gender, "female"); | 395 | database->writeField(ZdbAdrs::Gender, "female"); |
394 | else | 396 | else |
395 | database->writeField(ZdbAdrs::Gender, ""); | 397 | database->writeField(ZdbAdrs::Gender, ""); |
396 | 398 | ||
397 | 399 | ||
398 | QDate dt = KGlobal::locale()->readDate( | 400 | QDate dt = KGlobal::locale()->readDate( |
399 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate | 401 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate |
400 | if ( dt.isValid() ) { | 402 | if ( dt.isValid() ) { |
401 | QString dateS = KGlobal::locale()->formatDate(dt, true ); | 403 | QString dateS = KGlobal::locale()->formatDate(dt, true ); |
402 | database->writeField(ZdbAdrs::Anniversary, dateS ); | 404 | database->writeField(ZdbAdrs::Anniversary, dateS ); |
403 | } | 405 | } |
404 | database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" )); | 406 | database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" )); |
405 | dt = addr.birthday().date(); | 407 | dt = addr.birthday().date(); |
406 | if ( dt.isValid() ) { | 408 | if ( dt.isValid() ) { |
407 | QString dateS = KGlobal::locale()->formatDate(dt, true ); | 409 | QString dateS = KGlobal::locale()->formatDate(dt, true ); |
408 | database->writeField(ZdbAdrs::Birthday, dateS); | 410 | database->writeField(ZdbAdrs::Birthday, dateS); |
409 | } | 411 | } |
410 | database->writeField(ZdbAdrs::Nickname, addr.nickName()); | 412 | database->writeField(ZdbAdrs::Nickname, addr.nickName()); |
411 | 413 | ||
412 | // other | 414 | // other |
413 | database->writeField(ZdbAdrs::Notes, addr.note()); | 415 | database->writeField(ZdbAdrs::Notes, addr.note()); |
414 | 416 | ||
415 | //US QString groups() const { return find( Qtopia::Groups ); } | 417 | //US QString groups() const { return find( Qtopia::Groups ); } |
416 | //US QStringList groupList() const; | 418 | //US QStringList groupList() const; |
417 | 419 | ||
418 | 420 | ||
419 | //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); | 421 | //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); |
420 | 422 | ||
421 | QStringList cats = addr.categories(); | 423 | QStringList cats = addr.categories(); |
422 | int ii; | 424 | int ii; |
423 | for ( ii = 0; ii < cats.count() ;++ii ) { | 425 | for ( ii = 0; ii < cats.count() ;++ii ) { |
424 | if ( !catDB->exists( cats[ii] )) | 426 | if ( !catDB->exists( cats[ii] )) |
425 | catDB->addCategory(cats[ii]); | 427 | catDB->addCategory(cats[ii]); |
426 | } | 428 | } |
427 | QArray<int> iar; | 429 | QArray<int> iar; |
428 | if ( !cats.isEmpty() ) { | 430 | if ( !cats.isEmpty() ) { |
429 | QArray<int> iar = catDB->ids(cats); | 431 | QArray<int> iar = catDB->ids(cats); |
430 | qDebug("***cat count is %d ", iar.count()); | 432 | qDebug("***cat count is %d ", iar.count()); |
431 | database->updateCategories(contact, iar); | 433 | database->updateCategories(contact, iar); |
432 | } | 434 | } |
433 | 435 | ||
434 | return true; | 436 | return true; |
435 | } | 437 | } |
436 | 438 | ||
437 | QDate SharpDTMConverter::convertDate( QString s) | 439 | QDate SharpDTMConverter::convertDate( QString s) |
438 | { | 440 | { |
439 | QDate dt = KGlobal::locale()->readDate( s ); | 441 | QDate dt = KGlobal::locale()->readDate( s ); |
440 | return dt; | 442 | return dt; |
441 | return QDate (); | 443 | return QDate (); |
442 | } | 444 | } |