Author: duncan
Date: Mon Nov  6 07:20:56 2006
New Revision: 8540

Modified:
   branches/rel-1-6/freevo/ChangeLog
   branches/rel-1-6/freevo/src/plugins/weather.py

Log:
[ 1591145 ] Weather download fails - empty visibility
Patch applied and tabs removed.


Modified: branches/rel-1-6/freevo/ChangeLog
==============================================================================
--- branches/rel-1-6/freevo/ChangeLog   (original)
+++ branches/rel-1-6/freevo/ChangeLog   Mon Nov  6 07:20:56 2006
@@ -18,6 +18,7 @@
  * Fixed cache problem when a play list file is corrupt (B#1589913)
  * Fixed detached music player when the plug-in mplayervis is enabled 
(B#1582048)
  * Fixed IMDB parser, the title should not work (B#1586579)
+ * Fixed weather download when visibility is empty (B#1591145)
  * Fixed VIDEO_INTERLACING = False having no effect (B#1586721)
  * Fixed xine --no-lirc option when compiled without lirc support (B#1589722)
 

Modified: branches/rel-1-6/freevo/src/plugins/weather.py
==============================================================================
--- branches/rel-1-6/freevo/src/plugins/weather.py      (original)
+++ branches/rel-1-6/freevo/src/plugins/weather.py      Mon Nov  6 07:20:56 2006
@@ -458,9 +458,11 @@
 
         self.uvIndex     = self.GetString("this.swUV")
         self.visibility  = self.GetString("this.swVis")
+        if not self.visibility:
+           self.visibility = 0.0
 
         # convert visibility
-        if self.convertData and self.visibility and float(self.visibility)  != 
999.0:
+        if self.convertData and float(self.visibility) != 999.0:
             self.visibility = toKilometers( self.visibility )
 
         self.shortdesc = self.GetString("this.swConText")
@@ -476,16 +478,17 @@
         if dayNum != curDay:
             self.pastTime = 1
 
-       ltime = time.localtime()
-       ctr   = 0
-       for i in range(5,10):
-               (mons, days, years) = holdings[i].split("/")
-               mons  = int( mons )
-               days  = int( days )
-               years = int( years )
-               dnum  = (ltime[6] + ctr) % 7
-               self.date.append( time.strftime( "%A", (years, mons, days, 
ltime[3], ltime[4], ltime[5], dnum, ltime[7], ltime[8]) ) )
-               ctr += 1
+        ltime = time.localtime()
+        ctr   = 0
+        for i in range(5,10):
+            (mons, days, years) = holdings[i].split("/")
+            mons  = int( mons )
+            days  = int( days )
+            years = int( years )
+            dnum  = (ltime[6] + ctr) % 7
+            self.date.append( time.strftime( "%A", (years, mons, days, 
ltime[3], ltime[4], ltime[5], \
+                dnum, ltime[7], ltime[8]) ) )
+            ctr += 1
 
         # weather icon
         for i in (10,11,12,13):

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to