Update ICU to 54.1 step 1

source/tools/tzcode/tz2icu.cpp

 
 /*
 **********************************************************************
-* Copyright (c) 2003-2010, International Business Machines
+* Copyright (c) 2003-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
 * Created: July 10 2003
 * Since: ICU 2.8
 **********************************************************************
 */
 #include "tzfile.h" // from Olson tzcode archive, copied to this dir
 
 #ifdef WIN32
@@ skipping 282 matching lines @@
     // means the user is passing in a "normal" zoneinfo directory, or
     // a zoneinfo directory that is polluted with other files, or that
     // the user passed in the wrong directory.
     char buf[32];
     file.read(buf, 4);
     if (strncmp(buf, TZ_ICU_MAGIC, 4) != 0) {
         throw invalid_argument("TZ_ICU_MAGIC signature missing");
     }
     // skip additional Olson byte version
     file.read(buf, 1);
-    // if '\0', we have just one copy of data, if '2', there is additional
+    // if '\0', we have just one copy of data, if '2' or '3', there is additional
     // 64 bit version at the end.
-    if(buf[0]!=0 && buf[0]!='2') {
+    if(buf[0]!=0 && buf[0]!='2' && buf[0]!='3') {
       throw invalid_argument("Bad Olson version info");
     }
 
     // Read reserved bytes.  The first of these will be a version byte.
     file.read(buf, 15);
     if (*(ICUZoneinfoVersion*)&buf != TZ_ICU_VERSION) {
         throw invalid_argument("File version mismatch");
     }
 
     // Read array sizes
@@ skipping 502 matching lines @@
         ostringstream os;
         if (month < 0 || month >= 12) {
             os << "Invalid input month " << month;
         }
         if (dom < 1 || dom > MONTH_LEN[month]) {
             os << "Invalid input day of month " << dom;
         }
         if (mode != DOM && (dow < 0 || dow >= 7)) {
             os << "Invalid input day of week " << dow;
         }
-        if (offset < 0 || offset > HOUR) {
+        if (offset < 0 || offset > (2 * HOUR)) {
             os << "Invalid input offset " << offset;
         }
         if (isgmt && !isstd) {
             os << "Invalid input isgmt && !isstd";
         }
         if (!os.str().empty()) {
             os << " for rule "
                << id
                << _mode
                << month << dom << dow << time
@@ skipping 731 matching lines @@
             ZONEINFO[olson].addAlias(zoneIDs[*j]);
         }
     }
 
     // Once merging of final data is complete, we can optimize the type list
     for (ZoneMap::iterator i=ZONEINFO.begin(); i!=ZONEINFO.end(); ++i) {
         i->second.optimizeTypeList();
     }
 
     // Create the country map
+    map<string, string> icuRegions;        // ICU's custom zone -> country override
     map<string, set<string> > countryMap;  // country -> set of zones
     map<string, string> reverseCountryMap; // zone -> country
+
+    try {
+        // Read icuregions file to collect ICU's own zone-region mapping data.
+        ifstream frg(ICU_REGIONS);
+        if (frg) {
+            string line;
+            while (getline(frg, line)) {
+                if (line[0] == '#') continue;
+
+                string zone, country;
+                istringstream is(line);
+                is >> zone >> country;
+                if (zone.size() == 0) continue;
+                if (country.size() < 2) {
+                    cerr << "Error: Can't parse " << line << " in " << ICU_REGIONS << endl;
+                    return 1;
+                }
+                icuRegions[zone] = country;
+            }
+        } else {
+            cout << "No custom region map [icuregions]" << endl;
+        }
+    } catch (const exception& error) {
+        cerr << "Error: While reading " << ICU_REGIONS << ": " << error.what() << endl;
+        return 1;
+    }
+
     try {
         ifstream f(zonetab.c_str());
         if (!f) {
             cerr << "Error: Unable to open " << zonetab << endl;
             return 1;
         }
         int32_t n = 0;
         string line;
         while (getline(f, line)) {
             string::size_type lb = line.find('#');
             if (lb != string::npos) {
                 line.resize(lb); // trim comments
             }
             string country, coord, zone;
             istringstream is(line);
             is >> country >> coord >> zone;
             if (country.size() == 0) continue;
             if (country.size() != 2 || zone.size() < 1) {
                 cerr << "Error: Can't parse " << line << " in " << zonetab << endl;
                 return 1;
             }
             if (ZONEINFO.find(zone) == ZONEINFO.end()) {
                 cerr << "Error: Country maps to invalid zone " << zone
                      << " in " << zonetab << endl;
                 return 1;
             }
+            if (icuRegions.find(zone) != icuRegions.end()) {
+                // Custom override
+                string customCountry = icuRegions[zone];
+                cout << "Region Mapping: custom override for " << zone
+                    << " " << country << " -> " << customCountry << endl;
+                country = customCountry;
+            }
             countryMap[country].insert(zone);
             reverseCountryMap[zone] = country;
             //cerr << (n+1) << ": " << country << " <=> " << zone << endl;
             ++n;
         }
         cout << "Finished reading " << n
              << " country entries from " << zonetab << endl;
     } catch (const exception& error) {
         cerr << "Error: While reading " << zonetab << ": " << error.what() << endl;
         return 1;
     }
 
+    // Merge ICU's own zone-region mapping data
+    for (map<string,string>::const_iterator i = icuRegions.begin();
+        i != icuRegions.end(); ++i) {
+        const string& zid(i->first);
+        if (reverseCountryMap.find(zid) != reverseCountryMap.end()) {
+            continue;
+        }
+        cout << "Region Mapping: custom data zone=" << zid
+            << ", region=" << i->second << endl;
+
+        reverseCountryMap[zid] = i->second;
+        countryMap[i->second].insert(zid);
+    }
+
     // Merge ICU aliases into country map.  Don't merge any alias
     // that already has a country map, since that doesn't make sense.
     // E.g.  "Link Europe/Oslo Arctic/Longyearbyen" doesn't mean we
     // should cross-map the countries between these two zones.
     for (map<string,set<string> >::const_iterator i = links.begin();
          i!=links.end(); ++i) {
         const string& olson(i->first);
         if (reverseCountryMap.find(olson) == reverseCountryMap.end()) {
             continue;
         }
@@ skipping 118 matching lines @@
     file.close();
      
     if (file) { // recheck error bit
         cout << "Finished writing " << TZ_RESOURCE_NAME << ".txt" << endl;
     } else {
         cerr << "Error: Unable to open/write to " << TZ_RESOURCE_NAME << ".txt" << endl;
         return 1;
     }
 }
 //eof