Index: /tags/Rel_APV_10_4_0_112_1/tools/update/ustacksystem.ks =================================================================== --- /tags/Rel_APV_10_4_0_112_1/tools/update/ustacksystem.ks (revision 37852) +++ /tags/Rel_APV_10_4_0_112_1/tools/update/ustacksystem.ks (working copy) @@ -12,7 +12,7 @@ repo --name=everything --baseurl=http://192.168.100.11/everything/ #repo --name=arrayepel --baseurl=file:///root/arrayepel72/ repo --name=arrayepel --baseurl=http://192.168.100.11/arrayepel.72/ - +repo --name=arrayepel1 --baseurl=http://192.168.100.11/tzselect/ %packages #below packages are real requirements createrepo-0.9.9-23.el7.noarch @@ -240,7 +240,7 @@ os-prober-1.58-5.el7.x86_64 dejavu-fonts-common-2.33-6.el7.noarch rsync-3.0.9-17.el7.x86_64 -tzdata-2015g-1.el7.noarch +tzdata-2021c-1.el7.noarch libcgroup-0.41-8.el7.x86_64 nss-softokn-freebl-3.16.2.3-13.el7_1.x86_64 bind-9.9.4-29.1.el7.x86_64 Index: /tags/Rel_APV_10_4_0_112_1/tools/ustackbuildenv.ks =================================================================== --- /tags/Rel_APV_10_4_0_112_1/tools/ustackbuildenv.ks (revision 37852) +++ /tags/Rel_APV_10_4_0_112_1/tools/ustackbuildenv.ks (working copy) @@ -7,7 +7,7 @@ repo --name=everything --baseurl=http://192.168.100.11/everything/ #repo --name=arrayepel --baseurl=file:///root/arrayepel72/ repo --name=arrayepel --baseurl=http://192.168.100.11/arrayepel.72/ - +repo --name=arrayepel1 --baseurl=http://192.168.100.11/tzselect/ %packages #below packages are real requirements @@ -381,7 +381,7 @@ libicu-50.1.2-15.el7.x86_64 fontpackages-filesystem-1.44-8.el7.noarch msgpack-0.5.8-1.el7.x86_64 -tzdata-2015g-1.el7.noarch +tzdata-2021c-1.el7.noarch rpm-build-libs-4.11.3-17.el7.x86_64 ncurses-base-5.9-13.20130511.el7.noarch pygpgme-0.3-9.el7.x86_64 Index: /tags/Rel_APV_10_4_0_112_1/usr/click/bin/backend/sys_time.h =================================================================== --- /tags/Rel_APV_10_4_0_112_1/usr/click/bin/backend/sys_time.h (revision 37852) +++ /tags/Rel_APV_10_4_0_112_1/usr/click/bin/backend/sys_time.h (working copy) @@ -3,19 +3,57 @@ #include + +#define NUM_AFG_TZ 1 +#define NUM_YMN_TZ 1 #define NUM_CN_TZ 2 #define NUM_HK_TZ 1 #define NUM_IND_TZ 1 -#define NUM_IN_TZ 1 + +#define NUM_BNG_TZ 1 +#define NUM_JOR_TZ 1 +#define NUM_IRK_TZ 1 +#define NUM_IRN_TZ 1 +#define NUM_IN_TZ 4 #define NUM_JP_TZ 1 #define NUM_KR_TZ 1 -#define NUM_MA_TZ 1 +#define NUM_MA_TZ 2 +#define NUM_MON_TZ 3 +#define NUM_NEP_TZ 1 +#define NUM_PAK_TZ 1 #define NUM_PH_TZ 1 #define NUM_SG_TZ 1 +#define NUM_SAE_TZ 1 +#define NUM_SR_TZ 1 #define NUM_TW_TZ 1 #define NUM_TH_TZ 1 +#define NUM_BR_TZ 1 #define NUM_VN_TZ 1 - +#define NUM_GAB_TZ 1 +#define NUM_UGB_TZ 2 +#define NUM_TRK_TZ 1 +#define NUM_TMR_TZ 1 +#define NUM_TAJ_TZ 1 +#define NUM_TWN_TZ 1 +#define NUM_SRA_TZ 1 +#define NUM_QTR_TZ 1 +#define NUM_PLS_TZ 2 +#define NUM_MUS_TZ 1 +#define NUM_YAN_TZ 1 +#define NUM_KJK_TZ 7 +#define NUM_MAC_TZ 1 +#define NUM_LAO_TZ 1 +#define NUM_KYR_TZ 1 +#define NUM_KUA_TZ 1 +#define NUM_ARM_TZ 1 +#define NUM_AZR_TZ 1 +#define NUM_BHR_TZ 1 +#define NUM_BHU_TZ 1 +#define NUM_BRU_TZ 1 +#define NUM_CMB_TZ 1 +#define NUM_CYP_TZ 2 +#define NUM_GRG_TZ 1 +#define NUM_NKR_TZ 1 #define NUM_AT_TZ 1 #define NUM_DE_TZ 1 #define NUM_DK_TZ 1 @@ -31,23 +69,63 @@ #define NUM_SWI_TZ 1 #define NUM_GB_TZ 3 #define NUM_PT_TZ 1 -#define NUM_UAE_TZ 1 +#define NUM_UAE_TZ 1 #define NUM_CA_TZ 22 #define NUM_US_TZ 21 #define NUM_AU_TZ 10 #define NUM_NZ_TZ 1 - +#define NUM_AP_TZ 1 +#define NUM_FIJ_TZ 1 +#define NUM_HON_TZ 1 +#define NUM_MOS_TZ 1 +#define NUM_UKR_TZ 1 +#define NUM_ISTN_TZ 1 +#define NUM_BUD_TZ 1 +#define NUM_BRS_TZ 1 #define NUM_EG_TZ 1 #define NUM_LR_TZ 1 #define NUM_ZA_TZ 1 - -#define NUM_ASIA_COUNTRIES 11 -#define NUM_EUROPE_COUNTRIES 15 +#define NUM_NMB_TZ 1 +#define NUM_NIG_TZ 1 +#define NUM_KEN_TZ 1 +#define NUM_ALG_TZ 1 +#define NUM_ANG_TZ 1 +#define NUM_BEN_TZ 1 +#define NUM_BUR_TZ 1 +#define NUM_BF_TZ 1 +#define NUM_CAM_TZ 1 +#define NUM_BANG_TZ 1 +#define NUM_BANGU_TZ 1 +#define NUM_CONG_TZ 1 +#define NUM_COT_TZ 1 +#define NUM_DJI_TZ 1 +#define NUM_ZAM_TZ 1 +#define NUM_UGN_TZ 1 +#define NUM_EQG_TZ 1 +#define NUM_ERI_TZ 1 +#define NUM_ETH_TZ 1 +#define NUM_TUS_TZ 1 +#define NUM_TOG_TZ 1 +#define NUM_SSUD_TZ 1 +#define NUM_SUD_TZ 1 +#define NUM_NGR_TZ 1 +#define NUM_MAL_TZ 1 +#define NUM_MLI_TZ 1 +#define NUM_MOZ_TZ 1 +#define NUM_MRU_TZ 1 +#define NUM_GAM_TZ 1 +#define NUM_GAB_TZ 1 +#define NUM_GHN_TZ 1 +#define NUM_GUI_TZ 1 +#define NUM_GUIB_TZ 1 +#define NUM_SEN_TZ 1 +#define NUM_ASIA_COUNTRIES 46 +#define NUM_EUROPE_COUNTRIES 20 #define NUM_NORTH_AMERICA_COUNTRIES 2 -#define NUM_OCEANIA_COUNTRIES 2 +#define NUM_OCEANIA_COUNTRIES 5 -#define NUM_AFRICA_COUNTRIES 3 +#define NUM_AFRICA_COUNTRIES 36 #define NUM_CONTINENTS 5 Index: /tags/Rel_APV_10_4_0_112_1/usr/click/bin/backend/sys_time.c =================================================================== --- /tags/Rel_APV_10_4_0_112_1/usr/click/bin/backend/sys_time.c (revision 37852) +++ /tags/Rel_APV_10_4_0_112_1/usr/click/bin/backend/sys_time.c (working copy) @@ -51,7 +51,23 @@ * Indonesia Time Zone Map */ time_zone_t in_tz_map[NUM_IN_TZ] = -{ { "Asia/Jakarta", "Indonesia Time" } }; +{ { "Asia/Jakarta", "Indonesia - Jakarta Time" }, + { "Asia/Jayapura", "Indonesia - Jayapura Time" }, + { "Asia/Makassar", "Indonesia - Makassar Time" }, + { "Asia/Pontianak", "Indonesia - Pontianak Time" } }; + +/* + * Iran Time Zone Map + */ +time_zone_t trn_tz_map[NUM_IRN_TZ] = +{ { "Asia/Tehran", "Tehran"} +}; +/* + * Saudiarabia Time Zone Map + */ +time_zone_t sae_tz_map[NUM_SAE_TZ] = +{ { "Asia/Riyadh", "Riyadh"} +}; /* * Japan Time Zone Map @@ -62,13 +78,13 @@ /* * Malaysia Time Zone Map */ -time_zone_t Ma_tz_map[NUM_MA_TZ] = -{ { "Asia/Kuala_Lumpur", "Malaysia Time" } }; - +time_zone_t ma_tz_map[NUM_MA_TZ] = +{ { "Asia/Kuala_Lumpur", "Malaysia - Kuala Lumpur Time" }, + { "Asia/Kuching", "Malaysia - Kuching Time" }}; /* * PhilippinesMalaysia Time Zone Map */ -time_zone_t Ph_tz_map[NUM_PH_TZ] = +time_zone_t ph_tz_map[NUM_PH_TZ] = { { "Asia/Manila", "Philippines Time" } }; /* @@ -78,6 +94,12 @@ { { "Asia/Seoul", "South Korea Time" } }; /* + * Srilanka Time Zone Map + */ +time_zone_t sri_tz_map[NUM_SR_TZ] = +{ { "Asia/Colombo", "Colombo"} +}; +/* * Singapore Time Zone Map */ time_zone_t sg_tz_map[NUM_SG_TZ] = @@ -97,6 +119,13 @@ { { "Asia/Bangkok", "Thailand Time" } }; /* + * Beirut Time Zone Map + */ +time_zone_t br_tz_map[NUM_BR_TZ] = +{ { "Asia/Beirut", "Beirut" } }; + + +/* * VietnamTaiwan Time Zone Map */ time_zone_t vn_tz_map[NUM_VN_TZ] = @@ -109,10 +138,10 @@ { { "Europe/Vienna", "Austria Time" } }; /* - * Europe 2: Danmark Time Zone Map + * Europe 2: Denmark Time Zone Map */ time_zone_t dk_tz_map[NUM_DK_TZ] = -{ { "Europe/Copenhagen", "Danmark Time" } }; +{ { "Europe/Copenhagen", "Denmark Time" } }; /* * Germany Time Zone Map @@ -196,12 +225,62 @@ { { "Europe/Lisbon", "Portugal Time" } }; /* + * Europe 16: Russia Time Zone Map + */ +time_zone_t mos_tz_map[NUM_MOS_TZ] = +{ { "Europe/Moscow", "Moscow" } }; + +/* + * Europe 17: Ukraine Time Zone Map + */ +time_zone_t ukr_tz_map[NUM_UKR_TZ] = +{ { "Europe/Kiev", "Kiev" } }; + +/* + * Europe 18: Istanbul Time Zone Map + */ +time_zone_t istn_tz_map[NUM_ISTN_TZ] = +{ { "Europe/Istanbul", "Istanbul" } }; + +/* + * Europe 19: Budapest Time Zone Map + */ +time_zone_t bud_tz_map[NUM_BUD_TZ] = +{ { "Europe/Budapest", "Budapest" } }; + +/* + * Europe 20: Brussels Time Zone Map + */ +time_zone_t brs_tz_map[NUM_BRS_TZ] = +{ { "Europe/Brussels", "Brussels" } }; + +/* * UAE Time Zone Map */ time_zone_t uae_tz_map[NUM_UAE_TZ] = { { "Asia/Dubai", "United Arab Emirates Time" } }; /* + * Afganistan Time Zone Map + */ +time_zone_t afg_tz_map[NUM_AFG_TZ] = +{ { "Asia/Kabul", "Kabul"} +}; + +/* + * Pakistan Time Zone Map + */ +time_zone_t pak_tz_map[NUM_PAK_TZ] = +{ { "Asia/Karachi", "Karachi"} +}; +/* + * Nepal Time Zone Map + */ +time_zone_t nep_tz_map[NUM_NEP_TZ] = +{ { "Asia/Katmandu", "Katmandu"} +}; + +/* * Egypt Time Zone Map */ time_zone_t eg_tz_map[NUM_EG_TZ] = @@ -211,7 +290,7 @@ * Morocco Time Zone Map */ time_zone_t lr_tz_map[NUM_LR_TZ] = -{ { "Africa/Monrovia", "Morocco Time" } }; +{ { "Africa/Casablanca", "Morocco Time" } }; /* * South Africa Time Zone Map @@ -220,6 +299,214 @@ { { "Africa/Johannesburg", "South Africa Time" } }; /* + * Algeria Time Zone Map + */ +time_zone_t alg_tz_map[NUM_ALG_TZ] = +{ { "Africa/Algiers", "Algiers"} +}; + +/* + * Angola Time Zone Map + */ +time_zone_t ang_tz_map[NUM_ANG_TZ] = +{ { "Africa/Luanda", "Luanda"} +}; + +/* + * Benin Time Zone Map + */ +time_zone_t ben_tz_map[NUM_BEN_TZ] = +{ { "Africa/Porto-Novo", "Porto-Novo"} +}; + +/* + * Burkina Faso Time Zone Map + */ +time_zone_t bf_tz_map[NUM_BF_TZ] = +{ { "Africa/Ouagadougou", "Ouagadougou"} +}; +/* + * Burundi Time Zone Map + */ +time_zone_t bur_tz_map[NUM_BUR_TZ] = +{ { "Africa/Bujumbura", "Bujumbura"} +}; + +/* + * Cameroon Time Zone Map + */ +time_zone_t cam_tz_map[NUM_CAM_TZ] = +{ { "Africa/Douala", "Douala"} +}; +/* + * Central African Republic Time Zone Map + */ +time_zone_t bangu_tz_map[NUM_BANGU_TZ] = +{ { "Africa/Bangui", "Bangui"} +}; +/* + * Congo Time Zone Map + */ +time_zone_t cong_tz_map[NUM_CONG_TZ] = +{ { "Africa/Lubumbashi", "Lubumbashi"} +}; +/* + * Ivory Coast Time Zone Map + */ +time_zone_t cot_tz_map[NUM_COT_TZ] = +{ { "Africa/Abidjan", "Abidjan"} +}; + +/* + * Djibouti Time Zone Map + */ +time_zone_t dji_tz_map[NUM_DJI_TZ] = +{ { "Africa/Djibouti", "Djibouti"} +}; + +/* + * Equatorial Guinea Time Zone Map + */ +time_zone_t eqg_tz_map[NUM_EQG_TZ] = +{ { "Africa/Malabo", "Malabo"} +}; + +/* + * Eritrea Time Zone Map + */ +time_zone_t eri_tz_map[NUM_ERI_TZ] = +{ { "Africa/Asmara", "Asmara"} +}; + +/* + * Ethiopia Time Zone Map + */ +time_zone_t eth_tz_map[NUM_ETH_TZ] = +{ { "Africa/Addis_Ababa", "Addis_Ababa"} +}; + +/* + * Uganda Time Zone Map + */ +time_zone_t ugn_tz_map[NUM_UGN_TZ] = +{ { "Africa/Kampala", "Kampala"} +}; + +/* + * Zambia Time Zone Map + */ +time_zone_t zam_tz_map[NUM_ZAM_TZ] = +{ { "Africa/Lusaka", "Lusaka"} +}; + +/* + * Togo Time Zone Map + */ +time_zone_t tog_tz_map[NUM_TOG_TZ] = +{ { "Africa/Lome", "Lome"} +}; + +/* + * Tunisia Time Zone Map + */ +time_zone_t tus_tz_map[NUM_TUS_TZ] = +{ { "Africa/Tunis", "Tunis"} +}; + +/* + * Sudan Time Zone Map + */ +time_zone_t sud_tz_map[NUM_SUD_TZ] = +{ { "Africa/Khartoum", "Khartoum"} +}; + +/* + * South Sudan Time Zone Map + */ +time_zone_t ssud_tz_map[NUM_SSUD_TZ] = +{ { "Africa/Juba", "Juba"} +}; +/* + * Niger Time Zone Map + */ +time_zone_t ngr_tz_map[NUM_NGR_TZ] = +{ { "Africa/Niamey", "Niamey"} +}; + +/* + * Malwai Time Zone Map + */ +time_zone_t mal_tz_map[NUM_MAL_TZ] = +{ { "Africa/Blantyre", "Blantyre"} +}; + + + +/* + * Mali Time Zone Map + */ +time_zone_t mli_tz_map[NUM_MLI_TZ] = +{ { "Africa/Bamako", "Bamako"} +}; + +/* + * Mozambique Time Zone Map + */ +time_zone_t moz_tz_map[NUM_MOZ_TZ] = +{ { "Africa/Maputo", "Maputo"} +}; + +/* + * Mauritania Time Zone Map + */ +time_zone_t mru_tz_map[NUM_MRU_TZ] = +{ { "Africa/Nouakchott", "Nouakchott"} +}; + + +/* + * Guinea-Bissau Time Zone Map + */ +time_zone_t guib_tz_map[NUM_GUIB_TZ] = +{ { "Africa/Bissau", "Bissau"} +}; + +/* + * Guinea Time Zone Map + */ +time_zone_t gui_tz_map[NUM_GUI_TZ] = +{ { "Africa/Conakry", "Conakry"} +}; + +/* + * Ghana Time Zone Map + */ +time_zone_t ghn_tz_map[NUM_GHN_TZ] = +{ { "Africa/Accra", "Accra"} +}; + +/* + * Senegal Time Zone Map + */ +time_zone_t sen_tz_map[NUM_SEN_TZ] = +{ { "Africa/Dakar", "Dakar"} +}; + + +/* + * Gambia Time Zone Map + */ +time_zone_t gam_tz_map[NUM_GAM_TZ] = +{ { "Africa/Banjul", "Banjul"} +}; + +/* + * Gabon Time Zone Map + */ +time_zone_t gab_tz_map[NUM_GAB_TZ] = +{ { "Africa/Libreville", "Libreville"} +}; +/* * Canada Time Zone Map */ time_zone_t ca_tz_map[NUM_CA_TZ] = @@ -281,20 +568,271 @@ { { "Asia/Kolkata", "Kolkata" } }; +/* + * Bangladesh Time Zone Map + */ +time_zone_t bang_tz_map[NUM_BNG_TZ] = +{ { "Asia/Dhaka", "Dhaka"} +}; + +/* + * Jordan Time Zone Map + */ +time_zone_t jor_tz_map[NUM_JOR_TZ] = +{ { "Asia/Amman", "Amman"} +}; + +/* + * Iraq Time Zone Map + */ +time_zone_t irk_tz_map[NUM_IRK_TZ] = +{ { "Asia/Baghdad", "Baghdad"} +}; + +/* + * Korea Republic Time Zone Map + */ +time_zone_t nkr_tz_map[NUM_NKR_TZ] = +{ { "Asia/Pyongyang", "Pyongyang"} +}; +/* + * Georgia Time Zone Map + */ +time_zone_t grg_tz_map[NUM_GRG_TZ] = +{ { "Asia/Tbilisi", "Tbilisi"} +}; + +/* + * Cyprus Time Zone Map + */ +time_zone_t cyp_tz_map[NUM_CYP_TZ] = +{ { "Asia/Famagusta", "Famagusta"}, + { "Asia/Nicosia", "Nicosia"} +}; + +/* + * Cambodia Time Zone Map + */ +time_zone_t cmb_tz_map[NUM_CMB_TZ] = +{ { "Asia/Phnom_Penh", "Phnom_Penh"} +}; + +/* + * Brunei Time Zone Map + */ +time_zone_t bru_tz_map[NUM_BRU_TZ] = +{ { "Asia/Brunei", "Brunei"} +}; + +/* + * Bhutan Time Zone Map + */ +time_zone_t bhu_tz_map[NUM_BHU_TZ] = +{ { "Asia/Thimpu", "Thimpu"} +}; + + +/* + * Bahrain Time Zone Map + */ +time_zone_t bhr_tz_map[NUM_BHR_TZ] = +{ { "Asia/Bahrain", "Bahrain"} +}; + +/* + * Azerbaijan Time Zone Map + */ +time_zone_t azr_tz_map[NUM_AZR_TZ] = +{ { "Asia/Baku", "Baku"} +}; + +/* + * Armenia Time Zone Map + */ +time_zone_t arm_tz_map[NUM_ARM_TZ] = +{ { "Asia/Yerevan", "Yerevan"} +}; + +/* + * Kuwait Time Zone Map + */ +time_zone_t kua_tz_map[NUM_KUA_TZ] = +{ { "Asia/Kuwait", "Kuwait"} +}; + +/* + * Kyrgyzstan Time Zone Map + */ +time_zone_t kyr_tz_map[NUM_KYR_TZ] = +{ { "Asia/Bishkek", "Bishkek"} +}; + +/* + * Lao Time Zone Map + */ +time_zone_t lao_tz_map[NUM_LAO_TZ] = +{ { "Asia/Vienti", "Vienti"} +}; + +/* + * Macao Time Zone Map + */ +time_zone_t mac_tz_map[NUM_MAC_TZ] = +{ { "Asia/Macau", "Macau"} +}; + +/* + * Oman Time Zone Map + */ +time_zone_t mus_tz_map[NUM_MUS_TZ] = +{ { "Asia/Muscat", "Muscat"} +}; + +/* + * Qatar Time Zone Map + */ +time_zone_t qtr_tz_map[NUM_QTR_TZ] = +{ { "Asia/Qatar", "Qatar"} +}; + +/* + * Syria Time Zone Map + */ +time_zone_t sra_tz_map[NUM_SRA_TZ] = +{ { "Asia/Damascus", "Damascus"} +}; + +/* + * Taiwan Time Zone Map + */ +time_zone_t twn_tz_map[NUM_TWN_TZ] = +{ { "Asia/Taipei", "Taipei"} +}; + + +/* + * Tajikistan Time Zone Map + */ +time_zone_t taj_tz_map[NUM_TAJ_TZ] = +{ { "Asia/Dushanbe", "Dushanbe"} +}; + +/* + * Timor-Leste Time Zone Map + */ +time_zone_t tmr_tz_map[NUM_TMR_TZ] = +{ { "Asia/Dili", "Dili"} +}; + +/* + * Yemen Time Zone Map + */ +time_zone_t ymn_tz_map[NUM_YMN_TZ] = +{ { "Asia/Aden", "Aden"} +}; + +/* + * Uzbekistan Time Zone Map + */ +time_zone_t ugb_tz_map[NUM_UGB_TZ] = +{ { "Asia/Tashkent", "Tashkent Time"}, + { "Asia/Samarkand", "Samarkand"} +}; + +/* + * Turkmenistan Time Zone Map + */ +time_zone_t trk_tz_map[NUM_TRK_TZ] = +{ { "Asia/Ashgabat", "Ashgabat"} +}; + +/* + * Myanmar Time Zone Map + */ +time_zone_t yan_tz_map[NUM_YAN_TZ] = +{ { "Asia/Yangon", "Yangon"} +}; + +/* + * Palestine Time Zone Map + */ +time_zone_t pls_tz_map[NUM_PLS_TZ] = +{ { "Asia/Gaza", "Gaza Time"}, + { "Asia/Hebron", "Hebron Time"} +}; + +/* + * Mongolia Time Zone Map + */ +time_zone_t mon_tz_map[NUM_MON_TZ] = +{ { "Asia/Choibalsan", "Choibalsan Time"}, + { "Asia/Hovd", "Hovd Time"}, + { "Asia/Ulaanbaatar", "Ulaanbaatar Time"} +}; + + +/* + * Kazakhstan Time Zone Map + */ +time_zone_t kjk_tz_map[NUM_KJK_TZ] = +{ { "Asia/Almaty", "Almaty Time"}, + { "Asia/Aqtau", "Aqtau Time"}, + { "Asia/Aqtobe", "Aqtobe Time"}, + { "Asia/Atyrau", "Atyrau Time"}, + { "Asia/Oral", "Oral Time"}, + { "Asia/Qostanay", "Qostanay Time"}, + { "Asia/Qyzylorda", "Qyzylorda Time"} +}; + /*Bug 9886, qiuzj,20050606*/ /*revise the system timezone error*/ country_t asia_countries[NUM_ASIA_COUNTRIES] = -{ { cn_tz_map, "China", NUM_CN_TZ }, +{ { afg_tz_map, "Afganistan", NUM_AFG_TZ}, + { arm_tz_map, "Armenia", NUM_ARM_TZ}, + { azr_tz_map, "Azerbaijan", NUM_AZR_TZ}, + { br_tz_map, "Beirut", NUM_BR_TZ}, + { bang_tz_map, "Bangladesh", NUM_BNG_TZ }, + { bhr_tz_map, "Bahrain", NUM_BHR_TZ }, + { bhu_tz_map, "Bhutan", NUM_BHU_TZ }, + { bru_tz_map, "Brunei", NUM_BRU_TZ }, + { cn_tz_map, "China", NUM_CN_TZ }, + { cmb_tz_map, "Cambodia", NUM_CMB_TZ }, + { cyp_tz_map, "Cyprus", NUM_CYP_TZ }, + { grg_tz_map, "Georgia", NUM_GRG_TZ }, { ind_tz_map, "India", NUM_IND_TZ }, { in_tz_map, "Indonesia", NUM_IN_TZ }, + { irk_tz_map, "Iraq", NUM_IRK_TZ}, + { trn_tz_map, "Iran", NUM_IRN_TZ}, { jp_tz_map, "Japan", NUM_JP_TZ }, - { Ma_tz_map, "Malaysia", NUM_MA_TZ }, - { Ph_tz_map, "Philippines", NUM_PH_TZ }, + { jor_tz_map, "Jordan", NUM_JOR_TZ}, + { kjk_tz_map, "Kazakhstan", NUM_KJK_TZ}, + { kyr_tz_map, "Kyrgyzstan", NUM_KYR_TZ}, + { kua_tz_map, "Kuwait", NUM_KUA_TZ}, + { mac_tz_map, "Macao", NUM_MAC_TZ }, + { ma_tz_map, "Malaysia", NUM_MA_TZ }, + { yan_tz_map, "Myanmar", NUM_YAN_TZ }, + { mon_tz_map, "Mongolia", NUM_MON_TZ }, + { nep_tz_map, "Nepal", NUM_NEP_TZ}, + { nkr_tz_map, "North Korea Republic", NUM_NKR_TZ}, + { pak_tz_map, "Pakistan", NUM_PAK_TZ}, + { ph_tz_map, "Philippines", NUM_PH_TZ }, + { pls_tz_map, "Palestine", NUM_PLS_TZ }, + { mus_tz_map, "Oman", NUM_MUS_TZ }, + { sae_tz_map, "Saudiarabia", NUM_SAE_TZ}, { kr_tz_map, "South Korea", NUM_KR_TZ }, { sg_tz_map, "Singapore", NUM_SG_TZ }, + { sra_tz_map, "Syria", NUM_SRA_TZ }, + { sri_tz_map, "Srilanka", NUM_SR_TZ}, + { taj_tz_map, "Tajikistan", NUM_TAJ_TZ }, { th_tz_map, "Thailand", NUM_TH_TZ }, + { twn_tz_map, "Taiwan", NUM_TWN_TZ }, + { trk_tz_map, "Turkmenistan", NUM_TRK_TZ }, + { tmr_tz_map, "Timor-Leste", NUM_TMR_TZ }, { vn_tz_map, "Vietnam", NUM_VN_TZ }, - { uae_tz_map, "United Arab Emirates", NUM_UAE_TZ } + { uae_tz_map, "United Arab Emirates", NUM_UAE_TZ }, + { ugb_tz_map, "Uzbekistan", NUM_UGB_TZ }, + { ymn_tz_map, "Yemen", NUM_YMN_TZ}, + { qtr_tz_map, "Qatar", NUM_QTR_TZ} }; /*Bug 9886,end*/ /*Bug 15310, LiBo,20070123*/ @@ -317,6 +855,22 @@ { { "Pacific/Auckland", "New Zealand" } }; + +time_zone_t ap_tz_map[NUM_AP_TZ] = +{ + { "Pacific/Apia", "Apia" } +}; + +time_zone_t fj_tz_map[NUM_FIJ_TZ] = +{ + { "Pacific/Fiji", "Fiji" } +}; + +time_zone_t hon_tz_map[NUM_HON_TZ] = +{ + { "Pacific/Honolulu", "Honolulu" } +}; + /*Bug 15310,end*/ #if 0 country_t asia_countries[NUM_ASIA_COUNTRIES] = @@ -329,22 +883,46 @@ }; #endif +/* + * Nigeria Time Zone Map + */ +time_zone_t nig_tz_map[NUM_NIG_TZ] = +{ { "Africa/Lagos", "Lagos"} +}; +/* + * kenya Time Zone Map + */ +time_zone_t ken_tz_map[NUM_KEN_TZ] = +{ { "Africa/Nairobi", "Nairobi"} +}; +/* + * Namibia Time Zone Map + */ +time_zone_t nmb_tz_map[NUM_NMB_TZ] = +{ { "Africa/Windhoek", "Windhoek"} +}; + country_t europe_countries[NUM_EUROPE_COUNTRIES] = { { at_tz_map, "Austria", NUM_AT_TZ }, - { dk_tz_map, "Danmark", NUM_DK_TZ }, + { brs_tz_map, "Belgium", NUM_BRS_TZ }, + { dk_tz_map, "Denmark", NUM_DK_TZ }, { fr_tz_map, "France", NUM_FR_TZ }, { fi_tz_map, "Finland", NUM_FI_TZ }, { de_tz_map, "Germany", NUM_DE_TZ }, { gr_tz_map, "Greece", NUM_GR_TZ }, + { bud_tz_map, "Hungary", NUM_BUD_TZ }, { il_tz_map, "Israel", NUM_IL_TZ }, { it_tz_map, "Italy", NUM_IT_TZ }, + { ukr_tz_map, "Ukraine", NUM_UKR_TZ }, + { mos_tz_map, "Russia", NUM_MOS_TZ }, { nl_tz_map, "Netherland", NUM_NL_TZ }, { no_tz_map, "Norway", NUM_NO_TZ }, { sp_tz_map, "Spain", NUM_SP_TZ }, { swe_tz_map, "Sweden", NUM_SWE_TZ }, { swi_tz_map, "Switzerland", NUM_SWI_TZ }, { gb_tz_map, "United Kingdom", NUM_GB_TZ }, - { pt_tz_map, "Portugal", NUM_PT_TZ } + { pt_tz_map, "Portugal", NUM_PT_TZ }, + { istn_tz_map, "Turkey", NUM_ISTN_TZ } }; country_t north_america_countries[NUM_NORTH_AMERICA_COUNTRIES] = @@ -355,14 +933,50 @@ /*add australia and new zealand*/ country_t oceania_countries[NUM_OCEANIA_COUNTRIES] = { { au_tz_map, "Australia", NUM_AU_TZ }, - { nz_tz_map, "New Zealand", NUM_NZ_TZ } + { nz_tz_map, "New Zealand", NUM_NZ_TZ }, + { ap_tz_map, "Samoa", NUM_AP_TZ }, + { fj_tz_map, "Fiji", NUM_FIJ_TZ }, + { hon_tz_map, "Honolulu", NUM_HON_TZ } }; /*Bug 15310,end*/ country_t africa_countries[NUM_AFRICA_COUNTRIES] = -{ { eg_tz_map, "Egypt", NUM_EG_TZ }, - { lr_tz_map, "Morocco", NUM_LR_TZ }, - { za_tz_map, "South Africa", NUM_ZA_TZ } -}; +{ { alg_tz_map, "Algeria", NUM_ALG_TZ}, + { ang_tz_map, "Angola", NUM_ANG_TZ}, + { ben_tz_map, "Benin", NUM_BEN_TZ}, + { bf_tz_map, "Burkina Faso", NUM_BF_TZ}, + { bur_tz_map, "Burundi", NUM_BUR_TZ}, + { bangu_tz_map, "Bangui", NUM_BANGU_TZ}, + { cam_tz_map, "Cameroon", NUM_CAM_TZ}, + { cong_tz_map, "Congo", NUM_CONG_TZ}, + { dji_tz_map, "Djibouti", NUM_DJI_TZ}, + { eqg_tz_map, "Equatorial Guinea", NUM_EQG_TZ }, + { eri_tz_map, "Eritrea", NUM_ERI_TZ }, + { eth_tz_map, "Ethiopia", NUM_ETH_TZ }, + { eg_tz_map, "Egypt", NUM_EG_TZ }, + { lr_tz_map, "Morocco", NUM_LR_TZ }, + { gab_tz_map, "Gabon", NUM_GAB_TZ }, + { gam_tz_map, "Gambia", NUM_GAM_TZ }, + { ghn_tz_map, "Ghana", NUM_GHN_TZ }, + { gui_tz_map, "Guinea", NUM_GUI_TZ }, + { guib_tz_map, "Guinea-Bissau", NUM_GUIB_TZ }, + { cot_tz_map, "Ivory Coast", NUM_COT_TZ}, + { nmb_tz_map, "Namibia", NUM_NMB_TZ}, + { nig_tz_map, "Nigeria", NUM_NIG_TZ}, + { ngr_tz_map, "Niger", NUM_NGR_TZ}, + { mli_tz_map, "Mali", NUM_MLI_TZ}, + { moz_tz_map, "Mozambique", NUM_MOZ_TZ}, + { mru_tz_map, "Mauritania", NUM_MRU_TZ}, + { mal_tz_map, "Blantyre", NUM_MAL_TZ}, + { ken_tz_map, "Kenya", NUM_KEN_TZ}, + { sen_tz_map, "Senegal", NUM_SEN_TZ }, + { za_tz_map, "South Africa", NUM_ZA_TZ }, + { sud_tz_map, "Sudan", NUM_SUD_TZ }, + { ssud_tz_map, "South Sudan", NUM_SSUD_TZ }, + { tog_tz_map, "Togo", NUM_TOG_TZ }, + { tus_tz_map, "Tunis", NUM_TUS_TZ }, + { ugn_tz_map, "Uganda", NUM_UGN_TZ }, + { zam_tz_map, "Zambia", NUM_ZAM_TZ } + }; continent_t continents[NUM_CONTINENTS] = { { asia_countries, "Asia", NUM_ASIA_COUNTRIES }, { europe_countries, "Europe", NUM_EUROPE_COUNTRIES }, Index: /tags/Rel_APV_10_4_0_112_1/usr/click/webui/htdocs/new/src/hive/tzmap.py =================================================================== --- /tags/Rel_APV_10_4_0_112_1/usr/click/webui/htdocs/new/src/hive/tzmap.py (revision 37852) +++ /tags/Rel_APV_10_4_0_112_1/usr/click/webui/htdocs/new/src/hive/tzmap.py (working copy) @@ -3,47 +3,171 @@ tzmap_orig = SortedDict([ ('Asia', SortedDict([ + ('Afganistan', SortedDict([ + ('Kabul', None) + ])), + ('Armenia', SortedDict([ + ('Yerevan', None) + ])), + ('Azerbaijan', SortedDict([ + ('Baku', None) + ])), + ('Beirut', SortedDict([ + ('Beirut', None) + ])), + ('Bangladesh', SortedDict([ + ('Dhaka', None) + ])), + ('Bahrain', SortedDict([ + ('Bahrain', None) + ])), + ('Bhutan', SortedDict([ + ('Thimpu', None) + ])), + ('Brunei', SortedDict([ + ('Brunei', None) + ])), ('China', SortedDict([ ('Most of China(GMT+08:00)', None), ('Taiwan Time', None), ])), + ('Cambodia', SortedDict([ + ('Phnom_Penh', None) + ])), + ('Cyprus', SortedDict([ + ('Famagusta', None), + ('Nicosia', None) + ])), + ('Georgia', SortedDict([ + ('Tbilisi', None) + ])), ('India', SortedDict([ ('Kolkata', None), ])), ('Indonesia', SortedDict([ - ('Indonesia Time', None), + ('Indonesia - Jakarta Time', None), + ('Indonesia - Jayapura Time', None), + ('Indonesia - Makassar Time', None), + ('Indonesia - Pontianak Time', None), + ])), + + ('Iraq', SortedDict([ + ('Baghdad', None) + ])), + ('Iran', SortedDict([ + ('Tehran', None) ])), ('Japan', SortedDict([ ('Japan Time', None), ])), + ('Jordan', SortedDict([ + ('Amman', None) + ])), + ('Kazakhstan', SortedDict([ + ('Almaty Time', None), + ('Aqtau Time', None), + ('Aqtobe Time', None), + ('Atyrau Time', None), + ('Oral Time', None), + ('Qostanay Time', None), + ('Qyzylorda Time', None) + ])), + ('Kyrgyzstan', SortedDict([ + ('Bishkek', None) + ])), + ('Kuwait', SortedDict([ + ('Kuwait', None) + ])), + ('Macao', SortedDict([ + ('Macau', None) + ])), ('Malaysia', SortedDict([ - ('Malaysia Time', None), + ('Malaysia - Kuala Lumpur Time', None), + ('Malaysia - Kuching Time', None), + ])), + ('Myanmar', SortedDict([ + ('Yangon', None) + ])), + ('Mongolia', SortedDict([ + ('Choibalsan Time', None), + ('Hovd Time', None), + ('Ulaanbaatar Time', None) + ])), + ('Nepal', SortedDict([ + ('Katmandu', None) + ])), + ('North Korea Republic', SortedDict([ + ('Pyongyang', None) + ])), + ('Pakistan', SortedDict([ + ('Karachi', None) ])), ('Philippines', SortedDict([ ('Philippines Time', None), ])), + ('Palestine', SortedDict([ + ('Gaza Time', None), + ('Hebron Time', None) + ])), + ('Oman', SortedDict([ + ('Muscat', None) + ])), + ('Saudiarabia', SortedDict([ + ('Riyadh', None) + ])), ('South Korea', SortedDict([ ('South Korea Time', None), ])), ('Singapore', SortedDict([ ('Singapore Time', None), ])), + ('Syria', SortedDict([ + ('Damascus', None) + ])), + ('Srilanka', SortedDict([ + ('Colombo', None) + ])), + ('Tajikistan', SortedDict([ + ('Dushanbe', None) + ])), ('Thailand', SortedDict([ ('Thailand Time', None), ])), + ('Taiwan', SortedDict([ + ('Taipei', None) + ])), + ('Turkmenistan', SortedDict([ + ('Ashgabat', None) + ])), + ('Timor-Leste', SortedDict([ + ('Dili', None) + ])), ('Vietnam', SortedDict([ ('Vietnam Time', None), ])), ('United Arab Emirates', SortedDict([ ('United Arab Emirates Time', None), ])), + ('Uzbekistan', SortedDict([ + ('Tashkent Time', None), + ('Samarkand', None) + ])), + ('Yemen', SortedDict([ + ('Aden', None) + ])), + ('Qatar', SortedDict([ + ('Qatar', None) + ])), ])), ('Europe', SortedDict([ ('Austria', SortedDict([ ('Austria Time', None), ])), - ('Danmark', SortedDict([ - ('Danmark Time', None), + ('Belgium', SortedDict([ + ('Brussels', None) + ])), + ('Denmarkg', SortedDict([ + ('Denmarkg Time', None), ])), ('France', SortedDict([ ('France Time', None), @@ -57,12 +181,21 @@ ('Greece', SortedDict([ ('Greece Time', None), ])), + ('Hungary', SortedDict([ + ('Budapest', None) + ])), ('Israel', SortedDict([ ('Israel Time', None), ])), ('Italy', SortedDict([ ('Italy Time', None), ])), + ('Ukraine', SortedDict([ + ('Kiev', None) + ])), + ('Russia', SortedDict([ + ('Moscow', None) + ])), ('Netherland', SortedDict([ ('Netherland Time', None), ])), @@ -86,6 +219,9 @@ ('Portugal', SortedDict([ ('Portugal Time', None), ])), + ('Turkey', SortedDict([ + ('Istanbul', None) + ])), ])), ('North America', SortedDict([ ('Canada', SortedDict([ @@ -152,16 +288,125 @@ ('New Zealand', SortedDict([ ('New Zealand', None), ])), + ('Samoa', SortedDict([ + ('Apia', None) + ])), + ('Fiji', SortedDict([ + ('Fiji', None) + ])), + ('Honolulu', SortedDict([ + ('Honolulu', None) + ])), ])), ('Africa', SortedDict([ + ('Algeria', SortedDict([ + ('Algiers', None) + ])), + ('Angola', SortedDict([ + ('Luanda', None) + ])), + ('Benin', SortedDict([ + ('Porto-Novo', None) + ])), + ('Burkina Faso', SortedDict([ + ('Ouagadougou', None) + ])), + ('Burundi', SortedDict([ + ('Bujumbura', None) + ])), + ('Bangui', SortedDict([ + ('Bangui', None) + ])), + ('Cameroon', SortedDict([ + ('Douala', None) + ])), + ('Congo', SortedDict([ + ('Lubumbashi', None) + ])), + ('Djibouti', SortedDict([ + ('Djibouti', None) + ])), + ('Equatorial Guinea', SortedDict([ + ('Malabo', None) + ])), + ('Eritrea', SortedDict([ + ('Asmara', None) + ])), + ('Ethiopia', SortedDict([ + ('Addis_Ababa', None) + ])), ('Egypt', SortedDict([ - ('Egypt Time', None), + ('Egypt Time', None) ])), ('Morocco', SortedDict([ - ('Morocco Time', None), + ('Morocco Time', None) + ])), + ('Gabon', SortedDict([ + ('Libreville', None) + ])), + ('Gambia', SortedDict([ + ('Banjul', None) + ])), + ('Ghana', SortedDict([ + ('Accra', None) + ])), + ('Guinea', SortedDict([ + ('Conakry', None) + ])), + ('Guinea-Bissau', SortedDict([ + ('Bissau', None) + ])), + ('Ivory Coast', SortedDict([ + ('Abidjan', None) + ])), + ('Namibia', SortedDict([ + ('Windhoek', None) + ])), + ('Nigeria', SortedDict([ + ('Lagos', None) + ])), + ('Niger', SortedDict([ + ('Niamey', None) + ])), + ('Mali', SortedDict([ + ('Bamako', None) + ])), + ('Mozambique', SortedDict([ + ('Maputo', None) + ])), + ('Mauritania', SortedDict([ + ('Nouakchott', None) + ])), + ('Blantyre', SortedDict([ + ('Blantyre', None) + ])), + ('Kenya', SortedDict([ + ('Nairobi', None) + ])), + ('Senegal', SortedDict([ + ('Dakar', None) ])), ('South Africa', SortedDict([ - ('South Africa Time', None), + ('South Africa Time', None) + ])), + ('Sudan', SortedDict([ + ('Khartoum', None) + ])), + ('South Sudan', SortedDict([ + ('Juba', None) + ])), + ('Togo', SortedDict([ + ('Lome', None) ])), + ('Tunis', SortedDict([ + ('Tunis', None) + ])), + ('Uganda', SortedDict([ + ('Kampala', None) + ])), + ('Zambia', SortedDict([ + ('Lusaka', None) + ])), + ])), ])