summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontactaccessbackend_xml.cpp5
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp5
2 files changed, 8 insertions, 2 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp
index 9fe3d1e..c5a7820 100644
--- a/libopie/pim/ocontactaccessbackend_xml.cpp
+++ b/libopie/pim/ocontactaccessbackend_xml.cpp
@@ -1,43 +1,46 @@
1/* 1/*
2 * XML Backend for the OPIE-Contact Database. 2 * XML Backend for the OPIE-Contact Database.
3 * 3 *
4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
5 * 5 *
6 * ===================================================================== 6 * =====================================================================
7 *This program is free software; you can redistribute it and/or 7 *This program is free software; you can redistribute it and/or
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.4 2003/03/21 14:32:54 mickeyl
21 * g++ compliance fix: default arguments belong into the declaration, but not the definition
22 *
20 * Revision 1.3 2003/03/21 12:26:28 eilers 23 * Revision 1.3 2003/03/21 12:26:28 eilers
21 * Fixing small bug: If we search a birthday from today to today, it returned 24 * Fixing small bug: If we search a birthday from today to today, it returned
22 * every contact .. 25 * every contact ..
23 * 26 *
24 * Revision 1.2 2003/03/21 10:33:09 eilers 27 * Revision 1.2 2003/03/21 10:33:09 eilers
25 * Merged speed optimized xml backend for contacts to main. 28 * Merged speed optimized xml backend for contacts to main.
26 * Added QDateTime to querybyexample. For instance, it is now possible to get 29 * Added QDateTime to querybyexample. For instance, it is now possible to get
27 * all Birthdays/Anniversaries between two dates. This should be used 30 * all Birthdays/Anniversaries between two dates. This should be used
28 * to show all birthdays in the datebook.. 31 * to show all birthdays in the datebook..
29 * This change is sourcecode backward compatible but you have to upgrade 32 * This change is sourcecode backward compatible but you have to upgrade
30 * the binaries for today-addressbook. 33 * the binaries for today-addressbook.
31 * 34 *
32 * Revision 1.1.2.2 2003/02/11 12:17:28 eilers 35 * Revision 1.1.2.2 2003/02/11 12:17:28 eilers
33 * Speed optimization. Removed the sequential search loops. 36 * Speed optimization. Removed the sequential search loops.
34 * 37 *
35 * Revision 1.1.2.1 2003/02/10 15:31:38 eilers 38 * Revision 1.1.2.1 2003/02/10 15:31:38 eilers
36 * Writing offsets to debug output.. 39 * Writing offsets to debug output..
37 * 40 *
38 * Revision 1.1 2003/02/09 15:05:01 eilers 41 * Revision 1.1 2003/02/09 15:05:01 eilers
39 * Nothing happened.. Just some cleanup before I will start.. 42 * Nothing happened.. Just some cleanup before I will start..
40 * 43 *
41 * Revision 1.12 2003/01/03 16:58:03 eilers 44 * Revision 1.12 2003/01/03 16:58:03 eilers
42 * Reenable debug output 45 * Reenable debug output
43 * 46 *
@@ -83,49 +86,49 @@
83 86
84#include "ocontactaccessbackend_xml.h" 87#include "ocontactaccessbackend_xml.h"
85 88
86#include <qasciidict.h> 89#include <qasciidict.h>
87#include <qdatetime.h> 90#include <qdatetime.h>
88#include <qfile.h> 91#include <qfile.h>
89#include <qfileinfo.h> 92#include <qfileinfo.h>
90#include <qregexp.h> 93#include <qregexp.h>
91#include <qarray.h> 94#include <qarray.h>
92#include <qmap.h> 95#include <qmap.h>
93#include <qdatetime.h> 96#include <qdatetime.h>
94 97
95#include <qpe/global.h> 98#include <qpe/global.h>
96 99
97#include <opie/xmltree.h> 100#include <opie/xmltree.h>
98#include "ocontactaccessbackend.h" 101#include "ocontactaccessbackend.h"
99#include "ocontactaccess.h" 102#include "ocontactaccess.h"
100 103
101#include <stdlib.h> 104#include <stdlib.h>
102#include <errno.h> 105#include <errno.h>
103 106
104using namespace Opie; 107using namespace Opie;
105 108
106 109
107OContactAccessBackend_XML::OContactAccessBackend_XML ( QString appname, QString filename = 0l ): 110OContactAccessBackend_XML::OContactAccessBackend_XML ( QString appname, QString filename ):
108 m_changed( false ) 111 m_changed( false )
109{ 112{
110 // Just m_contactlist should call delete if an entry 113 // Just m_contactlist should call delete if an entry
111 // is removed. 114 // is removed.
112 m_contactList.setAutoDelete( true ); 115 m_contactList.setAutoDelete( true );
113 m_uidToContact.setAutoDelete( false ); 116 m_uidToContact.setAutoDelete( false );
114 117
115 m_appName = appname; 118 m_appName = appname;
116 119
117 /* Set journalfile name ... */ 120 /* Set journalfile name ... */
118 m_journalName = getenv("HOME"); 121 m_journalName = getenv("HOME");
119 m_journalName +="/.abjournal" + appname; 122 m_journalName +="/.abjournal" + appname;
120 123
121 /* Expecting to access the default filename if nothing else is set */ 124 /* Expecting to access the default filename if nothing else is set */
122 if ( filename.isEmpty() ){ 125 if ( filename.isEmpty() ){
123 m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" ); 126 m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" );
124 } else 127 } else
125 m_fileName = filename; 128 m_fileName = filename;
126 129
127 /* Load Database now */ 130 /* Load Database now */
128 load (); 131 load ();
129} 132}
130 133
131bool OContactAccessBackend_XML::save() 134bool OContactAccessBackend_XML::save()
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 9fe3d1e..c5a7820 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -1,43 +1,46 @@
1/* 1/*
2 * XML Backend for the OPIE-Contact Database. 2 * XML Backend for the OPIE-Contact Database.
3 * 3 *
4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
5 * 5 *
6 * ===================================================================== 6 * =====================================================================
7 *This program is free software; you can redistribute it and/or 7 *This program is free software; you can redistribute it and/or
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.4 2003/03/21 14:32:54 mickeyl
21 * g++ compliance fix: default arguments belong into the declaration, but not the definition
22 *
20 * Revision 1.3 2003/03/21 12:26:28 eilers 23 * Revision 1.3 2003/03/21 12:26:28 eilers
21 * Fixing small bug: If we search a birthday from today to today, it returned 24 * Fixing small bug: If we search a birthday from today to today, it returned
22 * every contact .. 25 * every contact ..
23 * 26 *
24 * Revision 1.2 2003/03/21 10:33:09 eilers 27 * Revision 1.2 2003/03/21 10:33:09 eilers
25 * Merged speed optimized xml backend for contacts to main. 28 * Merged speed optimized xml backend for contacts to main.
26 * Added QDateTime to querybyexample. For instance, it is now possible to get 29 * Added QDateTime to querybyexample. For instance, it is now possible to get
27 * all Birthdays/Anniversaries between two dates. This should be used 30 * all Birthdays/Anniversaries between two dates. This should be used
28 * to show all birthdays in the datebook.. 31 * to show all birthdays in the datebook..
29 * This change is sourcecode backward compatible but you have to upgrade 32 * This change is sourcecode backward compatible but you have to upgrade
30 * the binaries for today-addressbook. 33 * the binaries for today-addressbook.
31 * 34 *
32 * Revision 1.1.2.2 2003/02/11 12:17:28 eilers 35 * Revision 1.1.2.2 2003/02/11 12:17:28 eilers
33 * Speed optimization. Removed the sequential search loops. 36 * Speed optimization. Removed the sequential search loops.
34 * 37 *
35 * Revision 1.1.2.1 2003/02/10 15:31:38 eilers 38 * Revision 1.1.2.1 2003/02/10 15:31:38 eilers
36 * Writing offsets to debug output.. 39 * Writing offsets to debug output..
37 * 40 *
38 * Revision 1.1 2003/02/09 15:05:01 eilers 41 * Revision 1.1 2003/02/09 15:05:01 eilers
39 * Nothing happened.. Just some cleanup before I will start.. 42 * Nothing happened.. Just some cleanup before I will start..
40 * 43 *
41 * Revision 1.12 2003/01/03 16:58:03 eilers 44 * Revision 1.12 2003/01/03 16:58:03 eilers
42 * Reenable debug output 45 * Reenable debug output
43 * 46 *
@@ -83,49 +86,49 @@
83 86
84#include "ocontactaccessbackend_xml.h" 87#include "ocontactaccessbackend_xml.h"
85 88
86#include <qasciidict.h> 89#include <qasciidict.h>
87#include <qdatetime.h> 90#include <qdatetime.h>
88#include <qfile.h> 91#include <qfile.h>
89#include <qfileinfo.h> 92#include <qfileinfo.h>
90#include <qregexp.h> 93#include <qregexp.h>
91#include <qarray.h> 94#include <qarray.h>
92#include <qmap.h> 95#include <qmap.h>
93#include <qdatetime.h> 96#include <qdatetime.h>
94 97
95#include <qpe/global.h> 98#include <qpe/global.h>
96 99
97#include <opie/xmltree.h> 100#include <opie/xmltree.h>
98#include "ocontactaccessbackend.h" 101#include "ocontactaccessbackend.h"
99#include "ocontactaccess.h" 102#include "ocontactaccess.h"
100 103
101#include <stdlib.h> 104#include <stdlib.h>
102#include <errno.h> 105#include <errno.h>
103 106
104using namespace Opie; 107using namespace Opie;
105 108
106 109
107OContactAccessBackend_XML::OContactAccessBackend_XML ( QString appname, QString filename = 0l ): 110OContactAccessBackend_XML::OContactAccessBackend_XML ( QString appname, QString filename ):
108 m_changed( false ) 111 m_changed( false )
109{ 112{
110 // Just m_contactlist should call delete if an entry 113 // Just m_contactlist should call delete if an entry
111 // is removed. 114 // is removed.
112 m_contactList.setAutoDelete( true ); 115 m_contactList.setAutoDelete( true );
113 m_uidToContact.setAutoDelete( false ); 116 m_uidToContact.setAutoDelete( false );
114 117
115 m_appName = appname; 118 m_appName = appname;
116 119
117 /* Set journalfile name ... */ 120 /* Set journalfile name ... */
118 m_journalName = getenv("HOME"); 121 m_journalName = getenv("HOME");
119 m_journalName +="/.abjournal" + appname; 122 m_journalName +="/.abjournal" + appname;
120 123
121 /* Expecting to access the default filename if nothing else is set */ 124 /* Expecting to access the default filename if nothing else is set */
122 if ( filename.isEmpty() ){ 125 if ( filename.isEmpty() ){
123 m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" ); 126 m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" );
124 } else 127 } else
125 m_fileName = filename; 128 m_fileName = filename;
126 129
127 /* Load Database now */ 130 /* Load Database now */
128 load (); 131 load ();
129} 132}
130 133
131bool OContactAccessBackend_XML::save() 134bool OContactAccessBackend_XML::save()