using path to metadata binary files as compile time switch

cpp/CMakeLists.txt

@@ -104,6 +104,7 @@ option (ISTREAM_DATA_PROVIDER "Use protoduf binary file as input for metadata" O
 
 if(ISTREAM_DATA_PROVIDER)
   add_definitions ("-DISTREAM_DATA_PROVIDER")
+  add_definitions(-DMETADATA_PATH="${METADATA_PATH}")
 endif()
 
 if (USE_ALTERNATE_FORMATS)

cpp/metadata_short.dat

@@ -196,11 +196,10 @@ p
 �
 [158]\d{2,5}HHHH"L?1(?:00|1[25]|23|4(?:1|7\d)|5[15]|9[02-49])|555|(?:116\d|80)\d\d2100HHH*8[1-69]\d\d28100HJGIÚ

1(?:12|9[09])2112Hę
�
z1(?:00|1(?:[25]|6(?:00[06]|1(?:1[17]|23))|8\d\d)|23|4(?:1|7[014])|5[015]|9[02-49])|555|8[0-79]\d\d|8(?:00|4[0-2]|8[0-589])2100ň

 150|87\d\d2150HHú
H=1(?:00|1(?:5|8\d\d)|23|51|9[2-4])|555|8(?:00|4[0-2]|8[0-589])2100HHŠH˙˙˙˙˙˙˙˙˙

-l
+q
 	1\d\dH"
 1122112*H˙˙˙˙˙˙˙˙˙
JGLÚ

-1122112ę

-1122112ň
H˙˙˙˙˙˙˙˙˙
ú
H˙˙˙˙˙˙˙˙˙
ŠH˙˙˙˙˙˙˙˙˙

+1122112ę
1[1-8]\d2110ň
H˙˙˙˙˙˙˙˙˙
ú
H˙˙˙˙˙˙˙˙˙
ŠH˙˙˙˙˙˙˙˙˙

 –

 1\d\d?HH"1(?:1[6-8]|[6-8])216*H˙˙˙˙˙˙˙˙˙
JGMÚ
1(?:1[6-8]|[6-8])216ę
1(?:1[6-8]|[6-8])216ň
H˙˙˙˙˙˙˙˙˙
ú
H˙˙˙˙˙˙˙˙˙
ŠH˙˙˙˙˙˙˙˙˙

 ’

@@ -260,8 +259,11 @@ x
 1762176
 �
 [19]\d\d(?:\d{2})?HH"&1(?:0[235]|1[2-6]|9[127])|9112102H*9[0-4689]\d{3}290000HJJOÚ
1(?:12|9[127])|9112112Hę
921(?:0[2359]|1[0-68]|9[0-24-79])|9[0-4689]\d{3}|9112102ň
H˙˙˙˙˙˙˙˙˙
ú
9[0-4689]\d{3}290000HŠ9[0-4689]\d{3}290000H
-‡

-	1\d\dH"11[089]2110*H˙˙˙˙˙˙˙˙˙
JJPÚ

11[09]2110ę
1(?:0[24]|1[089]|44|89)2102ň
H˙˙˙˙˙˙˙˙˙
ú
H˙˙˙˙˙˙˙˙˙
ŠH˙˙˙˙˙˙˙˙˙

+ş

+[01]\d\d(?:\d{7})?HH
+"11[089]2110H*H˙˙˙˙˙˙˙˙˙
JJPÚ
11[09]2110Hę
,%000[259]\d{6}|1(?:0[24]|1[089]|44|89)2102ň
H˙˙˙˙˙˙˙˙˙
ú
H˙˙˙˙˙˙˙˙˙
Š
000[259]\d{6}2
+0002000000H
+
 ç
 [1-9]\d{2,4}HHH"5.1(?:1(?:[246]|9\d)|5(?:01|2[127]|6[26]\d))|9992112*909\d\d290900HJKEÚ

 11[24]|9992112Hę
…ý
1(?:0(?:[07-9]|1[0-25]|400)|1(?:[024-6]|9[0-579])|2[1-3]|3[01]|4[14]|5(?:[01][01]|2[0-24-79]|33|4[05]|5[59]|6(?:00|29|6[67]))|(?:6[035]\d|[78])\d|9(?:[02-9]\d\d|19))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\d)\d|5(?:[0-7]\d|99))\d\d|9(?:09\d\d|99)|89882100ň
H˙˙˙˙˙˙˙˙˙
ú
…
~1(?:(?:04|6[35])\d\d|3[01]|4[14]|5(?:1\d|2[25]))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\d)\d|5(?:[0-7]\d|99)|909)\d\d|898\d2130ŠIB1(?:(?:04|6[035])\d\d|4[14]|5(?:01|55|6[26]\d))|40404|8988|909\d\d2141

cpp/src/phonenumbers/phonenumberutil.cc

@@ -878,7 +878,7 @@ void PhoneNumberUtil::ClearMetadata() {
 
 bool UpdateMetadataFile(const string& filepath) {
 
-  boost::filesystem::path path_to = boost::filesystem::current_path();
+  boost::filesystem::path path_to(METADATA_PATH);
   path_to += "/";
   path_to += METADATA_FILE_NAME;
   boost::filesystem::path path_bk = path_to;
@@ -983,7 +983,10 @@ PhoneNumberUtil::PhoneNumberUtil()
   // method inside the constructor as well to keep both in sync.
   PhoneMetadataCollection metadata_collection;
 #ifdef ISTREAM_DATA_PROVIDER
-  if (!LoadMetadataFromFile(METADATA_FILE_NAME, &metadata_collection)) {
+  boost::filesystem::path path_to(METADATA_PATH);
+  path_to += "/";
+  path_to += METADATA_FILE_NAME;
+  if (!LoadMetadataFromFile(path_to.string(), &metadata_collection)) {
       LOG(DFATAL) << "Could not parse metadata from file.";
       return;
   }

cpp/src/phonenumbers/shortnumberinfo.cc

@@ -60,7 +60,7 @@ void ShortNumberInfo::ClearMetadata(){
 
 bool UpdateShortMetadataFile(const string& filepath) {
 
-  boost::filesystem::path path_to = boost::filesystem::current_path();
+  boost::filesystem::path path_to(METADATA_PATH);
   path_to += "/";
   path_to += METADATA_SHORT_FILE_NAME;
   boost::filesystem::path path_bk = path_to;
@@ -126,7 +126,10 @@ ShortNumberInfo::ShortNumberInfo()
 
   PhoneMetadataCollection metadata_collection;
 #ifdef ISTREAM_DATA_PROVIDER
-  if (!LoadMetadataFromFile(METADATA_SHORT_FILE_NAME, &metadata_collection)) {
+  boost::filesystem::path path_to(METADATA_PATH);
+  path_to += "/";
+  path_to += METADATA_SHORT_FILE_NAME;
+  if (!LoadMetadataFromFile(path_to.string(), &metadata_collection)) {
     LOG(DFATAL) << "Could not parse metadata from file.";
     return;
   }

cpp/test/phonenumbers/phonenumberutil_test.cc

@@ -168,8 +168,9 @@ TEST_F(PhoneNumberUtilTest, InterchangeInvalidCodepoints) {
 
 #ifdef ISTREAM_DATA_PROVIDER
 TEST_F(PhoneNumberUtilTest, ReloadMetadata) {
-  const string filename = "metadata.dat";
-  EXPECT_TRUE(phone_util_.ReloadMetadata(filename));
+  string path(METADATA_PATH);
+  path.append("/metadata.dat");
+  EXPECT_TRUE(phone_util_.ReloadMetadata(path));
 }
 #endif
 

cpp/test/phonenumbers/shortnumberinfo_test.cc

@@ -98,8 +98,9 @@ TEST_F(ShortNumberInfoTest, IsValidShortNumber) {
 
 #ifdef ISTREAM_DATA_PROVIDER
 TEST_F(ShortNumberInfoTest, ReloadMetadata) {
-  const string filename = "metadata_short.dat";
-  EXPECT_TRUE(short_info_.ReloadMetadata(filename));
+  string path(METADATA_PATH);
+  path.append("/metadata_short.dat");
+  EXPECT_TRUE(short_info_.ReloadMetadata(path));
 }
 #endif