Merge pull request #128 from CanSeeThePain/OptionalEAN13CountryException

Optional ean13 country exception.
barnhill · May 9, 2021 · 4239194 · 4239194
2 parents 6ac6856 + 6f1358d
commit 4239194
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/BarcodeStandard/BarcodeLib.cs b/BarcodeStandard/BarcodeLib.cs
@@ -301,6 +301,10 @@ public static Version Version
         {
             get { return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; }
         }
+        /// <summary>
+        /// Disables EAN13 invalid country code exception.
+        /// </summary>
+        public bool DisableEAN13CountryException { get; set; } = false;
         #endregion
 
         /// <summary>
@@ -440,7 +444,7 @@ public string GenerateBarcode(string raw_data = "")
                     break;
                 case TYPE.UCC13:
                 case TYPE.EAN13: //Encode_EAN13();
-                    ibarcode = new EAN13(Raw_Data);
+                    ibarcode = new EAN13(Raw_Data, DisableEAN13CountryException);
                     break;
                 case TYPE.Interleaved2of5_Mod10:
                 case TYPE.Interleaved2of5: //Encode_Interleaved2of5();

diff --git a/BarcodeStandard/Symbologies/EAN13.cs b/BarcodeStandard/Symbologies/EAN13.cs
@@ -15,16 +15,23 @@ class EAN13 : BarcodeCommon, IBarcode
         private readonly Hashtable _countryCodes = new Hashtable(); //is initialized by init_CountryCodes()
         private string _countryAssigningManufacturerCode = "N/A";
 
-        public EAN13(string input)
+        public EAN13(string input, bool disableCountryException = false)
         {
             Raw_Data = input;
+			DisableCountryException = disableCountryException;
 
-            CheckDigit();
+			CheckDigit();
         }
-        /// <summary>
-        /// Encode the raw data using the EAN-13 algorithm. (Can include the checksum already.  If it doesnt exist in the data then it will calculate it for you.  Accepted data lengths are 12 + 1 checksum or just the 12 data digits)
-        /// </summary>
-        private string Encode_EAN13()
+
+		/// <summary>
+		/// Disables EAN13 invalid country code exception.
+		/// </summary>
+		public bool DisableCountryException { get; set; } = false;
+
+		/// <summary>
+		/// Encode the raw data using the EAN-13 algorithm. (Can include the checksum already.  If it doesnt exist in the data then it will calculate it for you.  Accepted data lengths are 12 + 1 checksum or just the 12 data digits)
+		/// </summary>
+		private string Encode_EAN13()
         {
             //check length of input
             if (Raw_Data.Length < 12 || Raw_Data.Length > 13)
@@ -82,7 +89,10 @@ private string Encode_EAN13()
 				cc = _countryCodes[twodigitCode].ToString();
 				if (cc == null)
                 {
-					Error("EEAN13-3: Country assigning manufacturer code not found.");
+					if (!DisableCountryException)
+					{
+						Error("EEAN13-3: Country assigning manufacturer code not found.");
+					}
 				} 
 				else
                 {