24.0524.05

1 files changed, 103 insertions, 14 deletions

diff --git a/CPP/Common/MyXml.cpp b/CPP/Common/MyXml.cpp
index a879d34..cc891fc 100644
--- a/CPP/Common/MyXml.cpp
+++ b/CPP/Common/MyXml.cpp
@@ -3,6 +3,7 @@
 #include "StdAfx.h"
 
 #include "MyXml.h"
+#include "StringToInt.h"
 
 static bool IsValidChar(char c)
 {
@@ -30,7 +31,7 @@ int CXmlItem::FindProp(const char *propName) const throw()
 
 AString CXmlItem::GetPropVal(const char *propName) const
 {
-  int index = FindProp(propName);
+  const int index = FindProp(propName);
   if (index >= 0)
     return Props[(unsigned)index].Value;
   return AString();
@@ -49,6 +50,17 @@ int CXmlItem::FindSubTag(const char *tag) const throw()
   return -1;
 }
 
+const CXmlItem *CXmlItem::FindSubTag_GetPtr(const char *tag) const throw()
+{
+  FOR_VECTOR (i, SubItems)
+  {
+    const CXmlItem *p = &SubItems[i];
+    if (p->IsTagged(tag))
+      return p;
+  }
+  return NULL;
+}
+
 AString CXmlItem::GetSubString() const
 {
   if (SubItems.Size() == 1)
@@ -73,9 +85,9 @@ const AString * CXmlItem::GetSubStringPtr() const throw()
 
 AString CXmlItem::GetSubStringForTag(const char *tag) const
 {
-  int index = FindSubTag(tag);
-  if (index >= 0)
-    return SubItems[(unsigned)index].GetSubString();
+  const CXmlItem *item = FindSubTag_GetPtr(tag);
+  if (item)
+    return item->GetSubString();
   return AString();
 }
 
@@ -92,11 +104,14 @@ const char * CXmlItem::ParseItem(const char *s, int numAllowedLevels)
   }
   if (*s == 0)
     return NULL;
-  if (s != beg)
   {
-    IsTag = false;
-    Name.SetFrom(beg, (unsigned)(s - beg));
-    return s;
+    const size_t num = (size_t)(s - beg);
+    if (num)
+    {
+      IsTag = false;
+      Name.SetFrom_Chars_SizeT(beg, num);
+      return s;
+    }
   }
   
   IsTag = true;
@@ -110,7 +125,7 @@ const char * CXmlItem::ParseItem(const char *s, int numAllowedLevels)
       break;
   if (s == beg || *s == 0)
     return NULL;
-  Name.SetFrom(beg, (unsigned)(s - beg));
+  Name.SetFrom_Chars_SizeT(beg, (size_t)(s - beg));
 
   for (;;)
   {
@@ -142,11 +157,12 @@ const char * CXmlItem::ParseItem(const char *s, int numAllowedLevels)
       }
 
       s += 2;
-      unsigned len = Name.Len();
+      const unsigned len = Name.Len();
+      const char *name = Name.Ptr();
       for (unsigned i = 0; i < len; i++)
-        if (s[i] != Name[i])
+        if (*s++ != *name++)
           return NULL;
-      s += len;
+      // s += len;
       if (s[0] != '>')
         return NULL;
       return s + 1;
@@ -166,7 +182,7 @@ const char * CXmlItem::ParseItem(const char *s, int numAllowedLevels)
     }
     if (s == beg)
       return NULL;
-    prop.Name.SetFrom(beg, (unsigned)(s - beg));
+    prop.Name.SetFrom_Chars_SizeT(beg, (size_t)(s - beg));
     
     SKIP_SPACES(s)
     if (*s != '=')
@@ -187,7 +203,7 @@ const char * CXmlItem::ParseItem(const char *s, int numAllowedLevels)
         break;
       s++;
     }
-    prop.Value.SetFrom(beg, (unsigned)(s - beg));
+    prop.Value.SetFrom_Chars_SizeT(beg, (size_t)(s - beg));
     s++;
   }
 }
@@ -258,3 +274,76 @@ void CXml::AppendTo(AString &s) const
   Root.AppendTo(s);
 }
 */
+
+
+void z7_xml_DecodeString(AString &temp)
+{
+  char * const beg = temp.GetBuf();
+  char *dest = beg;
+  const char *p = beg;
+  for (;;)
+  {
+    char c = *p++;
+    if (c == 0)
+      break;
+    if (c == '&')
+    {
+      if (p[0] == '#')
+      {
+        const char *end;
+        const UInt32 number = ConvertStringToUInt32(p + 1, &end);
+        if (*end == ';' && number != 0 && number <= 127)
+        {
+          p = end + 1;
+          c = (char)number;
+        }
+      }
+      else if (
+          p[0] == 'a' &&
+          p[1] == 'm' &&
+          p[2] == 'p' &&
+          p[3] == ';')
+      {
+        p += 4;
+      }
+      else if (
+          p[0] == 'l' &&
+          p[1] == 't' &&
+          p[2] == ';')
+      {
+        p += 3;
+        c = '<';
+      }
+      else if (
+          p[0] == 'g' &&
+          p[1] == 't' &&
+          p[2] == ';')
+      {
+        p += 3;
+        c = '>';
+      }
+      else if (
+          p[0] == 'a' &&
+          p[1] == 'p' &&
+          p[2] == 'o' &&
+          p[3] == 's' &&
+          p[4] == ';')
+      {
+        p += 5;
+        c = '\'';
+      }
+      else if (
+          p[0] == 'q' &&
+          p[1] == 'u' &&
+          p[2] == 'o' &&
+          p[3] == 't' &&
+          p[4] == ';')
+      {
+        p += 5;
+        c = '\"';
+      }
+    }
+    *dest++ = c;
+  }
+  temp.ReleaseBuf_SetEnd((unsigned)(dest - beg));
+}