summaryrefslogtreecommitdiff
authoreilers <eilers>2003-01-03 16:58:03 (UTC)
committer eilers <eilers>2003-01-03 16:58:03 (UTC)
commit7a97cd36cbc4c1a82043cdd44c82f931e2cdbb7f (patch) (unidiff)
tree7b5b2eb5382b3b33ddc752d0b39312f5f00c04a7
parentd265299dd3d2ed39a343d3bdfd05eda6705a5c2c (diff)
downloadopie-7a97cd36cbc4c1a82043cdd44c82f931e2cdbb7f.zip
opie-7a97cd36cbc4c1a82043cdd44c82f931e2cdbb7f.tar.gz
opie-7a97cd36cbc4c1a82043cdd44c82f931e2cdbb7f.tar.bz2
Reenable debug output
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontactaccessbackend_xml.h17
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.h17
2 files changed, 22 insertions, 12 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index 6a1c91d..6477705 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -8,24 +8,27 @@
8 *modify it under the terms of the GNU Library General Public 8 *modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * ===================================================================== 11 * =====================================================================
12 * ToDo: XML-Backend: Automatic reload if something was changed... 12 * ToDo: XML-Backend: Automatic reload if something was changed...
13 * 13 *
14 * 14 *
15 * ===================================================================== 15 * =====================================================================
16 * Version: $Id$ 16 * Version: $Id$
17 * ===================================================================== 17 * =====================================================================
18 * History: 18 * History:
19 * $Log$ 19 * $Log$
20 * Revision 1.12 2003/01/03 16:58:03 eilers
21 * Reenable debug output
22 *
20 * Revision 1.11 2003/01/03 12:31:28 eilers 23 * Revision 1.11 2003/01/03 12:31:28 eilers
21 * Bugfix for calculating data diffs.. 24 * Bugfix for calculating data diffs..
22 * 25 *
23 * Revision 1.10 2003/01/02 14:27:12 eilers 26 * Revision 1.10 2003/01/02 14:27:12 eilers
24 * Improved query by example: Search by date is possible.. First step 27 * Improved query by example: Search by date is possible.. First step
25 * for a today plugin for birthdays.. 28 * for a today plugin for birthdays..
26 * 29 *
27 * Revision 1.9 2002/12/08 12:48:57 eilers 30 * Revision 1.9 2002/12/08 12:48:57 eilers
28 * Moved journal-enum from ocontact into i the xml-backend.. 31 * Moved journal-enum from ocontact into i the xml-backend..
29 * 32 *
30 * Revision 1.8 2002/11/14 17:04:24 eilers 33 * Revision 1.8 2002/11/14 17:04:24 eilers
31 * Sorting will now work if fullname is identical on some entries 34 * Sorting will now work if fullname is identical on some entries
@@ -258,38 +261,40 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
258 if ( settings & OContactAccess::DateMonth ){ 261 if ( settings & OContactAccess::DateMonth ){
259 if ( queryDate->month() != checkDate->month() ) 262 if ( queryDate->month() != checkDate->month() )
260 allcorrect = false; 263 allcorrect = false;
261 } 264 }
262 if ( settings & OContactAccess::DateDay ){ 265 if ( settings & OContactAccess::DateDay ){
263 if ( queryDate->day() != checkDate->day() ) 266 if ( queryDate->day() != checkDate->day() )
264 allcorrect = false; 267 allcorrect = false;
265 } 268 }
266 if ( settings & OContactAccess::DateDiff ) { 269 if ( settings & OContactAccess::DateDiff ) {
267 QDate current = QDate::currentDate(); 270 QDate current = QDate::currentDate();
268 // We have to equalize the year, otherwise 271 // We have to equalize the year, otherwise
269 // the search will fail.. 272 // the search will fail..
270 checkDate->setYMD( current.year(), checkDate->month(), checkDate->day() ); 273 checkDate->setYMD( current.year(),
274 checkDate->month(),
275 checkDate->day() );
271 if ( *checkDate < current ) 276 if ( *checkDate < current )
272 checkDate->setYMD( current.year()+1, 277 checkDate->setYMD( current.year()+1,
273 checkDate->month(), 278 checkDate->month(),
274 checkDate->day() ); 279 checkDate->day() );
275 // qWarning("Checking if %s is between %s and %s ! ", 280 qWarning("Checking if %s is between %s and %s ! ",
276 // checkDate->toString().latin1(), 281 checkDate->toString().latin1(),
277 // current.toString().latin1(), 282 current.toString().latin1(),
278 // queryDate->toString().latin1() ); 283 queryDate->toString().latin1() );
279 if ( current.daysTo( *queryDate ) > 0 ){ 284 if ( current.daysTo( *queryDate ) > 0 ){
280 if ( !( ( *checkDate >= current ) && 285 if ( !( ( *checkDate >= current ) &&
281 ( *checkDate <= *queryDate ) ) ){ 286 ( *checkDate <= *queryDate ) ) ){
282 allcorrect = false; 287 allcorrect = false;
283 //qWarning (" Nope!.."); 288 qWarning (" Nope!..");
284 } 289 }
285 } 290 }
286 } 291 }
287 } else{ 292 } else{
288 // checkDate is invalid. Therfore this entry is always rejected 293 // checkDate is invalid. Therfore this entry is always rejected
289 allcorrect = false; 294 allcorrect = false;
290 } 295 }
291 } 296 }
292 297
293 delete queryDate; 298 delete queryDate;
294 queryDate = 0l; 299 queryDate = 0l;
295 delete checkDate; 300 delete checkDate;
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
index 6a1c91d..6477705 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
@@ -8,24 +8,27 @@
8 *modify it under the terms of the GNU Library General Public 8 *modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * ===================================================================== 11 * =====================================================================
12 * ToDo: XML-Backend: Automatic reload if something was changed... 12 * ToDo: XML-Backend: Automatic reload if something was changed...
13 * 13 *
14 * 14 *
15 * ===================================================================== 15 * =====================================================================
16 * Version: $Id$ 16 * Version: $Id$
17 * ===================================================================== 17 * =====================================================================
18 * History: 18 * History:
19 * $Log$ 19 * $Log$
20 * Revision 1.12 2003/01/03 16:58:03 eilers
21 * Reenable debug output
22 *
20 * Revision 1.11 2003/01/03 12:31:28 eilers 23 * Revision 1.11 2003/01/03 12:31:28 eilers
21 * Bugfix for calculating data diffs.. 24 * Bugfix for calculating data diffs..
22 * 25 *
23 * Revision 1.10 2003/01/02 14:27:12 eilers 26 * Revision 1.10 2003/01/02 14:27:12 eilers
24 * Improved query by example: Search by date is possible.. First step 27 * Improved query by example: Search by date is possible.. First step
25 * for a today plugin for birthdays.. 28 * for a today plugin for birthdays..
26 * 29 *
27 * Revision 1.9 2002/12/08 12:48:57 eilers 30 * Revision 1.9 2002/12/08 12:48:57 eilers
28 * Moved journal-enum from ocontact into i the xml-backend.. 31 * Moved journal-enum from ocontact into i the xml-backend..
29 * 32 *
30 * Revision 1.8 2002/11/14 17:04:24 eilers 33 * Revision 1.8 2002/11/14 17:04:24 eilers
31 * Sorting will now work if fullname is identical on some entries 34 * Sorting will now work if fullname is identical on some entries
@@ -258,38 +261,40 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
258 if ( settings & OContactAccess::DateMonth ){ 261 if ( settings & OContactAccess::DateMonth ){
259 if ( queryDate->month() != checkDate->month() ) 262 if ( queryDate->month() != checkDate->month() )
260 allcorrect = false; 263 allcorrect = false;
261 } 264 }
262 if ( settings & OContactAccess::DateDay ){ 265 if ( settings & OContactAccess::DateDay ){
263 if ( queryDate->day() != checkDate->day() ) 266 if ( queryDate->day() != checkDate->day() )
264 allcorrect = false; 267 allcorrect = false;
265 } 268 }
266 if ( settings & OContactAccess::DateDiff ) { 269 if ( settings & OContactAccess::DateDiff ) {
267 QDate current = QDate::currentDate(); 270 QDate current = QDate::currentDate();
268 // We have to equalize the year, otherwise 271 // We have to equalize the year, otherwise
269 // the search will fail.. 272 // the search will fail..
270 checkDate->setYMD( current.year(), checkDate->month(), checkDate->day() ); 273 checkDate->setYMD( current.year(),
274 checkDate->month(),
275 checkDate->day() );
271 if ( *checkDate < current ) 276 if ( *checkDate < current )
272 checkDate->setYMD( current.year()+1, 277 checkDate->setYMD( current.year()+1,
273 checkDate->month(), 278 checkDate->month(),
274 checkDate->day() ); 279 checkDate->day() );
275 // qWarning("Checking if %s is between %s and %s ! ", 280 qWarning("Checking if %s is between %s and %s ! ",
276 // checkDate->toString().latin1(), 281 checkDate->toString().latin1(),
277 // current.toString().latin1(), 282 current.toString().latin1(),
278 // queryDate->toString().latin1() ); 283 queryDate->toString().latin1() );
279 if ( current.daysTo( *queryDate ) > 0 ){ 284 if ( current.daysTo( *queryDate ) > 0 ){
280 if ( !( ( *checkDate >= current ) && 285 if ( !( ( *checkDate >= current ) &&
281 ( *checkDate <= *queryDate ) ) ){ 286 ( *checkDate <= *queryDate ) ) ){
282 allcorrect = false; 287 allcorrect = false;
283 //qWarning (" Nope!.."); 288 qWarning (" Nope!..");
284 } 289 }
285 } 290 }
286 } 291 }
287 } else{ 292 } else{
288 // checkDate is invalid. Therfore this entry is always rejected 293 // checkDate is invalid. Therfore this entry is always rejected
289 allcorrect = false; 294 allcorrect = false;
290 } 295 }
291 } 296 }
292 297
293 delete queryDate; 298 delete queryDate;
294 queryDate = 0l; 299 queryDate = 0l;
295 delete checkDate; 300 delete checkDate;