Support of short number check in 'is_valid_number' function #4

Author: sdefauw

src/numinfo.cpp

@@ -7,21 +7,37 @@
 
 #include "phonenumbers/phonenumber.pb.h"
 #include "phonenumbers/phonenumberutil.h"
+#include "phonenumbers/shortnumberinfo.h"
 
 using i18n::phonenumbers::PhoneNumber;
 using i18n::phonenumbers::PhoneNumberUtil;
+using i18n::phonenumbers::ShortNumberInfo;
 
-int is_valid_number(char* number, char* country, int local) {
+int is_valid_number(char* number, char* country, int local, int short_code) {
 
 	PhoneNumber num;
     const PhoneNumberUtil& phone_util = *PhoneNumberUtil::GetInstance();
+    const ShortNumberInfo& short_info = ShortNumberInfo();
+    bool is_valid;
+    bool is_valid_short_number;
 	phone_util.Parse(number, country, &num);
 
     if (local) {
-        return (int) phone_util.IsValidNumberForRegion(num, country);
+        is_valid = phone_util.IsValidNumberForRegion(num, country);
     } else {
-        return (int) phone_util.IsValidNumber(num);
+        is_valid = phone_util.IsValidNumber(num) || short_info.IsValidShortNumber(num);
     }
+
+    if (short_code > 0) {
+        if (local) {
+            is_valid_short_number = short_info.IsValidShortNumberForRegion(num, country);
+        } else {
+            is_valid_short_number = short_info.IsValidShortNumber(num);
+        }
+        is_valid = (short_code == 2) ? (is_valid || is_valid_short_number) : is_valid_short_number;
+    }
+
+    return (int) is_valid;
 }
 
 int get_region(char* number, char* country, char *region) {

src/numinfo.h

@@ -38,13 +38,16 @@ static const char *phone_type_str[] = {
 /**
  * Check the validity of a number.
  *
- * @param number	Number to check
- * @param country	Two-letter country (ISO 3166-1) where the national number will be taken into account.
- * @param local		1 if the number is valid in the country specified otherwise the check is done in national and
- * 					international.
- * @return			1 if the number is valid and 0 if it is invalid.
+ * @param number	 Number to check
+ * @param country	 Two-letter country (ISO 3166-1) where the national number will be taken into account.
+ * @param local		 1 if the number is valid in the country specified otherwise the check is done in national and
+ * 					 international.
+ * @param short_code 0 Don't check if the number is a short number
+ *                   1 Check only if it's a short number
+ *                   2 Check if it's a short number or a classic number
+ * @return			 1 if the number is valid and 0 if it is invalid.
  */
-int is_valid_number(char* number, char* country, int local);
+int is_valid_number(char* number, char* country, int local, int short_code);
 
 /**
  * Get the country based on the number's information.

test/display.c

@@ -10,10 +10,16 @@ void print_region_info(char* country) {
 void print_num_info(char* num, char* country) {
 	char buf[100];
 
-	printf("=== NUMBER INFO ===\n");
+    printf("=== NUMBER VALIDITY ===\n");
 
-	printf(" - Is valid number: %s\n", BOOL2STR(is_valid_number(num, country, 0)));
-	printf(" - Is valid number for %s: %s\n", country, BOOL2STR(is_valid_number(num, country, 1)));
+	printf(" - Is valid number: %s\n", BOOL2STR(is_valid_number(num, country, 0, 0)));
+    printf(" - Is valid short number: %s\n", BOOL2STR(is_valid_number(num, country, 0, 1)));
+    printf(" - Is valid number or short number: %s\n", BOOL2STR(is_valid_number(num, country, 0, 2)));
+	printf(" - Is valid number for %s: %s\n", country, BOOL2STR(is_valid_number(num, country, 1, 0)));
+    printf(" - Is valid short number for %s: %s\n", country, BOOL2STR(is_valid_number(num, country, 1, 1)));
+    printf(" - Is valid number or short number for %s: %s\n", country, BOOL2STR(is_valid_number(num, country, 1, 2)));
+
+    printf("=== NUMBER INFO ===\n");
 
 	printf(" - Country calling code: %d\n", get_country_code(num, country));
 	get_region(num, country, buf);