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

diff --git a/Client/xmlreader.cpp b/Client/xmlreader.cpp
index b997989..8c75c97 100644
--- a/Client/xmlreader.cpp
+++ b/Client/xmlreader.cpp
@@ -62,11 +62,11 @@ 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();
@@ -81,7 +81,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;
             }
@@ -109,10 +109,7 @@ void XmlReader::xmlReadCategories(QNetworkReply *device)
     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 +122,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 +142,7 @@ void XmlReader::xmlReadCategories(QNetworkReply *device)
     if(receivedFlag)
     {
         qDebug() << "receivedCategoryList() emitted";
+        myCategoryList->realSizeOfCats = i;
         emit receivedCategoryList();
     }
 }