Parsing fix
authorjasu <jasu@skeletor.(none)>
Tue, 11 May 2010 12:44:17 +0000 (15:44 +0300)
committerjasu <jasu@skeletor.(none)>
Tue, 11 May 2010 12:44:17 +0000 (15:44 +0300)
src/eveskilltraining.cpp

index e86fc08..52d8f1b 100644 (file)
@@ -38,7 +38,7 @@ bool EveSkillTraining::fromXml(QXmlStreamReader &xml)
         qDebug() << "Wrong element:" << xml.name();
         return false;
     }
-
+    inResult = xml.readNextStartElement();
     while (inResult) {
         qDebug() << "element:" << xml.name();
         if (xml.name() == "trainingEndTime") {
@@ -72,11 +72,7 @@ bool EveSkillTraining::fromXml(QXmlStreamReader &xml)
             currentTime = QDateTime::fromString(xml.readElementText(),"yyyy-MM-dd hh:mm:ss");
             startTime.setTimeSpec(Qt::UTC);
             qDebug() << "Current: " << currentTime;
-        } if (xml.name() == "cachedUntil" ) {
-            cachedUntil = QDateTime::fromString(xml.readElementText(),"yyyy-MM-dd hh:mm:ss");
-            cachedUntil.setTimeSpec(Qt::UTC);
-            qDebug() << "Cached until " << cachedUntil.toString(Qt::SystemLocaleShortDate);
-        } else {
+        }  else {
             // Noop
             qDebug() << "  Skip this";
             xml.skipCurrentElement();
@@ -84,7 +80,12 @@ bool EveSkillTraining::fromXml(QXmlStreamReader &xml)
         inResult = xml.readNextStartElement();
 
     } // while
-
+    inResult = xml.readNextStartElement();
+    if (xml.name() == "cachedUntil" ) {
+        cachedUntil = QDateTime::fromString(xml.readElementText(),"yyyy-MM-dd hh:mm:ss");
+        cachedUntil.setTimeSpec(Qt::UTC);
+        qDebug() << "Cached until " << cachedUntil.toString(Qt::SystemLocaleShortDate);
+    }
     qDebug() << "Parsing finished";
     return true;
 }