Changeset 822 for BMXNET_RPMS_dotNET_UTILITIES-BMX/trunk/cs/bmx_0200scr/BMX2/BMXNet/BMXNetLib.cs

Timestamp:

Jul 6, 2010, 8:09:10 AM (14 years ago)

Author:

Sam Habiel

Message:

Support for other encodings besides ASCII. Constructors available in BMXNetLib and and BMXNetConnectInfo.
Comments in several files.

File:

• BMXNET_RPMS_dotNET_UTILITIES-BMX/trunk/cs/bmx_0200scr/BMX2/BMXNet/BMXNetLib.cs (modified) (8 diffs)

BMXNET_RPMS_dotNET_UTILITIES-BMX/trunk/cs/bmx_0200scr/BMX2/BMXNet/BMXNetLib.cs

@@ -21 +21 @@
         public class BMXNetLib
         {
-                public BMXNetLib()
+                /// <summary>
+                /// Main constructor with default machine encoding
+                /// </summary>
+        public BMXNetLib()
                 {
                         m_sWKID = "BMX";
@@ -30 +33 @@
 
                 }
+
+        /// <summary>
+        /// Constructor specifiying encoding
+        /// </summary>
+        /// <param name="charset">String name of character set</param>
+        public BMXNetLib(string charset) : this()
+        {
+            
+            //char[] arabic_nm_ch = arabic_name.ToCharArray();
+            //byte[] arabic_nm_by = cp1256.GetBytes(arabic_nm_ch);
+            //string arabic_name2 = "";
+            //foreach (byte eachbyte in arabic_nm_by)
+            //{
+            //    arabic_name2 += ((char)eachbyte);
+            //}
+            
+            try 
+            { 
+                m_Encoding = System.Text.Encoding.GetEncoding(charset); 
+            }
+            catch (ArgumentException)
+            {
+                Debug.Write("Invalid Code Page... Falling back to default system encoding");
+                m_Encoding = Encoding.GetEncoding(0);
+            }
+        }
                 
                 #region Piece Functions
@@ -139 +168 @@
                 private string          m_sNameSpace = "";
         private int         m_nReceiveTimeout = 30000;
+
+        private Encoding m_Encoding = Encoding.GetEncoding(0);
 
                 #endregion RPX Fields
@@ -802 +833 @@
 
                         NetworkStream ns = tcpClient.GetStream();
-                        byte[] sendBytes = Encoding.ASCII.GetBytes(cSendString);
+                        byte[] sendBytes = m_Encoding.GetBytes(cSendString);
                         ns.Write(sendBytes,0,sendBytes.Length);
             if (this.m_bLogging == true)
@@ -852 +883 @@
                         do
                         {
-
                                 numberOfBytesRead = ns.Read(bReadBuffer, 0, bReadBuffer.Length); 
                                 if ((numberOfBytesRead == 1)&&(bStarted == false))
@@ -869 +899 @@
                                                 lpBuf += 2;
                                         }
-                                        sError = Encoding.ASCII.GetString(bReadBuffer, lpBuf + 1, nErrLen);
+                                        sError = m_Encoding.GetString(bReadBuffer, lpBuf + 1, nErrLen);
                                         if (sError != "")
                                         {
                                                 throw new BMXNetException(sError);
                                         }
-                                        sAppError = Encoding.ASCII.GetString(bReadBuffer, lpBuf+1+nErrLen+1, nAppLen);
+                                        sAppError = m_Encoding.GetString(bReadBuffer, lpBuf+1+nErrLen+1, nAppLen);
                                         lpBuf += (nErrLen + nAppLen + 2);
                                         numberOfBytesRead -= (nErrLen + nAppLen + 2);
@@ -884 +914 @@
                                         bFinished = true;
                                 Debug.Assert(numberOfBytesRead > -1);
-                                sReadBuffer = Encoding.ASCII.GetString(bReadBuffer, lpBuf, numberOfBytesRead);
+                                sReadBuffer = m_Encoding.GetString(bReadBuffer, lpBuf, numberOfBytesRead);
                                 lpBuf = 0;
                                 if (nFind > -1)
@@ -1315 +1345 @@
                 }
 
+        /// <summary>
+        /// Gets or Sets the Default Encoder to use
+        /// </summary>
+        public Encoding Encoder
+        {
+            get
+            {
+                return this.m_Encoding;
+            }
+            set
+            {
+                this.m_Encoding = Encoder;
+            }
+        }
+
                 #endregion RPX Properties