add pharmacode to the asp.net example app, fixed null exception in Ge…

…nerateBarcodeImage in asp.net example app
barnhill · Oct 27, 2014 · cb8b206 · cb8b206
1 parent 41efc4a
commit cb8b206
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 38 deletions.
diff --git a/BarcodeDemo/BarcodeDemo.sln b/BarcodeDemo/BarcodeDemo.sln
diff --git a/BarcodeDemo/BarcodeLib.dll b/BarcodeDemo/BarcodeLib.dll
diff --git a/BarcodeDemo/Default.aspx b/BarcodeDemo/Default.aspx
@@ -93,6 +93,7 @@
                                             <asp:ListItem>MSI</asp:ListItem>
                                             <asp:ListItem>Telepen</asp:ListItem>
                                             <asp:ListItem>FIM (Facing Identification Mark)</asp:ListItem>
+                                            <asp:ListItem>Pharmacode</asp:ListItem>
                                         </asp:DropDownList>
                                     </td>
                                     <td align="center">

diff --git a/BarcodeDemo/Default.aspx.cs b/BarcodeDemo/Default.aspx.cs
@@ -19,6 +19,7 @@ protected void Page_Load(object sender, EventArgs e)
 
         lblLibraryVersion.Text = BarcodeLib.Barcode.Version.ToString();
     }
+
     protected void btnEncode_Click(object sender, EventArgs e)
     {
         string strImageURL = "GenerateBarcodeImage.aspx?d=" + this.txtData.Text.Trim() + "&h=" + this.txtHeight.Text.Trim() + "&w=" + this.txtWidth.Text.Trim() + "&bc=" + this.txtBackColor.Text.Trim() + "&fc=" + this.txtForeColor.Text.Trim() + "&t=" + this.cbEncodeType.SelectedValue + "&il=" + this.chkGenerateLabel.Checked.ToString() + "&if=" + this.ddlImageFormat.SelectedValue + "&align=" + GetAlignmentValue();
@@ -27,6 +28,7 @@ protected void btnEncode_Click(object sender, EventArgs e)
         this.BarcodeImage.Height = Convert.ToInt32(this.txtHeight.Text);
         this.BarcodeImage.Visible = true;
     }
+
     protected string GetAlignmentValue()
     {
         if (this.rbAlignCenter.Checked)

diff --git a/BarcodeDemo/GenerateBarcodeImage.aspx.cs b/BarcodeDemo/GenerateBarcodeImage.aspx.cs
@@ -56,6 +56,7 @@ protected void Page_Load(object sender, EventArgs e)
                 case "Code 128-C": type = BarcodeLib.TYPE.CODE128C; break;
                 case "Telepen": type = BarcodeLib.TYPE.TELEPEN; break;
                 case "FIM (Facing Identification Mark)": type = BarcodeLib.TYPE.FIM; break;
+                case "Pharmacode": type = BarcodeLib.TYPE.PHARMACODE; break;
                 default: break;
             }//switch
 
@@ -110,11 +111,15 @@ protected void Page_Load(object sender, EventArgs e)
             }//try
             catch (Exception ex)
             {
+                //TODO: find a way to return this to display the encoding error message
             }//catch
             finally
             {
-                //Clean up / Dispose...
-                barcodeImage.Dispose();
+                if (barcodeImage != null)
+                {
+                    //Clean up / Dispose...
+                    barcodeImage.Dispose();
+                }
             }//finally
         }//if
     }

diff --git a/BarcodeLib/Symbologies/Pharmacode.cs b/BarcodeLib/Symbologies/Pharmacode.cs
@@ -26,7 +26,6 @@ public Pharmacode(string input)
             {
                 Error("EPHARM-1: Data contains invalid  characters (non-numeric).");
             }//if
-
             else if (Raw_Data.Length > 6)
             {
                 Error("EPHARM-2: Data too long (invalid data input length).");