Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2011-12-21 10:03:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasmoid-cwp (Old) and /work/SRC/openSUSE:Factory/.plasmoid-cwp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasmoid-cwp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plasmoid-cwp/plasmoid-cwp.changes 2011-11-10 16:02:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2011-12-21 10:03:04.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 19 21:57:27 UTC 2011 - [email protected] + +- Update to version 1.5.7: + * xml: accuweather.com (US): fixed + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.5.6.tar.bz2 New: ---- 98925-cwp-1.5.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.ZYZoBS/_old 2011-12-21 10:03:05.000000000 +0100 +++ /var/tmp/diff_new_pack.ZYZoBS/_new 2011-12-21 10:03:05.000000000 +0100 @@ -16,15 +16,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: plasmoid-cwp -Version: 1.5.6 -Release: 1 -License: GPL-3.0+ +Version: 1.5.7 +Release: 0 Summary: Customizable Weather Plasmoid -Url: http://www.kde-look.org/content/show.php?content=98925 +License: GPL-3.0+ Group: Productivity/Other +Url: http://www.kde-look.org/content/show.php?content=98925 Source0: http://kde-look.org/CONTENT/content-files/98925-cwp-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE readme.patch [email protected] -- Clarify where the xml files mentioned in the README are installed Patch0: readme.patch @@ -49,6 +47,7 @@ /usr/share/kde4/apps/plasma-cwp %lang_package + %prep %setup -q -n cwp-%{version} %patch0 @@ -66,9 +65,6 @@ %kde_post_install -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc COPYING ChangeLog README ++++++ 98925-cwp-1.5.6.tar.bz2 -> 98925-cwp-1.5.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/ChangeLog new/cwp-1.5.7/ChangeLog --- old/cwp-1.5.6/ChangeLog 2011-11-08 18:11:10.000000000 +0100 +++ new/cwp-1.5.7/ChangeLog 2011-12-18 18:58:15.000000000 +0100 @@ -1,3 +1,7 @@ +1.5.7 +===== +- xml: accuweather.com (US): fixed + 1.5.6 ===== - xml: accuweather.com (US): fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/README new/cwp-1.5.7/README --- old/cwp-1.5.6/README 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/README 2011-12-18 18:52:24.000000000 +0100 @@ -1,5 +1,5 @@ ========================================= -Customizable Weather Plasmoid (CWP) 1.5.6 +Customizable Weather Plasmoid (CWP) 1.5.7 ========================================= This is another weather plasmoid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/br_weather_com.xml new/cwp-1.5.7/data/br_weather_com.xml --- old/cwp-1.5.6/data/br_weather_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/br_weather_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043" unit="C" /> <locale_settings locale="pt" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/de_weather_com.xml new/cwp-1.5.7/data/de_weather_com.xml --- old/cwp-1.5.6/data/de_weather_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/de_weather_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="de.weather.com" search_page="http://de.weather.com"; example_zip="80331" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="de.weather.com" search_page="http://de.weather.com"; example_zip="80331" unit="C" /> <locale_settings locale="de" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/espanol_weather_com.xml new/cwp-1.5.7/data/espanol_weather_com.xml --- old/cwp-1.5.6/data/espanol_weather_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/espanol_weather_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/fr_weather_com.xml new/cwp-1.5.7/data/fr_weather_com.xml --- old/cwp-1.5.6/data/fr_weather_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/fr_weather_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="Paris-FRXX0076" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="Paris-FRXX0076" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/freemeteo_com_celsius.xml new/cwp-1.5.7/data/freemeteo_com_celsius.xml --- old/cwp-1.5.6/data/freemeteo_com_celsius.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/freemeteo_com_celsius.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/freemeteo_com_fahrenheit.xml new/cwp-1.5.7/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.5.6/data/freemeteo_com_fahrenheit.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/freemeteo_com_fahrenheit.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/ilmeteo_it.xml new/cwp-1.5.7/data/ilmeteo_it.xml --- old/cwp-1.5.6/data/ilmeteo_it.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/ilmeteo_it.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/in_weather_com.xml new/cwp-1.5.7/data/in_weather_com.xml --- old/cwp-1.5.6/data/in_weather_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/in_weather_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/myforecast_com_celsius.xml new/cwp-1.5.7/data/myforecast_com_celsius.xml --- old/cwp-1.5.6/data/myforecast_com_celsius.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/myforecast_com_celsius.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/myforecast_com_fahrenheit.xml new/cwp-1.5.7/data/myforecast_com_fahrenheit.xml --- old/cwp-1.5.6/data/myforecast_com_fahrenheit.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/myforecast_com_fahrenheit.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/pogodynka_pl.xml new/cwp-1.5.7/data/pogodynka_pl.xml --- old/cwp-1.5.6/data/pogodynka_pl.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/pogodynka_pl.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/satellite_images.xml new/cwp-1.5.7/data/satellite_images.xml --- old/cwp-1.5.6/data/satellite_images.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/satellite_images.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp_satellite_images" version="2011-11-08" /> + <xml_file_version type="cwp_satellite_images" version="2011-12-18" /> <!--Global--> <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/uk_weather_com.xml new/cwp-1.5.7/data/uk_weather_com.xml --- old/cwp-1.5.6/data/uk_weather_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/uk_weather_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/wetter_com.xml new/cwp-1.5.7/data/wetter_com.xml --- old/cwp-1.5.6/data/wetter_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/wetter_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> <locale_settings locale="de" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/www_accuweather_com_us_celsius.xml new/cwp-1.5.7/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.5.6/data/www_accuweather_com_us_celsius.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/www_accuweather_com_us_celsius.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> - <urlc urlc_prefix="http://www.accuweather.com/us/"; urlc_suffix="/city-weather-forecast.asp" urlc_follow="grep city-weather-forecast.asp?unit=c | sed -e "s/.*href=\"\([^\"]*\)\".*/http:\/\/www.accuweather.com\1/"" /> + <urlc urlc_prefix="http://www.accuweather.com/us/"; urlc_suffix="/city-weather-forecast.asp" urlc_follow="grep starturl | sed -e "s/.*content=\"\([^\"]*\)\".*/\1?unit=c/"" /> - <url1 url1_prefix="http://www.accuweather.com/us/"; url1_suffix="/city-weather-forecast.asp" url1_follow="grep forecast-month.asp | grep Calendar | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)forecast-month.asp.*\".*/\1forecast-details.asp?fday=1\&unit=c/"" /> + <url1 url1_prefix="http://www.accuweather.com/us/"; url1_suffix="/city-weather-forecast.asp" url1_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?fday=1\&unit=c/"" /> - <url2 url2_prefix="http://www.accuweather.com/us/"; url2_suffix="/city-weather-forecast.asp" url2_follow="grep forecast-month.asp | grep Calendar | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)forecast-month.asp.*\".*/\1forecast-details.asp?fday=6\&unit=c/"" /> + <url2 url2_prefix="http://www.accuweather.com/us/"; url2_suffix="/city-weather-forecast.asp" url2_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?fday=6\&unit=c/"" /> - <url3 url3_prefix="http://www.accuweather.com/us/"; url3_suffix="/city-weather-forecast.asp" url3_follow="grep forecast-current-conditions.asp | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)\".*/\1\&unit=c/"" /> + <url3 url3_prefix="http://www.accuweather.com/us/"; url3_suffix="/city-weather-forecast.asp" url3_follow="grep current-weather | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)\".*/\1?unit=c/"" /> <url4 url4_prefix="" url4_suffix="" url4_follow="" /> @@ -22,8 +22,8 @@ <url7 url7_prefix="" url7_suffix="" url7_follow="" /> <data_location url="url3" - location="grep \<title | sed -e "s/.*<title>\(.*\) Current Weather - AccuWeather for \([^0-9 ]*\).*/\1/"" - country="grep \<title | sed -e "s/.*<title>\(.*\) Current Weather - AccuWeather for \([^0-9 ]*\).*/\2/"" + location="grep apgUserInfoObj= | sed -e "s/.*city:'\([^']*\)'.*/\1/"" + country="grep apgUserInfoObj= | sed -e "s/.*state:'\([^']*\)'.*/\1/"" /> <data_sun url="url3" @@ -33,7 +33,7 @@ <data_current_temperature url="urlc" update_time="grep Now | head -n 1 | sed -e "s/.*[^0-9]\([0-9]*:[0-9]*[apm]*\).*/\1/"" - temperature="grep -A 1 class=[\"]*temp | head -n 1 | sed -e "s/.*class=\"temp\">\(-*[0-9]*\).*/\1/"" + temperature="grep class=[\"]*temp | head -n 1 | sed -e "s/.*class=\"temp\">\(-*[0-9]*\).*/\1/"" temperature_felt="grep -A 2 class=[\"]*temp | head -n 2 | tail -n 1 | sed -e "s/.*RealFeel[^0-9-]*\(-*[0-9]*\).*/\1/"" /> @@ -59,66 +59,66 @@ /> <data_day1 url="url1" - name="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/"" - icon_code="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/"" - icon_text="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/"" + icon_text="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day2 url="url1" - name="grep -A 18 fday=2 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=2 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=2 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=2 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=2 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=2 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day3 url="url1" - name="grep -A 18 fday=3 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=3 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=3 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=3 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=3 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=3 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day4 url="url1" - name="grep -A 18 fday=4 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=4 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=4 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=4 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=4 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=4 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day5 url="url1" - name="grep -A 18 fday=5 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=5 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=5 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=5 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=5 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=5 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day6 url="url2" - name="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day7 url="url2" - name="grep -A 18 fday=7 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=7 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=7 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=7 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=7 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=7 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.5.7/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.5.6/data/www_accuweather_com_us_fahrenheit.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/www_accuweather_com_us_fahrenheit.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="F" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> - <urlc urlc_prefix="http://www.accuweather.com/us/"; urlc_suffix="/city-weather-forecast.asp" urlc_follow="grep city-weather-forecast.asp?unit=f | sed -e "s/.*href=\"\([^\"]*\)\".*/http:\/\/www.accuweather.com\1/"" /> + <urlc urlc_prefix="http://www.accuweather.com/us/"; urlc_suffix="/city-weather-forecast.asp" urlc_follow="grep starturl | sed -e "s/.*content=\"\([^\"]*\)\".*/\1?unit=f/"" /> - <url1 url1_prefix="http://www.accuweather.com/us/"; url1_suffix="/city-weather-forecast.asp" url1_follow="grep forecast-month.asp | grep Calendar | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)forecast-month.asp.*\".*/\1forecast-details.asp?fday=1\&unit=f/"" /> + <url1 url1_prefix="http://www.accuweather.com/us/"; url1_suffix="/city-weather-forecast.asp" url1_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?fday=1\&unit=f/"" /> - <url2 url2_prefix="http://www.accuweather.com/us/"; url2_suffix="/city-weather-forecast.asp" url2_follow="grep forecast-month.asp | grep Calendar | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)forecast-month.asp.*\".*/\1forecast-details.asp?fday=6\&unit=f/"" /> + <url2 url2_prefix="http://www.accuweather.com/us/"; url2_suffix="/city-weather-forecast.asp" url2_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?fday=6\&unit=f/"" /> - <url3 url3_prefix="http://www.accuweather.com/us/"; url3_suffix="/city-weather-forecast.asp" url3_follow="grep forecast-current-conditions.asp | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)\".*/\1\&unit=f/"" /> + <url3 url3_prefix="http://www.accuweather.com/us/"; url3_suffix="/city-weather-forecast.asp" url3_follow="grep current-weather | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)\".*/\1?unit=f/"" /> <url4 url4_prefix="" url4_suffix="" url4_follow="" /> @@ -22,8 +22,8 @@ <url7 url7_prefix="" url7_suffix="" url7_follow="" /> <data_location url="url3" - location="grep \<title | sed -e "s/.*<title>\(.*\) Current Weather - AccuWeather for \([^0-9 ]*\).*/\1/"" - country="grep \<title | sed -e "s/.*<title>\(.*\) Current Weather - AccuWeather for \([^0-9 ]*\).*/\2/"" + location="grep apgUserInfoObj= | sed -e "s/.*city:'\([^']*\)'.*/\1/"" + country="grep apgUserInfoObj= | sed -e "s/.*state:'\([^']*\)'.*/\1/"" /> <data_sun url="url3" @@ -33,7 +33,7 @@ <data_current_temperature url="urlc" update_time="grep Now | head -n 1 | sed -e "s/.*[^0-9]\([0-9]*:[0-9]*[apm]*\).*/\1/"" - temperature="grep -A 1 class=[\"]*temp | head -n 1 | sed -e "s/.*class=\"temp\">\(-*[0-9]*\).*/\1/"" + temperature="grep class=[\"]*temp | head -n 1 | sed -e "s/.*class=\"temp\">\(-*[0-9]*\).*/\1/"" temperature_felt="grep -A 2 class=[\"]*temp | head -n 2 | tail -n 1 | sed -e "s/.*RealFeel[^0-9-]*\(-*[0-9]*\).*/\1/"" /> @@ -59,66 +59,66 @@ /> <data_day1 url="url1" - name="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/"" - icon_code="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/"" - icon_text="grep -A 18 fday=1 | head -n 40 | tail -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/"" + icon_text="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day2 url="url1" - name="grep -A 18 fday=2 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=2 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=2 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=2 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=2 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=2 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day3 url="url1" - name="grep -A 18 fday=3 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=3 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=3 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=3 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=3 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=3 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 78 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day4 url="url1" - name="grep -A 18 fday=4 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=4 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=4 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=4 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=4 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=4 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 98 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day5 url="url1" - name="grep -A 18 fday=5 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=5 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=5 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=5 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=5 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=5 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 118 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day6 url="url2" - name="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=6 | head -n 40 | tail -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 38 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <data_day7 url="url2" - name="grep -A 18 fday=7 | head -n 19 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 18 fday=7 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" - temperature_high="grep -A 18 fday=7 | head -n 19 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" - icon="grep -A 18 fday=7 | head -n 19 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" - icon_code="grep -A 18 fday=7 | head -n 19 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" - icon_text="grep -A 18 fday=7 | head -n 19 | grep cond | sed -e "s/<[^>]*>//g"" + name="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep href=\"#\" | sed -e "s/<[^>]*>//g"" + temperature_low="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/"" + temperature_high="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/"" + icon="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/"" + icon_code="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/"" + icon_text="grep -A 18 class=\"day | head -n 58 | tail -n 18 | grep cond | sed -e "s/<[^>]*>//g"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/www_accuweather_com_world_celsius.xml new/cwp-1.5.7/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.5.6/data/www_accuweather_com_world_celsius.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/www_accuweather_com_world_celsius.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp"; example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp"; example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.5.7/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.5.6/data/www_accuweather_com_world_fahrenheit.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/www_accuweather_com_world_fahrenheit.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp"; example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp"; example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/www_gismeteo_com.xml new/cwp-1.5.7/data/www_gismeteo_com.xml --- old/cwp-1.5.6/data/www_gismeteo_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/www_gismeteo_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.6/data/www_weather_com.cn.xml new/cwp-1.5.7/data/www_weather_com.cn.xml --- old/cwp-1.5.6/data/www_weather_com.cn.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/www_weather_com.cn.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/data/www_weather_com.xml new/cwp-1.5.7/data/www_weather_com.xml --- old/cwp-1.5.6/data/www_weather_com.xml 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/data/www_weather_com.xml 2011-12-18 18:52:24.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2011-11-08" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2011-12-18" 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.5.6/plasma-applet-cwp.desktop new/cwp-1.5.7/plasma-applet-cwp.desktop --- old/cwp-1.5.6/plasma-applet-cwp.desktop 2011-11-08 18:11:10.000000000 +0100 +++ new/cwp-1.5.7/plasma-applet-cwp.desktop 2011-12-18 18:52:24.000000000 +0100 @@ -30,7 +30,7 @@ X-KDE-PluginInfo-Author=Georg Hennig [email protected] X-KDE-PluginInfo-Name=plasma_applet_cwp -X-KDE-PluginInfo-Version=1.5.6 +X-KDE-PluginInfo-Version=1.5.7 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.5.6/version.h new/cwp-1.5.7/version.h --- old/cwp-1.5.6/version.h 2011-11-08 18:11:11.000000000 +0100 +++ new/cwp-1.5.7/version.h 2011-12-18 18:52:24.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.5.6" +#define VERSION "1.5.7" #define DATE "2009-2011" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
