[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/dataengines/weather/ions
From:       Shawn Starr <shawn.starr () rogers ! com>
Date:       2007-11-15 3:54:32
Message-ID: 1195098872.597151.13832.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 736875 by spstarr:

NOAA ion: Make validation work for this now also. This plugin returns one matching place.

 M  +15 -5     ion_noaa.cpp  
 M  +1 -1      ion_noaa.h  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp #736874:736875
@@ -80,19 +80,29 @@
     getXMLSetup();
 }
 
-bool NOAAIon::validate(const QString& source) const
+QString NOAAIon::validate(const QString& source) const
 {
     QHash<QString, QString>::const_iterator it = d->m_locations.find(source);
     if (it != d->m_locations.end()) {
-        return true;
+        return source;
     }
-    return false;
+    return QString();
 }
 
 bool NOAAIon::updateIonSource(const QString& source)
 {
-    getXMLData(source);
-    return true;
+    kDebug() << "updateIonSource() SOURCE: " << source;
+    QString result = this->validate(source);
+
+    if (!result.isEmpty()) {
+        QStringList tokens = result.split(':');
+        setData(source, "validate", QString("valid:single:%1").arg(tokens[1]));
+        //getXMLData(source);
+        return true;
+    }
+    QStringList tokens = source.split(":");
+    setData(source, "validate", QString("invalid:single:%1").arg(tokens[1]));
+    return true; 
 }
 
 // Parses city list and gets the correct city based on ID number
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.h #736874:736875
@@ -108,7 +108,7 @@
     bool readXMLData(const QString& source, QXmlStreamReader& xml);
 
     // Check if place specified is valid or not
-    bool validate(const QString& source) const;
+    QString validate(const QString& source) const;
 
     // Catchall for unknown XML tags
     void parseUnknownElement(QXmlStreamReader& xml);
[prev in list] [next in list] [prev in thread] [next in thread]