Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2014-10-15 08:51:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-05 21:13:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2014-10-15 08:52:32.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Oct 14 17:51:35 UTC 2014 - asterios.dra...@gmail.com + +- Update to version 1.11.1: + * xml: br.weather.com: location fixed + * xml: de.weather.com: location fixed + * xml: fr.weather.com: location fixed + * xml: in.weather.com: links fixed + * xml: pogodynka.pl: fixes + * xml: weather.com.cn: fixed + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.11.0.tar.bz2 New: ---- 98925-cwp-1.11.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.HssTM2/_old 2014-10-15 08:52:34.000000000 +0200 +++ /var/tmp/diff_new_pack.HssTM2/_new 2014-10-15 08:52:34.000000000 +0200 @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.11.0 +Version: 1.11.1 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.11.0.tar.bz2 -> 98925-cwp-1.11.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/ChangeLog new/cwp-1.11.1/ChangeLog --- old/cwp-1.11.0/ChangeLog 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/ChangeLog 2014-09-06 00:32:37.000000000 +0200 @@ -1,3 +1,12 @@ +1.11.1 +====== +- xml: br.weather.com: location fixed +- xml: de.weather.com: location fixed +- xml: fr.weather.com: location fixed +- xml: in.weather.com: links fixed +- xml: pogodynka.pl: fixes +- xml: weather.com.cn: fixed + 1.11.0 ====== - xml: gismeteo.com: fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/README new/cwp-1.11.1/README --- old/cwp-1.11.0/README 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/README 2014-09-06 00:32:37.000000000 +0200 @@ -1,5 +1,5 @@ ========================================== -Customizable Weather Plasmoid (CWP) 1.11.0 +Customizable Weather Plasmoid (CWP) 1.11.1 ========================================== This is another weather plasmoid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/br_weather_com.xml new/cwp-1.11.1/data/br_weather_com.xml --- old/cwp-1.11.0/data/br_weather_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/br_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043:1:BR" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043:1:BR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -22,8 +22,8 @@ <url7 url7_prefix="" url7_suffix="" url7_follow="" /> <data_location url="urlc" - location="grep loc\ = | sed -e "s/[^\"]*\"\([^,]*\),\([^\"]*\).*/\1/"" - country="grep loc\ = | sed -e "s/[^\"]*\"\([^,]*\),\([^\"]*\).*/\2/"" + location="grep countryName | sed -e "s/.*\"city\":\"\([^\"]*\).*/\1/"" + country="grep countryName | sed -e "s/.*\"countryName\":\"\([^\"]*\).*/\1/"" /> <data_sun url="url1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/de_weather_com.xml new/cwp-1.11.1/data/de_weather_com.xml --- old/cwp-1.11.0/data/de_weather_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/de_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="de.weather.com" search_page="http://de.weather.com"; example_zip="GMXX0087:1:GM" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="de.weather.com" search_page="http://de.weather.com"; example_zip="GMXX0087:1:GM" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -22,8 +22,8 @@ <url7 url7_prefix="" url7_suffix="" url7_follow="" /> <data_location url="urlc" - location="grep loc\ = | sed -e "s/[^\"]*\"\([^,]*\),\([^\"]*\).*/\1/"" - country="grep loc\ = | sed -e "s/[^\"]*\"\([^,]*\),\([^\"]*\).*/\2/"" + location="grep countryName | sed -e "s/.*\"city\":\"\([^\"]*\).*/\1/"" + country="grep countryName | sed -e "s/.*\"countryName\":\"\([^\"]*\).*/\1/"" /> <data_sun url="url1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/espanol_weather_com.xml new/cwp-1.11.1/data/espanol_weather_com.xml --- old/cwp-1.11.0/data/espanol_weather_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/espanol_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" 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.11.0/data/fr_weather_com.xml new/cwp-1.11.1/data/fr_weather_com.xml --- old/cwp-1.11.0/data/fr_weather_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/fr_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="FRXX0076:1:FR" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="FRXX0076:1:FR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -21,8 +21,8 @@ <url7 url7_prefix="" url7_suffix="" url7_follow="" /> <data_location url="urlc" - location="grep loc\ = | sed -e "s/[^\"]*\"\([^,]*\),\([^\"]*\).*/\1/"" - country="grep loc\ = | sed -e "s/[^\"]*\"\([^,]*\),\([^\"]*\).*/\2/"" + location="grep countryName | sed -e "s/.*\"city\":\"\([^\"]*\).*/\1/"" + country="grep countryName | sed -e "s/.*\"countryName\":\"\([^\"]*\).*/\1/"" /> <data_sun url="url1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/ilmeteo_it.xml new/cwp-1.11.1/data/ilmeteo_it.xml --- old/cwp-1.11.0/data/ilmeteo_it.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/ilmeteo_it.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" 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.11.0/data/in_weather_com.xml new/cwp-1.11.1/data/in_weather_com.xml --- old/cwp-1.11.0/data/in_weather_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/in_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> - <urlc urlc_prefix="http://uk.weather.com/weather/today-"; urlc_suffix="" urlc_follow="" /> + <urlc urlc_prefix="http://in.weather.com/weather/today-"; urlc_suffix="" urlc_follow="" /> - <url1 url1_prefix="http://uk.weather.com/weather/10day-"; url1_suffix="" url1_follow="" /> + <url1 url1_prefix="http://in.weather.com/weather/10day-"; url1_suffix="" url1_follow="" /> <url2 url2_prefix="" url2_suffix="" url2_follow="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/myforecast_com_celsius.xml new/cwp-1.11.1/data/myforecast_com_celsius.xml --- old/cwp-1.11.0/data/myforecast_com_celsius.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/myforecast_com_celsius.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" 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.11.0/data/myforecast_com_fahrenheit.xml new/cwp-1.11.1/data/myforecast_com_fahrenheit.xml --- old/cwp-1.11.0/data/myforecast_com_fahrenheit.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/myforecast_com_fahrenheit.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2014-09-06" 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.11.0/data/openweathermap_org.xml new/cwp-1.11.1/data/openweathermap_org.xml --- old/cwp-1.11.0/data/openweathermap_org.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/openweathermap_org.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="openweathermap.org" search_page="http://www.openweathermap.org"; example_zip="id=2643743 or q=London,UK" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="openweathermap.org" search_page="http://www.openweathermap.org"; example_zip="id=2643743 or q=London,UK" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/pogodynka_pl.xml new/cwp-1.11.1/data/pogodynka_pl.xml --- old/cwp-1.11.0/data/pogodynka_pl.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/pogodynka_pl.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> - <urlc urlc_prefix="http://www.pogodynka.pl/"; urlc_suffix="" urlc_follow="" /> + <urlc urlc_prefix="http://www.pogodynka.pl/"; urlc_suffix="" urlc_follow="grep prognoza_synoptyczna\/ | sed -e "s/.*href='\([^']*prognoza_synoptyczna[^']*\).*/http:\/\/www.pogodynka.pl\1/"" /> <url1 url1_prefix="http://www.pogodynka.pl/"; url1_suffix="" url1_follow="grep 16dni | tail -n 1 | sed -e "s/.*href='\([^']*16dni[^']*\).*/http:\/\/www.pogodynka.pl\1/"" /> @@ -27,98 +27,98 @@ /> <data_sun url="urlc" - sunrise="grep -A 2 info_info | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" - sunset="grep -A 2 info_info | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" + sunrise="grep -A 6 np_data | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" + sunset="grep -A 6 np_data | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_current_temperature url="urlc" update_time="echo -n N/A" - temperature="grep -A 1 Temperatura | head -n 2 | tail -n 1 | sed -e "s/.*>\([^>]*\) &#176;C.*/\1/"" + temperature="grep -A 25 class=\"k | grep C\< | head -n 1 | sed -e "s/.*<td>\([^&°]*\).*/\1/"" temperature_felt="echo -n" /> <data_current_wind url="urlc" - wind_code="grep -A 1 Kierunek\ wiatru | head -n 2 | tail -n 1 | sed -e "s/.*src='\([^']*\).*/http:\/\/www.pogodynka.pl\/\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - wind_speed="grep -A 1 Sila\ wiatru | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - wind="grep -A 1 Sila\ wiatru | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + wind_code="grep wind\/ | sed -e "s/.*src=['\"]\([^'\"]*\).*/http:\/\/www.pogodynka.pl\/\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + wind_speed="grep wind\/ | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + wind="grep wind\/ | sed -e "s/[^<]*<[^>]*>\([^<]*\).*src=['\"][^'\"]*\/\([^\/]*\).png.*/\1 - \2/"" /> - <data_current_icon url="urlc" + <data_current_icon url="url1" icon="grep auto_icons | head -n 1 | sed -e "s/.*url('\([^']*\).*/http:\/\/www.pogodynka.pl\1/"" icon_code="grep auto_icons | head -n 1 | sed -e "s/.*url('\([^']*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" icon_text="grep -B 1 auto_icons | head -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" /> - <data_current_additional url="urlc" + <data_current_additional url="url1" humidity="echo -n" rain="echo -n" dew_point="echo -n" visibility="echo -n" - pressure="grep -A 1 Ciśnienie | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + pressure="grep -A 1 Ciśnienie | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" uv_index="echo -n" /> <data_day1 url="url1" name="grep span\ class=\'godzina\' | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/"" - temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - icon="grep -A 14 1[34]:00 | grep ico | head -n 1 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" - icon_code="grep -A 14 1[34]:00 | grep ico | head -n 1 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - icon_text="grep -A 14 1[34]:00 | grep opis | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 15 span\ class=\'godzina\' | head -n 15 | grep -A 14 \>[12]:00 | grep temperatura | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_high="grep -A 14 \>1[34]:00 | grep temperatura | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + icon="grep -A 14 \>1[34]:00 | grep ico | head -n 2 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" + icon_code="grep -A 14 \>1[34]:00 | grep ico | head -n 2 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + icon_text="grep -A 18 \>1[34]:00 | grep \/div | head -n 1 | tail -n 1 | sed -e "s/\s*\([^<]*\).*/\1/"" /> <data_day2 url="url1" name="grep span\ class=\'godzina\' | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/"" - temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - icon="grep -A 14 1[34]:00 | grep ico | head -n 3 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" - icon_code="grep -A 14 1[34]:00 | grep ico | head -n 3 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - icon_text="grep -A 14 1[34]:00 | grep opis | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 15 span\ class=\'godzina\' | head -n 31 | tail -n 15 | grep -A 14 \>[12]:00 | grep temperatura | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_high="grep -A 14 \>1[34]:00 | grep temperatura | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + icon="grep -A 14 \>1[34]:00 | grep ico | head -n 4 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" + icon_code="grep -A 14 \>1[34]:00 | grep ico | head -n 4 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + icon_text="grep -A 18 \>1[34]:00 | grep \/div | head -n 3 | tail -n 1 | sed -e "s/\s*\([^<]*\).*/\1/"" /> <data_day3 url="url1" name="grep span\ class=\'godzina\' | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/"" - temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - icon="grep -A 14 1[34]:00 | grep ico | head -n 5 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" - icon_code="grep -A 14 1[34]:00 | grep ico | head -n 5 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - icon_text="grep -A 14 1[34]:00 | grep opis | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 15 span\ class=\'godzina\' | head -n 47 | tail -n 15 | grep -A 14 \>[12]:00 | grep temperatura | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_high="grep -A 14 \>1[34]:00 | grep temperatura | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + icon="grep -A 14 \>1[34]:00 | grep ico | head -n 6 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" + icon_code="grep -A 14 \>1[34]:00 | grep ico | head -n 6 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + icon_text="grep -A 18 \>1[34]:00 | grep \/div | head -n 5 | tail -n 1 | sed -e "s/\s*\([^<]*\).*/\1/"" /> <data_day4 url="url1" name="grep span\ class=\'godzina\' | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/"" - temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - icon="grep -A 14 1[34]:00 | grep ico | head -n 7 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" - icon_code="grep -A 14 1[34]:00 | grep ico | head -n 7 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - icon_text="grep -A 14 1[34]:00 | grep opis | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 15 span\ class=\'godzina\' | head -n 63 | tail -n 15 | grep -A 14 \>[12]:00 | grep temperatura | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_high="grep -A 14 \>1[34]:00 | grep temperatura | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + icon="grep -A 14 \>1[34]:00 | grep ico | head -n 8 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" + icon_code="grep -A 14 \>1[34]:00 | grep ico | head -n 8 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + icon_text="grep -A 18 \>1[34]:00 | grep \/div | head -n 7 | tail -n 1 | sed -e "s/\s*\([^<]*\).*/\1/"" /> <data_day5 url="url1" name="grep span\ class=\'godzina\' | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/"" - temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - icon="grep -A 14 1[34]:00 | grep ico | head -n 9 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" - icon_code="grep -A 14 1[34]:00 | grep ico | head -n 9 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - icon_text="grep -A 14 1[34]:00 | grep opis | head -n 9 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 15 span\ class=\'godzina\' | head -n 79 | tail -n 15 | grep -A 14 \>[12]:00 | grep temperatura | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_high="grep -A 14 \>1[34]:00 | grep temperatura | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + icon="grep -A 14 \>1[34]:00 | grep ico | head -n 10 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" + icon_code="grep -A 14 \>1[34]:00 | grep ico | head -n 10 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + icon_text="grep -A 18 \>1[34]:00 | grep \/div | head -n 9 | tail -n 1 | sed -e "s/\s*\([^<]*\).*/\1/"" /> <data_day6 url="url1" name="grep span\ class=\'godzina\' | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/"" - temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - icon="grep -A 14 1[34]:00 | grep ico | head -n 11 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" - icon_code="grep -A 14 1[34]:00 | grep ico | head -n 11 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - icon_text="grep -A 14 1[34]:00 | grep opis | head -n 11 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 15 span\ class=\'godzina\' | head -n 95 | tail -n 15 | grep -A 14 \>[12]:00 | grep temperatura | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_high="grep -A 14 \>1[34]:00 | grep temperatura | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + icon="grep -A 14 \>1[34]:00 | grep ico | head -n 12 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" + icon_code="grep -A 14 \>1[34]:00 | grep ico | head -n 12 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + icon_text="grep -A 18 \>1[34]:00 | grep \/div | head -n 11 | tail -n 1 | sed -e "s/\s*\([^<]*\).*/\1/"" /> <data_day7 url="url1" name="grep span\ class=\'godzina\' | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/"" - temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" - icon="grep -A 14 1[34]:00 | grep ico | head -n 13 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" - icon_code="grep -A 14 1[34]:00 | grep ico | head -n 13 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" - icon_text="grep -A 14 1[34]:00 | grep opis | head -n 13 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/"" + temperature_low="grep -A 15 span\ class=\'godzina\' | head -n 111 | tail -n 15 | grep -A 14 \>[12]:00 | grep temperatura | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + temperature_high="grep -A 14 \>1[34]:00 | grep temperatura | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/"" + icon="grep -A 14 \>1[34]:00 | grep ico | head -n 14 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/"" + icon_code="grep -A 14 \>1[34]:00 | grep ico | head -n 14 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).png.*/\1/"" + icon_text="grep -A 18 \>1[34]:00 | grep \/div | head -n 13 | tail -n 1 | sed -e "s/\s*\([^<]*\).*/\1/"" /> <icon_transform @@ -173,23 +173,23 @@ /> <wind_transform - i1="0" o1="N" + i1="n" o1="N" i2="" o2="NNE" - i3="1" o3="NE" + i3="ne" o3="NE" i4="" o4="ENE" - i5="2" o5="E" + i5="e" o5="E" i6="" o6="SSE" - i7="3" o7="SE" + i7="se" o7="SE" i8="" o8="ESE" - i9="4" o9="S" + i9="s" o9="S" i10="" o10="NNW" - i11="7" o11="NW" + i11="nw" o11="NW" i12="" o12="WNW" - i13="6" o13="W" + i13="w" o13="W" i14="" o14="SSW" - i15="5" o15="SW" + i15="sw" o15="SW" i16="" o16="WSW" - i17="8" o17="Var" + i17="var" o17="Var" i18="" o18="" i19="" o19="" i20="" o20="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/satellite_images.xml new/cwp-1.11.1/data/satellite_images.xml --- old/cwp-1.11.0/data/satellite_images.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/satellite_images.xml 2014-09-06 00:32: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="2014-04-24" /> + <xml_file_version type="cwp_satellite_images" version="2014-09-06" /> <!--Global--> <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/uk_weather_com.xml new/cwp-1.11.1/data/uk_weather_com.xml --- old/cwp-1.11.0/data/uk_weather_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/uk_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" 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.11.0/data/wetter_com.xml new/cwp-1.11.1/data/wetter_com.xml --- old/cwp-1.11.0/data/wetter_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/wetter_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -2,7 +2,7 @@ <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> <urlc urlc_prefix="http://www.wetter.com/wetter_aktuell/aktuelles_wetter/deutschland/"; urlc_suffix=".html" urlc_follow="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/www_accuweather_com_us_celsius.xml new/cwp-1.11.1/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.11.0/data/www_accuweather_com_us_celsius.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/www_accuweather_com_us_celsius.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" 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="2014-09-06" 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.11.0/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.11.1/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.11.0/data/www_accuweather_com_us_fahrenheit.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/www_accuweather_com_us_fahrenheit.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" 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="2014-09-06" 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.11.0/data/www_accuweather_com_world_celsius.xml new/cwp-1.11.1/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.11.0/data/www_accuweather_com_world_celsius.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/www_accuweather_com_world_celsius.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" 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="2014-09-06" 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" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.11.1/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.11.0/data/www_accuweather_com_world_fahrenheit.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/www_accuweather_com_world_fahrenheit.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" 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="2014-09-06" 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" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/www_gismeteo_com.xml new/cwp-1.11.1/data/www_gismeteo_com.xml --- old/cwp-1.11.0/data/www_gismeteo_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/www_gismeteo_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" 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.11.0/data/www_weather_com.cn.xml new/cwp-1.11.1/data/www_weather_com.cn.xml --- old/cwp-1.11.0/data/www_weather_com.cn.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/www_weather_com.cn.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2014-09-06" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -9,7 +9,7 @@ <url1 url1_prefix="http://www.weather.com.cn/html/weather/"; url1_suffix=".shtml" url1_follow="" /> - <url2 url2_prefix="" url2_suffix="" url2_follow="" /> + <url2 url2_prefix="http://www.weather.com.cn/weather1d/"; url2_suffix=".shtml" url2_follow="" /> <url3 url3_prefix="" url3_suffix="" url3_follow="" /> @@ -26,9 +26,9 @@ country="echo -n" /> - <data_sun url="url1" - sunrise="grep -A 4 "今日日出日落时间" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*>\([0-9]*:[0-9]*\)<.*>\([0-9]*:[0-9]*\)<.*/\1/"" - sunset="grep -A 4 "今日日出日落时间" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*>\([0-9]*:[0-9]*\)<.*>\([0-9]*:[0-9]*\)<.*/\2/"" + <data_sun url="url2" + sunrise="grep sunUp | sed -e "s/.* \([0-9]*:[0-9][0-9]\).*/\1/"" + sunset="grep sunDown | sed -e "s/.* \([0-9]*:[0-9][0-9]\).*/\1/"" /> <data_current_temperature url="urlc" @@ -43,10 +43,10 @@ wind_speed="sed -e "s/.*WS\":\"\([^\"]*\).*/\1/"" /> - <data_current_icon url="url1" - icon="grep -A 34 weather6h | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/\1/"" - icon_code="grep -A 34 weather6h | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([^\/]*\).gif/\1/"" - icon_text="grep -A 34 weather6h | grep -A6 icon_weather | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/<[^>]*>//g"" + <data_current_icon url="url2" + icon="grep -A 5 todayT | grep class=\"jpg80 | sed -e "s/.*jpg80 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -A 5 todayT | grep class=\"jpg80 | sed -e "s/.*jpg80 \([^\">]*\).*/\1/"" + icon_text="grep -A 5 todayT | grep wea | sed -e "s/<[^>]*>//g"" /> <data_current_additional url="urlc" @@ -55,70 +55,70 @@ dew_point="echo -n" visibility="echo -n" pressure="echo -n" - uv_index="grep 紫外线 | head -n 1 | sed -e "s/.*紫外线：\([^<]*\).*/\1/"" + uv_index="echo -n" /> <data_day1 url="url1" - name="grep -A 3 day\ 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A26 yuBaoTable | head -n 26 | grep -A 1 ℃ | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - temperature_high="grep -A26 yuBaoTable | head -n 26 | grep -A 1 ℃ | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]\([-]*[0-9]*\)℃.*/\1/"" - icon="grep -A26 yuBaoTable | head -n 26 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"\([^\"]*\).*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A26 yuBaoTable | head -n 26| 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 -A26 yuBaoTable | head -n 26 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>\([^<]*\).*/\1/"" + name="grep -B 10 \"tem\ tem1 | grep h1 | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" + temperature_low="grep \"tem\ tem2 | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + temperature_high="grep \"tem\ tem1 | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + icon="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 2 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 2 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/\1/"" + icon_text="grep -B 10 \"tem\ tem1 | grep wea | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day2 url="url1" - name="grep -A 3 day\ 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" - 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/"" + name="grep -B 10 \"tem\ tem1 | grep h1 | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" + temperature_low="grep \"tem\ tem2 | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + temperature_high="grep \"tem\ tem1 | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + icon="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 3 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 3 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/\1/"" + icon_text="grep -B 10 \"tem\ tem1 | grep wea | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day3 url="url1" - name="grep -A 3 day\ 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" - 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/"" + name="grep -B 10 \"tem\ tem1 | grep h1 | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" + temperature_low="grep \"tem\ tem2 | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + temperature_high="grep \"tem\ tem1 | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + icon="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 5 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 5 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/\1/"" + icon_text="grep -B 10 \"tem\ tem1 | grep wea | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day4 url="url1" - name="grep -A 3 day\ 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" - 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/"" + name="grep -B 10 \"tem\ tem1 | grep h1 | head -n 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" + temperature_low="grep \"tem\ tem2 | head -n 4 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + temperature_high="grep \"tem\ tem1 | head -n 4 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + icon="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 7 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 7 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/\1/"" + icon_text="grep -B 10 \"tem\ tem1 | grep wea | head -n 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day5 url="url1" - name="grep -A 3 day\ 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" - 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/"" + name="grep -B 10 \"tem\ tem1 | grep h1 | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" + temperature_low="grep \"tem\ tem2 | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + temperature_high="grep \"tem\ tem1 | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + icon="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 9 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 9 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/\1/"" + icon_text="grep -B 10 \"tem\ tem1 | grep wea | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day6 url="url1" - name="grep -A 3 day\ 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" - 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/"" + name="grep -B 10 \"tem\ tem1 | grep h1 | head -n 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" + temperature_low="grep \"tem\ tem2 | head -n 6 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + temperature_high="grep \"tem\ tem1 | head -n 6 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + icon="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 11 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 11 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/\1/"" + icon_text="grep -B 10 \"tem\ tem1 | grep wea | head -n 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day7 url="url1" - name="grep -A 3 day\ 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" - 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/"" + name="grep -B 10 \"tem\ tem1 | grep h1 | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" + temperature_low="grep \"tem\ tem2 | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + temperature_high="grep \"tem\ tem1 | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/\s*\([^°]*\).*/\1/"" + icon="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 13 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/http:\/\/www.weather.com.cn\/m\/i\/icon_weather\/42x30\/\1.gif/"" + icon_code="grep -B 10 \"tem\ tem1 | grep class=\"jpg50 | head -n 13 | tail -n 1 | sed -e "s/.*jpg50 \([^\">]*\).*/\1/"" + icon_text="grep -B 10 \"tem\ tem1 | grep wea | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.0/data/www_weather_com.xml new/cwp-1.11.1/data/www_weather_com.xml --- old/cwp-1.11.0/data/www_weather_com.xml 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/data/www_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-04-24" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2014-09-06" 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.11.0/plasma-applet-cwp.desktop new/cwp-1.11.1/plasma-applet-cwp.desktop --- old/cwp-1.11.0/plasma-applet-cwp.desktop 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/plasma-applet-cwp.desktop 2014-09-06 00:32:36.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.11.0 +X-KDE-PluginInfo-Version=1.11.1 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.11.0/version.h new/cwp-1.11.1/version.h --- old/cwp-1.11.0/version.h 2014-04-24 22:49:23.000000000 +0200 +++ new/cwp-1.11.1/version.h 2014-09-06 00:32:37.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.11.0" +#define VERSION "1.11.1" #define DATE "2009-2014" #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
