Changeset 12982 for platform/tdiary/plugin

Timestamp:

06/01/08 18:28:13 (6 months ago)

Author:

hsbt

Message:

small refactoring.

Location:

platform/tdiary/plugin

Files:

• en/livedoor_weather.rb (modified) (1 diff)
• ja/livedoor_weather.rb (modified) (1 diff)
• livedoor_weather.rb (modified) (5 diffs)
• zh/livedoor_weather.rb (modified) (1 diff)

platform/tdiary/plugin/en/livedoor_weather.rb

@@ -11 +11 @@
 #
 
-@lwws_rest_url = 'http://weather.livedoor.com/forecast/webservice/rest/v1'
 @lwws_plugin_name = 'livedoor weather'
 @lwws_label_city_id = 'City ID'

platform/tdiary/plugin/ja/livedoor_weather.rb

@@ -11 +11 @@
 #
 
-@lwws_rest_url = 'http://weather.livedoor.com/forecast/webservice/rest/v1'
 @lwws_plugin_name = 'livedoor 天気情報'
 @lwws_label_city_id = '都市IDの設定'

platform/tdiary/plugin/livedoor_weather.rb

@@ -10 +10 @@
 require 'timeout'
 require 'rexml/document'
+
+@lwws_rest_url = 'http://weather.livedoor.com/forecast/webservice/rest/v1'
 
 def lwws_init
@@ -75 +77 @@
 end
 
-def lwws_to_html( date_status, date = nil )
+def lwws_to_html( date )
         lwws_init
 
         cache = "#{@cache_path}/lwws"
-
-        unless date
-                file_name = "#{cache}/#{convert_date( date_status)}.xml" # file_name is YYYYMMDD
+        case date
+        when "today", "tommorow", "dayaftertommorow"
+                file_name = "#{cache}/#{convert_date( date_status)}.xml" 
         else
                 file_name = "#{cache}/#{date}.xml"
         end
+
+        today = Time.now.strftime("%Y%m%d")
 
         begin
@@ -106 +110 @@
                         width = doc.elements["image/width"].text
                         height = doc.elements["image/height"].text
-                        result << %Q|<a href="#{link}"><img src="#{url}" border="0" alt="#{title}" title="#{title}" width=#{width} height="#{height}" /></a>|
+                        if date == today 
+                                result << %Q|<a href="#{link}">|
+                        end
+                        result << %Q|<img src="#{url}" border="0" alt="#{title}" title="#{title}" width=#{width} height="#{height}" /></a>|
+                        if date == today
+                                result << %Q|</a>|
+                        end
                 end
 
@@ -123 +133 @@
                 return ''
         end
-end
-
-def lwws_today
-        lwws_get( "today" )
-        lwws_to_html( "today" )
-end
-
-def lwws_tomorrow
-        lwws_get( "tomorrow" )
-        lwws_to_html( "tomorrow" )
-end
-
-def lwws_dayaftertomorrow
-        lwws_get( "dayaftertomorrow" )
-        lwws_to_html( "dayaftertomorrow" )
-end
-
-def lwws( date )
-        lwws_to_html( "", date )
 end
 
@@ -188 +179 @@
 add_body_enter_proc do |date|
         unless feed?
-                lwws_to_html( "", date.strftime("%Y%m%d"))
+                lwws_to_html( date.strftime("%Y%m%d") )
         end
 end

platform/tdiary/plugin/zh/livedoor_weather.rb

@@ -11 +11 @@
 #
 
-@lwws_rest_url = 'http://weather.livedoor.com/forecast/webservice/rest/v1'
 @lwws_plugin_name = 'livedoor weather'
 @lwws_label_city_id = 'City ID'