X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fxmlreader.cpp;h=b6c16536e6194882879ee67e3e2ef164a7c6fab1;hp=b997989b63587f320281e2d75c94c433ecf2cc50;hb=aa40ce55230787b7a57cc0588cd7e56d30a89dd2;hpb=c68f0fbb1f1163e51079e6829aa640ddbc81ac15

diff --git a/Client/xmlreader.cpp b/Client/xmlreader.cpp
index b997989..b6c1653 100644
--- a/Client/xmlreader.cpp
+++ b/Client/xmlreader.cpp
@@ -16,6 +16,7 @@
   */
 XmlReader::XmlReader()
 {
+    qDebug() << "__XmlReader";
     myCategoryList = new CategoryList();
 }
 
@@ -24,12 +25,15 @@ XmlReader::XmlReader()
   */
 XmlReader::~XmlReader()
 {
+    qDebug() << "__~XmlReader";
     category = "";
     unit = "";
     position = "";
     user = "";
     value = "";
-    delete myCategoryList;
+
+    if(myCategoryList)
+        delete myCategoryList;
 }
 
 /**
@@ -44,7 +48,7 @@ void XmlReader::xmlReadTop10Results(QNetworkReply *device)
 
     xmlreader.clear();
     QByteArray array = device->readAll();
-    qDebug() << "array: " << array;
+    //qDebug() << "array: " << array;
     xmlreader.addData(array);
     //xmlreader.addData(device->readAll());
 
@@ -62,17 +66,18 @@ void XmlReader::xmlReadTop10Results(QNetworkReply *device)
         {
             if(xmlreader.name() == "results")
             {
-                qDebug() << xmlreader.name();
+                //qDebug() << xmlreader.name();
             }
             if(xmlreader.name() == "result")
             {
-                qDebug() << "result";
+                //qDebug() << xmlreader.name();
                 attr = xmlreader.attributes();
 
                 user = attr.value("username").toString();
                 position = attr.value("position").toString();
                 date = attr.value("date").toString();
-                unit = attr.value("unit").toString();
+                //unit = attr.value("unit").toString();
+                unit = "s";
                 value = attr.value("value").toString();
 
                 myCategoryList->top10List.append(position + "\t" +
@@ -81,7 +86,7 @@ void XmlReader::xmlReadTop10Results(QNetworkReply *device)
                                                 unit + "\t" +
                                                 date + "\n");
 
-                qDebug() << position << user << value << unit << date;
+                //qDebug() << position << user << value << unit << date;
                 i++;
                 receivedFlag = 1;
             }
@@ -105,14 +110,11 @@ void XmlReader::xmlReadCategories(QNetworkReply *device)
 
     xmlreader.clear();
     QByteArray array = device->readAll();
-    qDebug() << "array: " << array;
+    //qDebug() << "array: " << array;
     xmlreader.addData(array);
     //xmlreader.addData(device->readAll());
 
-    if(myCategoryList->sizeOfCategoryList() != 0) {
-        myCategoryList->clearCategoryList();
-    }
-    //qDebug() << "sizeOfCategoryList(): " << myCategoryList->sizeOfCategoryList();
+    myCategoryList->clearCats();
 
     //Go trough the xml document
     while(!xmlreader.atEnd())
@@ -125,13 +127,17 @@ void XmlReader::xmlReadCategories(QNetworkReply *device)
         {
             if(xmlreader.name() == "categories")
             {
-                qDebug() << xmlreader.name();
+                //qDebug() << xmlreader.name();
             }
             if(xmlreader.name() == "category")
             {
-                qDebug() << xmlreader.name();
-                myCategoryList->appendCategoryList(xmlreader.readElementText());
-                qDebug() << "i=" << i << myCategoryList->itemOfCategoryList(i);
+                //qDebug() << xmlreader.name();
+                attr = xmlreader.attributes();
+                description = attr.value("description").toString();
+                unit = attr.value("unit").toString();
+                category = xmlreader.readElementText();
+                myCategoryList->appendCats(i, description, unit, category);
+                //qDebug() << "description: " << description << "unit: " << unit << "category: " << category;
                 i++;
                 receivedFlag = 1;
             }
@@ -141,6 +147,7 @@ void XmlReader::xmlReadCategories(QNetworkReply *device)
     if(receivedFlag)
     {
         qDebug() << "receivedCategoryList() emitted";
+        myCategoryList->realSizeOfCats = i;
         emit receivedCategoryList();
     }
 }
@@ -165,4 +172,3 @@ void XmlReader::xmlShow()
     //xmlReadCategories(&file);
     file.close();
 }
-