1 files changed, 75 insertions, 51 deletions

diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 203f82c..5c6568f 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -14,33 +14,33 @@
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 2.0 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "serializer.h"
 #include "pwmexception.h"
 
 #ifdef PWM_EMBEDDED
 #include <kglobal.h>
 #include <klocale.h>
 #endif
 
 /* enable/disable serializer debugging (0/1) */
-#define SERIALIZER_DEBUG	0
+#define SERIALIZER_DEBUG	1
 /* use the old xml tags for writing (0/1) */
 #define USE_OLD_TAGS		0
 /* write a CDATA section (0/1) */
 #define WRITE_CDATA_SEC		0
 
 
 #define META_CREATE_DATE	"c"
 #define META_VALID_DATE		"v"
 #define META_EXPIRE_DATE	"e"
 #define META_UPDATE_DATE	"u"
 #define META_UPDATE_INT		"i"
 //US ENH : uniqueid
 #define META_UNIQUEID "n" 
 #define SYNC_ROOT "s" 
 #define SYNC_TARGET_PREFIX "t" 
 #define SYNC_TARGET_NAME "n" 
@@ -291,32 +291,36 @@ bool Serializer::readCategories(const QDomNode &n,
 			curCat.d = curEntr;
 			dta->push_back(curCat);
 		} else {
 			printDebug("Serializer::readCategories(): uh? not a category?");
 		}
 	}
 	return true;
 }
 
 bool Serializer::readEntries(const QDomNode &n,
 			     vector<PwMDataItem> *dta)
 {
 	QDomNodeList nl(n.childNodes());
 	QDomNode cur;
 	unsigned int numEntr = nl.count(), i;
 	PwMDataItem curEntr;
+	//US BUG: to initialize all values of curEntr with meaningfulldata,
+	// we call clear on it. Reason: Information in the file we will read might be incomplete.
+	// e.g. the metadata is missing.
+	curEntr.clear(true);
 
 	dta->clear();
 	for (i = 0; i < numEntr; ++i) {
 		cur = nl.item(i);
 		if (cur.nodeName().left(1) == ENTRY_PREFIX_NEW ||
 		    cur.nodeName().left(6) == ENTRY_PREFIX_OLD) {
 			if (!extractEntry(cur, &curEntr)) {
 				return false;
 			}
 			dta->push_back(curEntr);
 		} else {
 			printDebug("Serializer::readEntries(): hm? not an entry?");
 		}
 	}
 	return true;
 }
@@ -388,76 +392,77 @@ bool Serializer::extractEntry(const QDomNode &n,
 	dta->lockStat = defaultLockStat;
 	return true;
 }
 
 bool Serializer::extractMeta(const QDomNode &n,
 			     PwMMetaData *dta)
 {
 	QDomNode cur(n.firstChild());
 	QString name, val;
 	while (!cur.isNull()) {
 		name = cur.nodeName();
 		val = cur.toElement().text();
 		if (val == "") {
 			cur = cur.nextSibling();
 			continue;
 		}
+
+		//US BUG: The transformation of an empty date into an ISO date and back is different on different systems/compilers. 
+		//because of that it is possible that here some values are not set, which means they are null.
+		//US ENH: at the same moment we need backwardcompatibility. So older versions might have stored invalid dates.
+
+		QDateTime dtval; //dtval should be invalid by definition.
+
+		if ((name == META_CREATE_DATE) ||
+		    (name == META_VALID_DATE) ||
+		    (name == META_EXPIRE_DATE) ||
+		    (name == META_UPDATE_DATE))
+		{
+		  //qDebug("Serializer::extractMeta:: val:%s, empty:%i, length:%i",val.utf8(), val.isEmpty(), val.length());
+
 #ifndef PWM_EMBEDDED
-		if (name == META_CREATE_DATE) {
-			dta->create = QDateTime::fromString(val, Qt::ISODate);
-		} else if (name == META_VALID_DATE) {
-			dta->valid = QDateTime::fromString(val, Qt::ISODate);
-		} else if (name == META_EXPIRE_DATE) {
-			dta->expire = QDateTime::fromString(val, Qt::ISODate);
-		} else if (name == META_UPDATE_DATE) {
-			dta->update = QDateTime::fromString(val, Qt::ISODate);
-		} else if (name == META_UPDATE_INT) {
-			dta->updateInt = strtoul(val.latin1(), 0, 10);
-		} else if (name == META_UNIQUEID) {
-			dta->uniqueid = unescapeEntryData(val).latin1();
-		} else {
-			printDebug(string("extractMeta(): invalid: ")
-				   + name.latin1());
-		}
+		  dtval = QDateTime::fromString(val, Qt::ISODate);
 #else
+		  bool ok;
+		  dtval = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
+		    
+		  if (ok == false)
+		    qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
+#endif
 
+		  //if the parsed data is wrong, dtval should be invalid at this time.
 
-		bool ok = true;
+		}
 
 		if (name == META_CREATE_DATE) {
-			dta->create = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
+			dta->create = dtval;
 		} else if (name == META_VALID_DATE) {
-			dta->valid = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
+			dta->valid = dtval;
 		} else if (name == META_EXPIRE_DATE) {
-		  dta->expire = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
+			dta->expire = dtval;
 		} else if (name == META_UPDATE_DATE) {
-		  dta->update = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
+			dta->update = dtval;
 		} else if (name == META_UPDATE_INT) {
 			dta->updateInt = strtoul(val.latin1(), 0, 10);
 		} else if (name == META_UNIQUEID) {
 			dta->uniqueid = unescapeEntryData(val).latin1();
 		} else {
 			printDebug(string("extractMeta(): invalid: ")
 				   + name.latin1());
 		}
 
-		if (ok == false)
-		  qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
-
-
-#endif
 		cur = cur.nextSibling();
 	}
 	return true;
 }
 
 bool Serializer::checkValid()
 {
 	PWM_ASSERT(domDoc);
 	QDomElement root(domDoc->documentElement());
 	if (root.nodeName() != ROOT_MAGIC_NEW &&
 	    root.nodeName() != ROOT_MAGIC_OLD) {
 		printDebug("Serializer: wrong magic");
 		return false;
 	}
 	if (root.attribute(VER_STR_NEW) != COMPAT_VER_NEW &&
 	    root.attribute(VER_STR_OLD) != COMPAT_VER_OLD) {
@@ -591,67 +596,87 @@ bool Serializer::writeEntry(QDomElement *e,
 
 	tag = domDoc->createElement(ENTRY_META_WR);
 	if (!writeMeta(&tag, dta.meta))
 		return false;
 	e->appendChild(tag);
 
 #undef new_text
 	return true;
 }
 
 bool Serializer::writeMeta(QDomElement *e,
 			   const PwMMetaData &dta)
 {
 	QDomText text;
 	QDomElement tag;
 
-	tag = domDoc->createElement(META_CREATE_DATE);
+	//US BUG!!!: The transformation of an empty date into an ISO date is different on different systems/compilers.
+	//So do not transform an empty value at all.
+	if (dta.create.isValid())
+	{
+	  tag = domDoc->createElement(META_CREATE_DATE);
 #ifndef PWM_EMBEDDED
-	text = domDoc->createTextNode(dta.create.toString(Qt::ISODate));
+	  text = domDoc->createTextNode(dta.create.toString(Qt::ISODate));
 #else
-	text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.create,  KLocale::ISODate));
+	  text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.create,  KLocale::ISODate));
 #endif
-	tag.appendChild(text);
-	e->appendChild(tag);
+	  tag.appendChild(text);
+	  e->appendChild(tag);
+	}
 
-	tag = domDoc->createElement(META_VALID_DATE);
+	//US BUG!!!: The transformation of an empty date into an ISO date is different on different systems/compilers. 
+	//So do not transform an empty value at all.
+	if (dta.valid.isValid())
+	{
+	  tag = domDoc->createElement(META_VALID_DATE);
 #ifndef PWM_EMBEDDED
-	text = domDoc->createTextNode(dta.valid.toString(Qt::ISODate));
+	  text = domDoc->createTextNode(dta.valid.toString(Qt::ISODate));
 #else
-	text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.valid,  KLocale::ISODate));
+	  text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.valid,  KLocale::ISODate));
 #endif
-	tag.appendChild(text);
-	e->appendChild(tag);
+	  tag.appendChild(text);
+	  e->appendChild(tag);
+	}
 
-	tag = domDoc->createElement(META_EXPIRE_DATE);
+	//US BUG!!!: The transformation of an empty date into an ISO date is different on different systems/compilers. 
+	//So do not transform an empty value at all.
+	if (dta.expire.isValid())
+	{
+	  tag = domDoc->createElement(META_EXPIRE_DATE);
 #ifndef PWM_EMBEDDED
-	text = domDoc->createTextNode(dta.expire.toString(Qt::ISODate));
+	  text = domDoc->createTextNode(dta.expire.toString(Qt::ISODate));
 #else
-	text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.expire,  KLocale::ISODate));
+	  text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.expire,  KLocale::ISODate));
 #endif
-	tag.appendChild(text);
-	e->appendChild(tag);
+	  tag.appendChild(text);
+	  e->appendChild(tag);
+	}
 
-	tag = domDoc->createElement(META_UPDATE_DATE);
+	//US BUG!!!: The transformation of an empty date into an ISO date is different on different systems/compilers. 
+	//So do not transform an empty value at all.
+	if (dta.update.isValid())
+	{
+	  tag = domDoc->createElement(META_UPDATE_DATE);
 #ifndef PWM_EMBEDDED
-	text = domDoc->createTextNode(dta.update.toString(Qt::ISODate));
+	  text = domDoc->createTextNode(dta.update.toString(Qt::ISODate));
 #else
-	text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.update,  KLocale::ISODate));
+	  text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta.update,  KLocale::ISODate));
 #endif
-	tag.appendChild(text);
-	e->appendChild(tag);
+	  tag.appendChild(text);
+	  e->appendChild(tag);
+	}
 
 	tag = domDoc->createElement(META_UPDATE_INT);
 	text = domDoc->createTextNode(tostr(dta.updateInt).c_str());
 	tag.appendChild(text);
 	e->appendChild(tag);
 
 	tag = domDoc->createElement(META_UNIQUEID);
 	text = domDoc->createTextNode(escapeEntryData(dta.uniqueid.c_str()));
 	tag.appendChild(text);
 	e->appendChild(tag);
 
 #undef new_text
 	return true;
 }
 
 QString Serializer::escapeEntryData(QString dta)
@@ -659,33 +684,33 @@ QString Serializer::escapeEntryData(QString dta)
 #ifndef PWM_EMBEDDED
 	dta.replace('\n', "$>--endl--<$");
 	dta.replace("]]>", "||>");
 #else
 	dta.replace(QRegExp("\n"), "$>--endl--<$");
 	dta.replace(QRegExp("]]>"), "||>");
 #endif
 	return dta;
 }
 
 QString Serializer::unescapeEntryData(QString dta)
 {
 #ifndef PWM_EMBEDDED
 	dta.replace("$>--endl--<$", "\n");
 	dta.replace("||>", "]]>");
 #else
-	dta.replace(QRegExp("$>--endl--<$"), "\n");
+	dta.replace(QRegExp("\\$>--endl--<\\$"), "\n");
 	dta.replace(QRegExp("||>"), "]]>");
 #endif
 	return dta;
 }
 
 
 //US ENH: the following methods are getting used to write/read sync entries
 /** read the syncentries in the node "n" */
 bool Serializer::readSyncData(const QDomNode &n, vector<PwMSyncItem> *dta)
 {
 	QDomNodeList nl(n.childNodes());
 	QDomNode cur;
 	
 	QString devicename, val;
 	unsigned int numSync  = nl.count(), i;
 	PwMSyncItem curSync;
@@ -717,40 +742,39 @@ bool Serializer::readSyncData(const QDomNode &n, vector<PwMSyncItem> *dta)
 
 #endif
 			dta->push_back(curSync);
 		}
 	}
 	return true;
 
 }
 
 
 
 bool Serializer::addSyncData(QDomElement *e,
 			       const vector<PwMSyncItem> &dta)
 {
 	unsigned int numSync = dta.size(), i;
 	QString curId, curDeviceName;
-	QDomElement curSync, curSyncDate;
+	QDomElement curSync;
 	QDomText text;
 
 	for (i = 0; i < numSync; ++i) {
 		curId = SYNC_TARGET_PREFIX;
 		curId += tostr(i).c_str();
 		curDeviceName = dta[i].syncName.c_str();
 		curSync = domDoc->createElement(curId);
 		curSync.setAttribute(SYNC_TARGET_NAME, curDeviceName);
 
 #ifndef PWM_EMBEDDED
 		text = domDoc->createTextNode(dta[i].lastSyncDate.toString(Qt::ISODate));
 #else
 		text = domDoc->createTextNode(KGlobal::locale()->formatDateTime(dta[i].lastSyncDate,  KLocale::ISODate));
 #endif
-		curSyncDate.appendChild(text);
-		curSync.appendChild(curSyncDate);
+		curSync.appendChild(text);
 
 		e->appendChild(curSync);
 
 	}
 	return true;
 }