Changeset 12913

Timestamp:

05/31/08 19:47:28 (5 years ago)

Author:

hsbt

Message:

change some conditional branch.

Files:

• platform/tdiary/plugin/livedoor_weather.rb (modified) (4 diffs)

platform/tdiary/plugin/livedoor_weather.rb

@@ -6 +6 @@
 # You can redistribute it and/or modify it under GPL2.
 #
+
 require 'open-uri'
 require 'timeout'
@@ -79 +80 @@
         cache = "#{@cache_path}/lwws"
 
-        if date == nil
+        unless date
                 file_name = "#{cache}/#{convert_date( date_status)}.xml" # file_name is YYYYMMDD
         else
@@ -97 +98 @@
                 result << %Q|<div class=\"lwws\">|
 
-                if @conf['lwws.icon.disp'] != "t" || @conf.mobile_agent? then
+                if @conf['lwws.icon.disp'] != "t" or @conf.mobile_agent? then
                         result << %Q|<a href="#{h(detail_url)}">#{telop}</a>|
                 else
@@ -108 +109 @@
                 end
 
-                if @conf['lwws.max_temp.disp'] == "t" then
-                        unless max_temp == nil
-                                result << %Q| #{@lwws_max_temp_label}:#{h(max_temp)}#{@celsius_label}|
-                        end
-                end
-                if @conf['lwws.min_temp.disp'] == "t" then
-                        unless min_temp == nil
-                                result << %Q| #{@lwws_min_temp_label}:#{h(min_temp)}#{@celsius_label}|
-                        end
+                if @conf['lwws.max_temp.disp'] == "t" and not max_temp.nil? then
+                        result << %Q| #{@lwws_max_temp_label}:#{h(max_temp)}#{@celsius_label}|
+                end
+
+                if @conf['lwws.min_temp.disp'] == "t" and not min_temp.nil? then
+                        result << %Q| #{@lwws_min_temp_label}:#{h(min_temp)}#{@celsius_label}|
                 end