handle the importing( first reading ) of

Zaurus format correclty
TodoList and Today should be fine now

1 files changed, 4 insertions, 0 deletions

diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index 4d6711d..c486723 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -19,96 +19,100 @@ public:
 	XMLElement::AttributeMap map;
 	XMLElement *task = new XMLElement();
 	map.insert( "Completed", QString::number((int)(*it).isCompleted() ) );
 	map.insert( "HasDate", QString::number((int)(*it).hasDate() ) );
 	map.insert( "Priority", QString::number( (*it).priority() ) );
 	QArray<int> arrat = (*it).categories();
 	QString attr;
 	for(uint i=0; i < arrat.count(); i++ ){
 	  attr.append(QString::number(arrat[i])+";" );
 	}
 	if(!attr.isEmpty() ) // remove the last ;
 	  attr.remove(attr.length()-1, 1 );
 	map.insert( "Categories", attr );
 	//else
 	//map.insert( "Categories", QString::null );
 	map.insert( "Description", (*it).description() );
 	if( (*it).hasDate() ){
 	  map.insert("DateYear",  QString::number( (*it).date().year()  ) );
 	  map.insert("DateMonth", QString::number( (*it).date().month() ) );
 	  map.insert("DateDay", QString::number( (*it).date().day()  ) );
 	}
 	map.insert("Uid", QString::number( (*it).uid() ) );
 	task->setTagName("Task" );
 	task->setAttributes( map );
 	tasks->appendChild(task);
     }
     QFile file( name);
     if( file.open(IO_WriteOnly ) ){
       QTextStream stream(&file );
       stream << "<!DOCTYPE Tasks>" << endl;
       tasks->save(stream );
       delete tasks;
       stream << "</Tasks>" << endl;
       file.close();
       return true;
     }
     return false;
   }
   QValueList<ToDoEvent> load( const QString &name ){
     qWarning("loading tododb" );
     QValueList<ToDoEvent> m_todos;
     XMLElement *root = XMLElement::load( name );
     if(root != 0l ){ // start parsing
       qWarning("ToDoDB::load tagName(): %s", root->tagName().latin1()  );
 	//if( root->tagName() == QString::fromLatin1("Tasks" ) ){// Start
       XMLElement *element = root->firstChild();
       element = element->firstChild();
       while( element ){
+	if( element->tagName() != QString::fromLatin1("Task") ){
+	  element = element->nextChild();
+	  continue;
+	}
 	qWarning("ToDoDB::load element tagName() : %s", element->tagName().latin1() );
 	QString dummy;
 	ToDoEvent event;
 	bool ok;
 	int dumInt;
 	// completed
 	dummy = element->attribute("Completed" );
 	dumInt = dummy.toInt(&ok );
 	if(ok ) event.setCompleted( dumInt == 0 ? false : true );
 	// hasDate
 	dummy = element->attribute("HasDate" );
 	dumInt = dummy.toInt(&ok );
 	if(ok ) event.setHasDate( dumInt == 0 ? false: true );
 	// set the date
 	bool hasDa = dumInt;
 	if ( hasDa ) { //parse the date
 	  int year, day, month = 0;
 	  year = day = month;
 	  // year
 	  dummy = element->attribute("DateYear" );
 	  dumInt = dummy.toInt(&ok );
 	  if( ok ) year = dumInt;
 	  // month
 	  dummy = element->attribute("DateMonth" );
 	  dumInt = dummy.toInt(&ok );
 	  if(ok ) month = dumInt;
 	  dummy = element->attribute("DateDay" );
 	  dumInt = dummy.toInt(&ok );
 	  if(ok ) day = dumInt;
 	  // set the date
 	  QDate date( year, month, day );
 	  event.setDate( date);
 	}
 	dummy = element->attribute("Priority" );
 	dumInt = dummy.toInt(&ok );
 	if(!ok ) dumInt = ToDoEvent::NORMAL;
 	event.setPriority( dumInt );
 	//description
 	dummy = element->attribute("Description" );
 	event.setDescription( dummy );
 	// category
 	dummy = element->attribute("Categories" );
 	QStringList ids = QStringList::split(";", dummy );
 	event.setCategories( ids );     
    
 	//uid
 	dummy = element->attribute("Uid" );
 	dumInt = dummy.toInt(&ok );