Diffstat (limited to 'kabc/plugins/qtopia/resourceqtopia.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 95 |
1 files changed, 35 insertions, 60 deletions
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp index dc88272..4a35f19 100644 --- a/kabc/plugins/qtopia/resourceqtopia.cpp +++ b/kabc/plugins/qtopia/resourceqtopia.cpp | |||
@@ -49,7 +49,7 @@ $Id$ | |||
49 | #include "stdaddressbook.h" | 49 | #include "stdaddressbook.h" |
50 | 50 | ||
51 | #include "qtopiaconverter.h" | 51 | #include "qtopiaconverter.h" |
52 | #include "syncwidget.h" | 52 | #include "syncprefwidget.h" |
53 | 53 | ||
54 | #include "resourceqtopia.h" | 54 | #include "resourceqtopia.h" |
55 | 55 | ||
@@ -58,7 +58,7 @@ extern "C" | |||
58 | { | 58 | { |
59 | void *init_microkabc_qtopia() | 59 | void *init_microkabc_qtopia() |
60 | { | 60 | { |
61 | return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, KRES::SyncWidget>(); | 61 | return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidget>(); |
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
@@ -67,14 +67,12 @@ ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable ) | |||
67 | { | 67 | { |
68 | // we can not choose the filename. Therefore use the default to display | 68 | // we can not choose the filename. Therefore use the default to display |
69 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 69 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
70 | |||
71 | init( fileName ); | 70 | init( fileName ); |
72 | } | 71 | } |
73 | 72 | ||
74 | ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable ) | 73 | ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable ) |
75 | : Resource( 0, syncable ) | 74 | : Resource( 0, syncable ) |
76 | { | 75 | { |
77 | // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); | ||
78 | init( fileName ); | 76 | init( fileName ); |
79 | } | 77 | } |
80 | 78 | ||
@@ -106,6 +104,8 @@ Ticket *ResourceQtopia::requestSaveTicket() | |||
106 | { | 104 | { |
107 | kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl; | 105 | kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl; |
108 | 106 | ||
107 | qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1()); | ||
108 | |||
109 | if ( !addressBook() ) return 0; | 109 | if ( !addressBook() ) return 0; |
110 | 110 | ||
111 | if ( !lock( fileName() ) ) { | 111 | if ( !lock( fileName() ) ) { |
@@ -128,11 +128,11 @@ bool ResourceQtopia::doOpen() | |||
128 | return false; | 128 | return false; |
129 | } | 129 | } |
130 | 130 | ||
131 | bool res = false; | 131 | |
132 | if (mConverter == 0) | 132 | if (mConverter == 0) |
133 | { | 133 | { |
134 | mConverter = new QtopiaConverter(); | 134 | mConverter = new QtopiaConverter(); |
135 | res = mConverter->init(); | 135 | bool res = mConverter->init(); |
136 | if ( !res ) | 136 | if ( !res ) |
137 | { | 137 | { |
138 | QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file"); | 138 | QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file"); |
@@ -189,69 +189,44 @@ bool ResourceQtopia::load() | |||
189 | 189 | ||
190 | bool ResourceQtopia::save( Ticket *ticket ) | 190 | bool ResourceQtopia::save( Ticket *ticket ) |
191 | { | 191 | { |
192 | /*US | 192 | qDebug("ResourceQtopia::save: %s", fileName().latin1()); |
193 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); | ||
194 | kdDebug(5700) << "ResourceQtopia::save()" << endl; | ||
195 | |||
196 | // create backup file | ||
197 | QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); | ||
198 | 193 | ||
199 | /*US we use a simpler method to create a backupfile | ||
200 | |||
201 | (void) KSaveFile::backupFile( mFileName, QString::null | ||
202 | ,extension ); | ||
203 | |||
204 | KSaveFile saveFile( mFileName ); | ||
205 | bool ok = false; | ||
206 | if ( saveFile.status() == 0 && saveFile.file() ) | ||
207 | { | ||
208 | mFormat->saveAll( addressBook(), this, saveFile.file() ); | ||
209 | ok = saveFile.close(); | ||
210 | } | ||
211 | */ | ||
212 | 194 | ||
213 | /*US | 195 | KABC::AddressBook::Iterator it; |
214 | //US ToDo: write backupfile | 196 | bool res; |
215 | QFile info; | ||
216 | info.setName( mFileName ); | ||
217 | bool ok = info.open( IO_WriteOnly ); | ||
218 | if ( ok ) { | ||
219 | //US mFormat->saveAll( addressBook(), this, &info ); | ||
220 | 197 | ||
221 | info.close(); | 198 | for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { |
222 | ok = true; | 199 | PimContact c; |
223 | } | 200 | KABC::Addressee addressee = (*it); |
224 | else { | ||
225 | 201 | ||
202 | res = mConverter->addresseeToQtopia( *it, c ); | ||
203 | if (res == true) | ||
204 | { | ||
205 | mAccess->addContact(c); | ||
206 | // if (res == false) | ||
207 | // qDebug("Unable to append Contact %s", c.fullName().latin1()); | ||
208 | } | ||
209 | else | ||
210 | { | ||
211 | qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); | ||
212 | } | ||
226 | } | 213 | } |
227 | 214 | ||
228 | if ( !ok ) | 215 | // mAccess->addressBookUpdated(); |
229 | addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); | ||
230 | 216 | ||
231 | delete ticket; | 217 | delete ticket; |
232 | unlock( mFileName ); | 218 | unlock( fileName() ); |
233 | |||
234 | return ok; | ||
235 | |||
236 | qDebug("ResourceQtopia::save has to be changed"); | ||
237 | |||
238 | |||
239 | access->save(); | ||
240 | |||
241 | */ | ||
242 | 219 | ||
243 | return true; | 220 | return true; |
244 | } | 221 | } |
245 | 222 | ||
246 | bool ResourceQtopia::lock( const QString &fileName ) | 223 | bool ResourceQtopia::lock( const QString &lockfileName ) |
247 | { | 224 | { |
248 | kdDebug(5700) << "ResourceQtopia::lock()" << endl; | 225 | qDebug("ResourceQtopia::lock: %s", fileName().latin1()); |
249 | 226 | ||
250 | QString fn = fileName; | 227 | kdDebug(5700) << "ResourceQtopia::lock()" << endl; |
251 | 228 | ||
252 | //US change the implementation how the lockfilename is getting created | 229 | QString fn = lockfileName; |
253 | //US fn.replace( QRegExp("/"), "_" ); | ||
254 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | ||
255 | 230 | ||
256 | KURL url(fn); | 231 | KURL url(fn); |
257 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 232 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
@@ -274,9 +249,11 @@ bool ResourceQtopia::lock( const QString &fileName ) | |||
274 | file.close(); | 249 | file.close(); |
275 | 250 | ||
276 | // Create lock file | 251 | // Create lock file |
277 | int result = ::link( QFile::encodeName( mLockUniqueName ), | 252 | int result = 0; |
253 | #ifndef _WIN32_ | ||
254 | result = ::link( QFile::encodeName( mLockUniqueName ), | ||
278 | QFile::encodeName( lockName ) ); | 255 | QFile::encodeName( lockName ) ); |
279 | 256 | #endif | |
280 | if ( result == 0 ) { | 257 | if ( result == 0 ) { |
281 | addressBook()->emitAddressBookLocked(); | 258 | addressBook()->emitAddressBookLocked(); |
282 | return true; | 259 | return true; |
@@ -289,11 +266,9 @@ bool ResourceQtopia::lock( const QString &fileName ) | |||
289 | 266 | ||
290 | void ResourceQtopia::unlock( const QString &fileName ) | 267 | void ResourceQtopia::unlock( const QString &fileName ) |
291 | { | 268 | { |
269 | qDebug("ResourceQtopia::unlock() %s", fileName.latin1()); | ||
270 | |||
292 | QString fn = fileName; | 271 | QString fn = fileName; |
293 | //US change the implementation how the lockfilename is getting created | ||
294 | //US fn.replace( QRegExp( "/" ), "_" ); | ||
295 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | ||
296 | //US QString lockName = fn + ".lock"; | ||
297 | KURL url(fn); | 272 | KURL url(fn); |
298 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 273 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
299 | 274 | ||