Changeset 588 for apps/outlook/branches/1.5/DotTelSystem/DNS/Records/DNSUnlinkedTelnameNaptrResourceRecord.cs

Timestamp:

11/27/09 09:51:15 (4 months ago)

Author:

jonmaycock

Message:

 

Files:

• apps/outlook/branches/1.5/DotTelSystem/DNS/Records/DNSUnlinkedTelnameNaptrResourceRecord.cs (modified) (1 diff)

apps/outlook/branches/1.5/DotTelSystem/DNS/Records/DNSUnlinkedTelnameNaptrResourceRecord.cs

@@ -84 +84 @@
             this.serviceType = naptr.ServiceType;
             this.catagories = naptr.Catagories;
+            Logger.Log(Logger.Section.Lookups,"URI Path: " + naptr.UriPath);
             this.uriPath = naptr.UriPath;
+            Logger.Log(Logger.Section.Lookups, "URI Scheme: " + naptr.UriScheme);
             this.uriScheme = naptr.UriScheme;
             this.labels = naptr.Labels;
-            if (this.uriPath.StartsWith(";base64"))
+            string[] split = this.uriPath.Split(new char[] { ',' }, 2);
+            string stuff = split[0];
+            string txtStr = "";
+            if (split.Length > 1)
+            {
+                txtStr = split[1];
+            }
+            else
+            {
+                txtStr = split[0];
+            }
+            if (stuff == "" || split.Length <= 1 || this.uriScheme != "data:")
+            {
+                this.text = System.Uri.UnescapeDataString(txtStr);
+                this.display = true;
+            }
+            else if (stuff.StartsWith(";base64"))
             {
                 System.Text.UTF8Encoding encoder = new System.Text.UTF8Encoding();
                 System.Text.Decoder utf8Decode = encoder.GetDecoder();
 
-                byte[] todecode_byte = Convert.FromBase64String(this.uriPath.Substring(8, this.uriPath.Length-8));
-                int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length);
-                char[] decoded_char = new char[charCount];
-                utf8Decode.GetChars(todecode_byte, 0, todecode_byte.Length, decoded_char, 0);
-                this.text = new string(decoded_char);
-
+                Logger.Log(Logger.Section.Lookups, "Base 64 String to decode: " + txtStr);
+                try
+                {
+                    byte[] todecode_byte = Convert.FromBase64String(txtStr);
+                    int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length);
+                    char[] decoded_char = new char[charCount];
+                    utf8Decode.GetChars(todecode_byte, 0, todecode_byte.Length, decoded_char, 0);
+                    this.text = new string(decoded_char);
+                    if (UriHandler.getInstance().Displayable(this.serviceType, this.uriScheme) || !UriHandler.getInstance().KnownService(this.serviceType))
+                        this.display = true;
+                    else
+                        this.display = false;
+                }
+                catch (FormatException e)
+                {
+                    this.text = txtStr;
+                }
             }
             else
             {
-                if (this.uriScheme.StartsWith("data:"))
-                    this.text = this.uriPath.Substring(1, this.uriPath.Length - 1);
-                else
-                    this.text = this.uriPath;
+                this.display = false;
             }
-            if (UriHandler.getInstance().Displayable(this.serviceType, this.uriScheme) || !UriHandler.getInstance().KnownService(this.serviceType))
-                this.display = true;
-            else
-                this.display = false;
 
         }