Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2013-07-08 07:26:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasmoid-cwp (Old) and /work/SRC/openSUSE:Factory/.plasmoid-cwp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasmoid-cwp" Changes: -------- --- /work/SRC/openSUSE:Factory/plasmoid-cwp/plasmoid-cwp.changes 2013-05-27 09:57:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2013-07-08 07:26:42.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Jun 23 00:38:44 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to version 1.8.0: + * xml: myforecast.com: update time added + * xml: wetter.com: weather description modified + * xml: gismeteo.com: current weather icon fixed + * xml: accuweather.com (World): possibly wrong temperature fixed + * increased number of possible weather icons + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.7.3.tar.bz2 New: ---- 98925-cwp-1.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.FmGThv/_old 2013-07-08 07:26:43.000000000 +0200 +++ /var/tmp/diff_new_pack.FmGThv/_new 2013-07-08 07:26:43.000000000 +0200 @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.7.3 +Version: 1.8.0 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.7.3.tar.bz2 -> 98925-cwp-1.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/ChangeLog new/cwp-1.8.0/ChangeLog --- old/cwp-1.7.3/ChangeLog 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/ChangeLog 2013-06-22 14:49:37.000000000 +0200 @@ -1,3 +1,11 @@ +1.8.0 +===== +- xml: myforecast.com: update time added +- xml: wetter.com: weather description modified +- xml: gismeteo.com: current weather icon fixed +- xml: accuweather.com (World): possibly wrong temperature fixed +- increased number of possible weather icons + 1.7.3 ===== - xml: accuweather.com: fixes for some URLs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/README new/cwp-1.8.0/README --- old/cwp-1.7.3/README 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/README 2013-06-22 14:49:37.000000000 +0200 @@ -1,5 +1,5 @@ ========================================= -Customizable Weather Plasmoid (CWP) 1.7.3 +Customizable Weather Plasmoid (CWP) 1.8.0 ========================================= This is another weather plasmoid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/br_weather_com.xml new/cwp-1.8.0/data/br_weather_com.xml --- old/cwp-1.7.3/data/br_weather_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/br_weather_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043:1:BR" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043:1:BR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/de_weather_com.xml new/cwp-1.8.0/data/de_weather_com.xml --- old/cwp-1.7.3/data/de_weather_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/de_weather_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="de.weather.com" search_page="http://de.weather.com"; example_zip="GMXX0087:1:GM" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="de.weather.com" search_page="http://de.weather.com"; example_zip="GMXX0087:1:GM" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/espanol_weather_com.xml new/cwp-1.8.0/data/espanol_weather_com.xml --- old/cwp-1.7.3/data/espanol_weather_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/espanol_weather_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/fr_weather_com.xml new/cwp-1.8.0/data/fr_weather_com.xml --- old/cwp-1.7.3/data/fr_weather_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/fr_weather_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="FRXX0076:1:FR" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="FRXX0076:1:FR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/freemeteo_com_celsius.xml new/cwp-1.8.0/data/freemeteo_com_celsius.xml --- old/cwp-1.7.3/data/freemeteo_com_celsius.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/freemeteo_com_celsius.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/freemeteo_com_fahrenheit.xml new/cwp-1.8.0/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.7.3/data/freemeteo_com_fahrenheit.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/freemeteo_com_fahrenheit.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2013-06-22" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/ilmeteo_it.xml new/cwp-1.8.0/data/ilmeteo_it.xml --- old/cwp-1.7.3/data/ilmeteo_it.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/ilmeteo_it.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/in_weather_com.xml new/cwp-1.8.0/data/in_weather_com.xml --- old/cwp-1.7.3/data/in_weather_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/in_weather_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/myforecast_com_celsius.xml new/cwp-1.8.0/data/myforecast_com_celsius.xml --- old/cwp-1.7.3/data/myforecast_com_celsius.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/myforecast_com_celsius.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> <locale_settings locale="en" encoding="latin1" /> @@ -32,7 +32,7 @@ /> <data_current_temperature url="urlc" - update_time="echo -n N/A" + update_time="grep Current\ Time: | sed -e "s/.*Current Time:[^0-9]*\([0-9]*:[0-9]*\).*/\1/"" temperature="grep -A 4 bldmbl | grep -A 4 Temperature | tail -n 2 | tr -d '\r' | tr -d '\n' | sed -e "s/\s*\([^&]*\)&.*/\1/"" temperature_felt="grep -A 4 bldmbl | grep -A 4 Comfort\ Level | tail -n 2 | tr -d '\r' | tr -d '\n' | sed -e "s/\s*\([^&]*\)&.*/\1/"" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/myforecast_com_fahrenheit.xml new/cwp-1.8.0/data/myforecast_com_fahrenheit.xml --- old/cwp-1.7.3/data/myforecast_com_fahrenheit.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/myforecast_com_fahrenheit.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> <locale_settings locale="en" encoding="latin1" /> @@ -32,7 +32,7 @@ /> <data_current_temperature url="urlc" - update_time="echo -n N/A" + update_time="grep Current\ Time: | sed -e "s/.*Current Time:[^0-9]*\([0-9]*:[0-9]*\).*/\1/"" temperature="grep -A 4 bldmbl | grep -A 4 Temperature | tail -n 2 | tr -d '\r' | tr -d '\n' | sed -e "s/\s*\([^&]*\)&.*/\1/"" temperature_felt="grep -A 4 bldmbl | grep -A 4 Comfort\ Level | tail -n 2 | tr -d '\r' | tr -d '\n' | sed -e "s/\s*\([^&]*\)&.*/\1/"" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/pogodynka_pl.xml new/cwp-1.8.0/data/pogodynka_pl.xml --- old/cwp-1.7.3/data/pogodynka_pl.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/pogodynka_pl.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/satellite_images.xml new/cwp-1.8.0/data/satellite_images.xml --- old/cwp-1.7.3/data/satellite_images.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/satellite_images.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp_satellite_images" version="2013-04-16" /> + <xml_file_version type="cwp_satellite_images" version="2013-06-22" /> <!--Global--> <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/uk_weather_com.xml new/cwp-1.8.0/data/uk_weather_com.xml --- old/cwp-1.7.3/data/uk_weather_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/uk_weather_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/wetter_com.xml new/cwp-1.8.0/data/wetter_com.xml --- old/cwp-1.7.3/data/wetter_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/wetter_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -46,7 +46,7 @@ <data_current_icon url="urlc" icon="grep wstate_small | sed -e "s/.*wstate_small \([^\"]*\)_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" icon_code="grep wstate_small | sed -e "s/.*wstate_small \([^\"]*\)_S.*/\1/; s/_//g"" - icon_text="grep -m 1 -A 3 wstate_small | tail -n 1 | sed -e 's/<[^>]*>\| *//g'" + icon_text="grep -A 1 status | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_current_additional url="urlc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/www_accuweather_com_us_celsius.xml new/cwp-1.8.0/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.7.3/data/www_accuweather_com_us_celsius.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/www_accuweather_com_us_celsius.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.8.0/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.7.3/data/www_accuweather_com_us_fahrenheit.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/www_accuweather_com_us_fahrenheit.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="F" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/www_accuweather_com_world_celsius.xml new/cwp-1.8.0/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.7.3/data/www_accuweather_com_world_celsius.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/www_accuweather_com_world_celsius.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -59,66 +59,66 @@ /> <data_day1 url="url1" - name="grep -A 13 day=1\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=1\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=1\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=1\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day2 url="url1" - name="grep -A 13 day=2\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=2\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=2\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=2\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day3 url="url1" - name="grep -A 13 day=3\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=3\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=3\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=3\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day4 url="url1" - name="grep -A 13 day=4\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=4\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=4\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=4\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day5 url="url2" - name="grep -A 13 day=5\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=5\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=5\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=5\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day6 url="url3" - name="grep -A 13 day=6\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=6\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=6\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=6\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day7 url="url3" - name="grep -A 13 day=7\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=7\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=7\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=7\' | grep cond | sed -e "s/<[^>]*>//g"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.8.0/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.7.3/data/www_accuweather_com_world_fahrenheit.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/www_accuweather_com_world_fahrenheit.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="F" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -59,66 +59,66 @@ /> <data_day1 url="url1" - name="grep -A 13 day=1\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=1\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=1\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=1\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=1\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day2 url="url1" - name="grep -A 13 day=2\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=2\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=2\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=2\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=2\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day3 url="url1" - name="grep -A 13 day=3\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=3\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=3\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=3\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=3\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day4 url="url1" - name="grep -A 13 day=4\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=4\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=4\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=4\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=4\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day5 url="url2" - name="grep -A 13 day=5\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=5\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=5\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=5\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=5\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day6 url="url3" - name="grep -A 13 day=6\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=6\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=6\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=6\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=6\' | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day7 url="url3" - name="grep -A 13 day=7\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" - icon_code="grep -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" - icon_text="grep -A 13 day=7\' | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -m 1 -A 13 day=7\' | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -m 1 -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -m 1 -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -m 1 -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/" | sed -e "s/\(.*\)/http:\/\/vortex.accuweather.com\/adc2010\/images\/icons-numbered\/\1-m.png/"" + icon_code="grep -m 1 -A 13 day=7\' | grep icon | head -n 1 | sed -e "s/.*icon i-\([0-9]*\).*/0\1/" | sed -e "s/\([0-9]\)\([0-9]\)\([0-9]\).*/\2\3/"" + icon_text="grep -m 1 -A 13 day=7\' | grep cond | sed -e "s/<[^>]*>//g"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/www_gismeteo_com.xml new/cwp-1.8.0/data/www_gismeteo_com.xml --- old/cwp-1.7.3/data/www_gismeteo_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/www_gismeteo_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -44,7 +44,7 @@ /> <data_current_icon url="urlc" - icon="grep -A 68 id=\"weather\" | tail -n 34; | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/"" + icon="grep -A 68 id=\"weather\" | tail -n 34 | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/"" icon_code="grep -A 68 id=\"weather\" | tail -n 34 | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 68 id=\"weather\" | tail -n 34 | grep -A 1 background-image | tail -n 1 | sed -e "s/<[^>]*>//g"" /> @@ -264,6 +264,11 @@ i136="n.moon.c4.s2.st" o136="35" i137="n.moon.c4.s3.st" o137="35" i138="n.moon.c4.s4.st" o138="35" + + i139="d.sun.c1.st" o139="38" + i140="d.sun.c2.st" o140="38" + i141="d.sun.c3.st" o141="38" + i142="d.sun.c4.st" o142="35" /> <wind_transform i1="ะก" o1="N" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/www_weather_com.cn.xml new/cwp-1.8.0/data/www_weather_com.cn.xml --- old/cwp-1.7.3/data/www_weather_com.cn.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/www_weather_com.cn.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/data/www_weather_com.xml new/cwp-1.8.0/data/www_weather_com.xml --- old/cwp-1.7.3/data/www_weather_com.xml 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/data/www_weather_com.xml 2013-06-22 14:49:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-04-16" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2013-06-22" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/plasma-applet-cwp.desktop new/cwp-1.8.0/plasma-applet-cwp.desktop --- old/cwp-1.7.3/plasma-applet-cwp.desktop 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/plasma-applet-cwp.desktop 2013-06-22 14:49:37.000000000 +0200 @@ -30,7 +30,7 @@ X-KDE-PluginInfo-Author=Georg Hennig X-KDE-PluginInfo-Email=georg.hen...@web.de X-KDE-PluginInfo-Name=plasma_applet_cwp -X-KDE-PluginInfo-Version=1.7.3 +X-KDE-PluginInfo-Version=1.8.0 X-KDE-PluginInfo-Website=http://www.kde-look.org/content/show.php/show.php?content=98925 X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/plasma-cwp-data-provider.h new/cwp-1.8.0/plasma-cwp-data-provider.h --- old/cwp-1.7.3/plasma-cwp-data-provider.h 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/plasma-cwp-data-provider.h 2013-06-22 14:49:37.000000000 +0200 @@ -28,7 +28,7 @@ #include "config.h" const int WIND_TRANSFORM_SIZE = 500; -const int WEATHER_CODE_TRANSFORM_SIZE = 110; +const int WEATHER_CODE_TRANSFORM_SIZE = 200; const int DATA_COMMAND_NUMBER = 61; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.7.3/version.h new/cwp-1.8.0/version.h --- old/cwp-1.7.3/version.h 2013-04-16 20:25:49.000000000 +0200 +++ new/cwp-1.8.0/version.h 2013-06-22 14:49:37.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.7.3" +#define VERSION "1.8.0" #define DATE "2009-2013" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
