Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2012-03-05 18:01:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-02-27 18:35:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2012-03-05 18:01:20.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 29 20:33:22 UTC 2012 - asterios.dra...@gmail.com + +- Update to version 1.5.11: + * xml: gismeteo.com: fixed (thanks to Dreid) + * xml: www.weather.com.cn: fixes + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.5.10.tar.bz2 New: ---- 98925-cwp-1.5.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.bCOZdh/_old 2012-03-05 18:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.bCOZdh/_new 2012-03-05 18:01:21.000000000 +0100 @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.5.10 +Version: 1.5.11 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.5.10.tar.bz2 -> 98925-cwp-1.5.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/ChangeLog new/cwp-1.5.11/ChangeLog --- old/cwp-1.5.10/ChangeLog 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/ChangeLog 2012-02-28 21:32:30.000000000 +0100 @@ -1,3 +1,8 @@ +1.5.11 +====== +- xml: gismeteo.com: fixed (thanks to Dreid) +- xml: www.weather.com.cn: fixes + 1.5.10 ====== - xml: gismeteo.com: negative temperature values fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/README new/cwp-1.5.11/README --- old/cwp-1.5.10/README 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/README 2012-02-28 21:32:31.000000000 +0100 @@ -1,5 +1,5 @@ -========================================= -Customizable Weather Plasmoid (CWP) 1.5.10 +========================================== +Customizable Weather Plasmoid (CWP) 1.5.11 ========================================== This is another weather plasmoid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/br_weather_com.xml new/cwp-1.5.11/data/br_weather_com.xml --- old/cwp-1.5.10/data/br_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/br_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/de_weather_com.xml new/cwp-1.5.11/data/de_weather_com.xml --- old/cwp-1.5.10/data/de_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/de_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="de.weather.com" search_page="http://de.weather.com"; example_zip="80331" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/espanol_weather_com.xml new/cwp-1.5.11/data/espanol_weather_com.xml --- old/cwp-1.5.10/data/espanol_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/espanol_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/fr_weather_com.xml new/cwp-1.5.11/data/fr_weather_com.xml --- old/cwp-1.5.10/data/fr_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/fr_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="Paris-FRXX0076" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/freemeteo_com_celsius.xml new/cwp-1.5.11/data/freemeteo_com_celsius.xml --- old/cwp-1.5.10/data/freemeteo_com_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/freemeteo_com_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/freemeteo_com_fahrenheit.xml new/cwp-1.5.11/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.5.10/data/freemeteo_com_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/freemeteo_com_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/ilmeteo_it.xml new/cwp-1.5.11/data/ilmeteo_it.xml --- old/cwp-1.5.10/data/ilmeteo_it.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/ilmeteo_it.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/in_weather_com.xml new/cwp-1.5.11/data/in_weather_com.xml --- old/cwp-1.5.10/data/in_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/in_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/myforecast_com_celsius.xml new/cwp-1.5.11/data/myforecast_com_celsius.xml --- old/cwp-1.5.10/data/myforecast_com_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/myforecast_com_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/myforecast_com_fahrenheit.xml new/cwp-1.5.11/data/myforecast_com_fahrenheit.xml --- old/cwp-1.5.10/data/myforecast_com_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/myforecast_com_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/pogodynka_pl.xml new/cwp-1.5.11/data/pogodynka_pl.xml --- old/cwp-1.5.10/data/pogodynka_pl.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/pogodynka_pl.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/satellite_images.xml new/cwp-1.5.11/data/satellite_images.xml --- old/cwp-1.5.10/data/satellite_images.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/satellite_images.xml 2012-02-28 21:32:31.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="2012-02-19" /> + <xml_file_version type="cwp_satellite_images" version="2012-02-28" /> <!--Global--> <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/uk_weather_com.xml new/cwp-1.5.11/data/uk_weather_com.xml --- old/cwp-1.5.10/data/uk_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/uk_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/wetter_com.xml new/cwp-1.5.11/data/wetter_com.xml --- old/cwp-1.5.10/data/wetter_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/wetter_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/data/www_accuweather_com_us_celsius.xml new/cwp-1.5.11/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.5.10/data/www_accuweather_com_us_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_us_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.5.11/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.5.10/data/www_accuweather_com_us_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_us_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_accuweather_com_world_celsius.xml new/cwp-1.5.11/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.5.10/data/www_accuweather_com_world_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_world_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" 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="2012-02-28" 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.10/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.5.11/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.5.10/data/www_accuweather_com_world_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_world_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" 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="2012-02-28" 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.10/data/www_gismeteo_com.xml new/cwp-1.5.11/data/www_gismeteo_com.xml --- old/cwp-1.5.10/data/www_gismeteo_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_gismeteo_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -33,14 +33,14 @@ <data_current_temperature url="urlc" update_time="grep icon\ date | sed -e "s/.*icon date[^>]*>[^:]* \([0-9]\+:[0-9]\+\).*/\1/" | awk '{if ($1 ~ /^[0-9]+:[0-9]+$/) {print} else {print "N.A."} ; }'" - temperature="grep -A 19 id=\"weather\" | grep temp | sed -e "s/<[^>]*>//g" | sed -e "s/&minus;/-/g" | sed -e "s/[^-0-9]*\([^&]*\).*/\1/"" + temperature="grep -A 19 id=\"weather\" | grep "temp c" | sed -e "s/&minus;/-/" | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^-0-9]\([-0-9]\+\)&deg.*/\1/"" temperature_felt="echo -n" /> <data_current_wind url="urlc" - wind="grep -A 19 id=\"weather\" | grep wind | sed -e "s/.*wicon.*wicon.*<dd>\([^<]*\)<.*unit[^>]*>\([^<,]*\).*<dt>\([^<]*\).*/\1 \2 - \3/"" - wind_code="grep -A 19 id=\"weather\" | grep wind | sed -e "s/.*wicon.*wicon.*<dd>\([^<]*\)<.*unit[^>,]*>\([^<,]*\).*<dt>\([^<]*\).*/\3/"" - wind_speed="grep -A 19 id=\"weather\" | grep wind | sed -e "s/.*wicon.*wicon.*<dd>\([^<]*\)<.*unit[^>,]*>\([^<,]*\).*<dt>\([^<]*\).*/\1 \2/"" + wind="grep -A 19 id=\"weather\"|grep -A 4 wicon| tr -d '\r' | tr -d '\n'|sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3 - \1 \2/"" + wind_code="grep -A 19 id=\"weather\"|grep -A 4 wicon|tail -n 1|sed -e "s/<[^>]*>//g"" + wind_speed="grep -A 19 id=\"weather\" | grep "wind ms" | sed -e "s/.*class=.value[^>]*>\([^<]*\)<.*class=.unit[^>]*>\([^<]*\)<.*/\1 \2/"" /> <data_current_icon url="urlc" @@ -50,66 +50,66 @@ /> <data_current_additional url="urlc" - humidity="grep -A 19 id=\"weather\" | grep hum | sed -e "s/<[^>]*>//g"" + humidity="grep -A 26 id=\"weather\" | grep hum | sed -e "s/<[^>]*>//g" | sed -e "s/&nbsp;/ /"" rain="echo -n" dew_point="echo -n" visibility="echo -n" - pressure="grep -A 19 id=\"weather\" | grep barp | sed -e "s/<[^>]*>//g"" + pressure="grep -A 26 id=\"weather\" | grep "press tor" | sed -e "s/<[^>]*>//g"" uv_index="echo -n" /> <data_day1 url="url1" name="grep -A 8 weekday | head -n 9 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>\([^<]*\).*/\1/"" - temperature_low="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" + temperature_high="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" icon="grep -A 8 weekday | head -n 9 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/"" icon_code="grep -A 8 weekday | head -n 9 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 9 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>\([^<]*\).*/\1/"" /> <data_day2 url="url1" name="grep -A 8 weekday | head -n 19 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>\([^<]*\).*/\1/"" - temperature_low="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" + temperature_high="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" icon="grep -A 8 weekday | head -n 19 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/"" icon_code="grep -A 8 weekday | head -n 19 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 19 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>\([^<]*\).*/\1/"" /> <data_day3 url="url1" name="grep -A 8 weekday | head -n 29 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>\([^<]*\).*/\1/"" - temperature_low="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" + temperature_high="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" icon="grep -A 8 weekday | head -n 29 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/"" icon_code="grep -A 8 weekday | head -n 29 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 29 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>\([^<]*\).*/\1/"" /> <data_day4 url="url1" name="grep -A 8 weekday | head -n 39 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>\([^<]*\).*/\1/"" - temperature_low="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" + temperature_high="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" icon="grep -A 8 weekday | head -n 39 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/"" icon_code="grep -A 8 weekday | head -n 39 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 39 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>\([^<]*\).*/\1/"" /> <data_day5 url="url1" name="grep -A 8 weekday | head -n 49 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>\([^<]*\).*/\1/"" - temperature_low="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" + temperature_high="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" icon="grep -A 8 weekday | head -n 49 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/"" icon_code="grep -A 8 weekday | head -n 49 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 49 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>\([^<]*\).*/\1/"" /> <data_day6 url="url1" name="grep -A 8 weekday | head -n 59 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>\([^<]*\).*/\1/"" - temperature_low="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" + temperature_high="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" icon="grep -A 8 weekday | head -n 59 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/"" icon_code="grep -A 8 weekday | head -n 59 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 59 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>\([^<]*\).*/\1/"" /> <data_day7 url="url1" name="grep -A 8 weekday | head -n 69 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>\([^<]*\).*/\1/"" - temperature_low="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*\([^<]\+\).*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" + temperature_high="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*\([-0-9]\+\).*/\1/"" icon="grep -A 8 weekday | head -n 69 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/"" icon_code="grep -A 8 weekday | head -n 69 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*\(http[^\"]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 69 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>\([^<]*\).*/\1/"" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_weather_com.cn.xml new/cwp-1.5.11/data/www_weather_com.cn.xml --- old/cwp-1.5.10/data/www_weather_com.cn.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_weather_com.cn.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -60,65 +60,65 @@ <data_day1 url="url1" name="grep -A 3 day\ 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 1 | grep -A 1 ℃ | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A 40 day\ 1 | grep -A 1 ℃ | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A 20 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 20 day\ 1 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 50 day\ 1 | grep -A 1 ℃ | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + temperature_high="grep -A 50 day\ 1 | grep -A 1 ℃ | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + icon="grep -A 28 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" + icon_text="grep -A 28 day\ 1 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" /> <data_day2 url="url1" name="grep -A 3 day\ 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 2 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A 40 day\ 2 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A 20 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 20 day\ 2 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 50 day\ 2 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + temperature_high="grep -A 50 day\ 2 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + icon="grep -A 28 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" + icon_text="grep -A 28 day\ 2 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" /> <data_day3 url="url1" name="grep -A 3 day\ 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 3 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A 40 day\ 3 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A 20 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 20 day\ 3 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 50 day\ 3 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + temperature_high="grep -A 50 day\ 3 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + icon="grep -A 28 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" + icon_text="grep -A 28 day\ 3 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" /> <data_day4 url="url1" name="grep -A 3 day\ 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 4 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A 40 day\ 4 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A 20 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 20 day\ 4 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 50 day\ 4 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + temperature_high="grep -A 50 day\ 4 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + icon="grep -A 28 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" + icon_text="grep -A 28 day\ 4 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" /> <data_day5 url="url1" name="grep -A 3 day\ 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 5 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A 40 day\ 5 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A 20 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 20 day\ 5 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 50 day\ 5 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + temperature_high="grep -A 50 day\ 5 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + icon="grep -A 28 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" + icon_text="grep -A 28 day\ 5 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" /> <data_day6 url="url1" name="grep -A 3 day\ 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 6 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A 40 day\ 6 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A 20 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 20 day\ 6 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 50 day\ 6 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + temperature_high="grep -A 50 day\ 6 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + icon="grep -A 28 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" + icon_text="grep -A 28 day\ 6 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" /> <data_day7 url="url1" name="grep -A 3 day\ 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 7 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A 40 day\ 7 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A 20 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 20 day\ 7 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 50 day\ 7 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + temperature_high="grep -A 50 day\ 7 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" + icon="grep -A 28 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" + icon_text="grep -A 28 day\ 7 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_weather_com.xml new/cwp-1.5.11/data/www_weather_com.xml --- old/cwp-1.5.10/data/www_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" 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.10/plasma-applet-cwp.desktop new/cwp-1.5.11/plasma-applet-cwp.desktop --- old/cwp-1.5.10/plasma-applet-cwp.desktop 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/plasma-applet-cwp.desktop 2012-02-28 21:32:30.000000000 +0100 @@ -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.5.10 +X-KDE-PluginInfo-Version=1.5.11 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.10/version.h new/cwp-1.5.11/version.h --- old/cwp-1.5.10/version.h 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/version.h 2012-02-28 21:32:31.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.5.10" +#define VERSION "1.5.11" #define DATE "2009-2012" #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
