Removed some unimportant debug output which causes slow down..

4 files changed, 14 insertions, 8 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index e34feeb..0f05b65 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -1078,80 +1078,80 @@ void OContact::setBirthday( const QDate &v )
 		replace( Qtopia::Birthday, QString::null );
 		return;
 	}
 
 	if ( v.isValid() )
 		replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date. If date is
   null, the current stored date will be removed.
 */
 void OContact::setAnniversary( const QDate &v )
 {
 	if ( v.isNull() ){
 		qWarning( "Remove Anniversary");
 		replace( Qtopia::Anniversary, QString::null );
 		return;
 	}
 
 	if ( v.isValid() )
 		replace( Qtopia::Anniversary, OConversion::dateToString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OContact::birthday() const
 {
 	QString str = find( Qtopia::Birthday );
-	qWarning ("Birthday %s", str.latin1() );
+	// qWarning ("Birthday %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return  OConversion::dateFromString ( str );
 	else
 		return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
 QDate OContact::anniversary() const
 {
 	QDate empty;
 	QString str = find( Qtopia::Anniversary );
-	qWarning ("Anniversary %s", str.latin1() );
+	// qWarning ("Anniversary %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return OConversion::dateFromString ( str );
 	else
 		return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )
 {
     //qDebug("insertEmail %s", v.latin1());
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
 
     // if no default, set it as the default email and don't insert
     if ( def.isEmpty() ) {
 	setDefaultEmail( e ); // will insert into the list for us
 	return;
     }
 
     // otherwise, insert assuming doesn't already exist
     QString emailsStr = find( Qtopia::Emails );
     if ( emailsStr.contains( e ))
 	return;
     if ( !emailsStr.isEmpty() )
 	emailsStr += emailSeparator();
     emailsStr += e;
     replace( Qtopia::Emails, emailsStr );
 }
 
 void OContact::removeEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp
index 1c21619..1b5af2f 100644
--- a/libopie/pim/ocontactaccessbackend_xml.cpp
+++ b/libopie/pim/ocontactaccessbackend_xml.cpp
@@ -1,51 +1,54 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.8  2003/08/30 15:28:26  eilers
+ * Removed some unimportant debug output which causes slow down..
+ *
  * Revision 1.7  2003/08/01 12:30:16  eilers
  * Merging changes from BRANCH_1_0 to HEAD
  *
  * Revision 1.6  2003/07/07 16:19:47  eilers
  * Fixing serious bug in hasQuerySettings()
  *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.4  2003/03/21 14:32:54  mickeyl
  * g++ compliance fix: default arguments belong into the declaration, but not the definition
  *
  * Revision 1.3  2003/03/21 12:26:28  eilers
  * Fixing small bug: If we search a birthday from today to today, it returned
  * every contact ..
  *
  * Revision 1.2  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
  *
  * Revision 1.1.2.2  2003/02/11 12:17:28  eilers
  * Speed optimization. Removed the sequential search loops.
  *
  * Revision 1.1.2.1  2003/02/10 15:31:38  eilers
  * Writing offsets to debug output..
  *
@@ -141,65 +144,65 @@ OContactAccessBackend_XML::OContactAccessBackend_XML ( const QString& appname, c
 	/* Load Database now */
 	load ();
 }
 
 bool OContactAccessBackend_XML::save()
 {
 
 	if ( !m_changed )
 		return true;
 
 	QString strNewFile = m_fileName + ".new";
 	QFile f( strNewFile );
 	if ( !f.open( IO_WriteOnly|IO_Raw ) )
 		return false;
 
 	int total_written;
 	int idx_offset = 0;
 	QString out;
 
 	// Write Header
 	out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n"
 		" <Groups>\n"
 		" </Groups>\n"
 		" <Contacts>\n";
 	QCString cstr = out.utf8();
 	f.writeBlock( cstr.data(), cstr.length() );
 	idx_offset += cstr.length();
 	out = "";
 
 	// Write all contacts
 	QListIterator<OContact> it( m_contactList );
 	for ( ; it.current(); ++it ) {
-		qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
+		// qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
 		out += "<Contact ";
 		(*it)->save( out );
 		out += "/>\n";
 		cstr = out.utf8();
 		total_written = f.writeBlock( cstr.data(), cstr.length() );
 		idx_offset += cstr.length();
 		if ( total_written != int(cstr.length()) ) {
 			f.close();
 			QFile::remove( strNewFile );
 			return false;
 		}
 		out = "";
 	}
 	out += " </Contacts>\n</AddressBook>\n";
 
 	// Write Footer
 	cstr = out.utf8();
 	total_written = f.writeBlock( cstr.data(), cstr.length() );
 	if ( total_written != int( cstr.length() ) ) {
 		f.close();
 		QFile::remove( strNewFile );
 		return false;
 	}
 	f.close();
 
 	// move the file over, I'm just going to use the system call
 	// because, I don't feel like using QDir.
 	if ( ::rename( strNewFile.latin1(), m_fileName.latin1() ) < 0 ) {
 		qWarning( "problem renaming file %s to %s, errno: %d",
 			  strNewFile.latin1(), m_journalName.latin1(), errno );
 		// remove the tmp file...
 		QFile::remove( strNewFile );
@@ -673,65 +676,65 @@ bool OContactAccessBackend_XML::load( const QString filename, bool isJournal )
 				element = element->nextChild();
 			} else {
 				element = element->firstChild();
 				break;
 			}
 		}
 		/* Parse all Contacts and ignore unknown tags */
 		while( element ){
 			if( element->tagName() != QString::fromLatin1("Contact") ){
 				//qWarning ("OContactDefBack::Searching for Tag \"Contact\"! Found: %s",
 				//	  element->tagName().latin1());
 				element = element->nextChild();
 				continue;
 			}
 			/* Found alement with tagname "contact", now parse and store all
 			 * attributes contained
 			 */
 			//qWarning("OContactDefBack::load element tagName() : %s",
 			//	 element->tagName().latin1() );
 			QString dummy;
 			foundAction = false;
 
 			XMLElement::AttributeMap aMap = element->attributes();
 			XMLElement::AttributeMap::Iterator it;
 			contactMap.clear();
 			customMap.clear();
 			for( it = aMap.begin(); it != aMap.end(); ++it ){
 				// qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1());
 
 				int *find = dict[ it.key() ];
 				/* Unknown attributes will be stored as "Custom" elements */
 				if ( !find ) {
-					qWarning("Attribute %s not known.", it.key().latin1());
+					// qWarning("Attribute %s not known.", it.key().latin1());
 					//contact.setCustomField(it.key(), it.data());
 					customMap.insert( it.key(),  it.data() );
 					continue;
 				}
 
 				/* Check if special conversion is needed and add attribute
 				 * into Contact class
 				 */
 				switch( *find ) {
 					/*
 					  case Qtopia::AddressUid:
 					  contact.setUid( it.data().toInt() );
 					  break;
 					  case Qtopia::AddressCategory:
 					  contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
 					  break;
 					*/
 				case JOURNALACTION:
 					action = journal_action(it.data().toInt());
 					foundAction = true;
 					qWarning ("ODefBack(journal)::ACTION found: %d", action);
 					break;
 				case JOURNALROW:
 					journalKey = it.data().toInt();
 					break;
 				default: // no conversion needed add them to the map
 					contactMap.insert( *find, it.data() );
 					break;
 				}
 			}
 			/* now generate the Contact contact */
 			OContact contact( contactMap );
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 1c21619..1b5af2f 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -1,51 +1,54 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.8  2003/08/30 15:28:26  eilers
+ * Removed some unimportant debug output which causes slow down..
+ *
  * Revision 1.7  2003/08/01 12:30:16  eilers
  * Merging changes from BRANCH_1_0 to HEAD
  *
  * Revision 1.6  2003/07/07 16:19:47  eilers
  * Fixing serious bug in hasQuerySettings()
  *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.4  2003/03/21 14:32:54  mickeyl
  * g++ compliance fix: default arguments belong into the declaration, but not the definition
  *
  * Revision 1.3  2003/03/21 12:26:28  eilers
  * Fixing small bug: If we search a birthday from today to today, it returned
  * every contact ..
  *
  * Revision 1.2  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
  *
  * Revision 1.1.2.2  2003/02/11 12:17:28  eilers
  * Speed optimization. Removed the sequential search loops.
  *
  * Revision 1.1.2.1  2003/02/10 15:31:38  eilers
  * Writing offsets to debug output..
  *
@@ -141,65 +144,65 @@ OContactAccessBackend_XML::OContactAccessBackend_XML ( const QString& appname, c
 	/* Load Database now */
 	load ();
 }
 
 bool OContactAccessBackend_XML::save()
 {
 
 	if ( !m_changed )
 		return true;
 
 	QString strNewFile = m_fileName + ".new";
 	QFile f( strNewFile );
 	if ( !f.open( IO_WriteOnly|IO_Raw ) )
 		return false;
 
 	int total_written;
 	int idx_offset = 0;
 	QString out;
 
 	// Write Header
 	out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n"
 		" <Groups>\n"
 		" </Groups>\n"
 		" <Contacts>\n";
 	QCString cstr = out.utf8();
 	f.writeBlock( cstr.data(), cstr.length() );
 	idx_offset += cstr.length();
 	out = "";
 
 	// Write all contacts
 	QListIterator<OContact> it( m_contactList );
 	for ( ; it.current(); ++it ) {
-		qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
+		// qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
 		out += "<Contact ";
 		(*it)->save( out );
 		out += "/>\n";
 		cstr = out.utf8();
 		total_written = f.writeBlock( cstr.data(), cstr.length() );
 		idx_offset += cstr.length();
 		if ( total_written != int(cstr.length()) ) {
 			f.close();
 			QFile::remove( strNewFile );
 			return false;
 		}
 		out = "";
 	}
 	out += " </Contacts>\n</AddressBook>\n";
 
 	// Write Footer
 	cstr = out.utf8();
 	total_written = f.writeBlock( cstr.data(), cstr.length() );
 	if ( total_written != int( cstr.length() ) ) {
 		f.close();
 		QFile::remove( strNewFile );
 		return false;
 	}
 	f.close();
 
 	// move the file over, I'm just going to use the system call
 	// because, I don't feel like using QDir.
 	if ( ::rename( strNewFile.latin1(), m_fileName.latin1() ) < 0 ) {
 		qWarning( "problem renaming file %s to %s, errno: %d",
 			  strNewFile.latin1(), m_journalName.latin1(), errno );
 		// remove the tmp file...
 		QFile::remove( strNewFile );
@@ -673,65 +676,65 @@ bool OContactAccessBackend_XML::load( const QString filename, bool isJournal )
 				element = element->nextChild();
 			} else {
 				element = element->firstChild();
 				break;
 			}
 		}
 		/* Parse all Contacts and ignore unknown tags */
 		while( element ){
 			if( element->tagName() != QString::fromLatin1("Contact") ){
 				//qWarning ("OContactDefBack::Searching for Tag \"Contact\"! Found: %s",
 				//	  element->tagName().latin1());
 				element = element->nextChild();
 				continue;
 			}
 			/* Found alement with tagname "contact", now parse and store all
 			 * attributes contained
 			 */
 			//qWarning("OContactDefBack::load element tagName() : %s",
 			//	 element->tagName().latin1() );
 			QString dummy;
 			foundAction = false;
 
 			XMLElement::AttributeMap aMap = element->attributes();
 			XMLElement::AttributeMap::Iterator it;
 			contactMap.clear();
 			customMap.clear();
 			for( it = aMap.begin(); it != aMap.end(); ++it ){
 				// qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1());
 
 				int *find = dict[ it.key() ];
 				/* Unknown attributes will be stored as "Custom" elements */
 				if ( !find ) {
-					qWarning("Attribute %s not known.", it.key().latin1());
+					// qWarning("Attribute %s not known.", it.key().latin1());
 					//contact.setCustomField(it.key(), it.data());
 					customMap.insert( it.key(),  it.data() );
 					continue;
 				}
 
 				/* Check if special conversion is needed and add attribute
 				 * into Contact class
 				 */
 				switch( *find ) {
 					/*
 					  case Qtopia::AddressUid:
 					  contact.setUid( it.data().toInt() );
 					  break;
 					  case Qtopia::AddressCategory:
 					  contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
 					  break;
 					*/
 				case JOURNALACTION:
 					action = journal_action(it.data().toInt());
 					foundAction = true;
 					qWarning ("ODefBack(journal)::ACTION found: %d", action);
 					break;
 				case JOURNALROW:
 					journalKey = it.data().toInt();
 					break;
 				default: // no conversion needed add them to the map
 					contactMap.insert( *find, it.data() );
 					break;
 				}
 			}
 			/* now generate the Contact contact */
 			OContact contact( contactMap );
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index e34feeb..0f05b65 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1078,80 +1078,80 @@ void OContact::setBirthday( const QDate &v )
 		replace( Qtopia::Birthday, QString::null );
 		return;
 	}
 
 	if ( v.isValid() )
 		replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date. If date is
   null, the current stored date will be removed.
 */
 void OContact::setAnniversary( const QDate &v )
 {
 	if ( v.isNull() ){
 		qWarning( "Remove Anniversary");
 		replace( Qtopia::Anniversary, QString::null );
 		return;
 	}
 
 	if ( v.isValid() )
 		replace( Qtopia::Anniversary, OConversion::dateToString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OContact::birthday() const
 {
 	QString str = find( Qtopia::Birthday );
-	qWarning ("Birthday %s", str.latin1() );
+	// qWarning ("Birthday %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return  OConversion::dateFromString ( str );
 	else
 		return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
 QDate OContact::anniversary() const
 {
 	QDate empty;
 	QString str = find( Qtopia::Anniversary );
-	qWarning ("Anniversary %s", str.latin1() );
+	// qWarning ("Anniversary %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return OConversion::dateFromString ( str );
 	else
 		return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )
 {
     //qDebug("insertEmail %s", v.latin1());
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
 
     // if no default, set it as the default email and don't insert
     if ( def.isEmpty() ) {
 	setDefaultEmail( e ); // will insert into the list for us
 	return;
     }
 
     // otherwise, insert assuming doesn't already exist
     QString emailsStr = find( Qtopia::Emails );
     if ( emailsStr.contains( e ))
 	return;
     if ( !emailsStr.isEmpty() )
 	emailsStr += emailSeparator();
     emailsStr += e;
     replace( Qtopia::Emails, emailsStr );
 }
 
 void OContact::removeEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();