(file) Return to XmlParser.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlParser.cpp between version 1.21 and 1.22

version 1.21, 2003/07/29 20:50:11 version 1.22, 2003/08/12 17:50:18
Line 489 
Line 489 
  
 Boolean XmlParser::_getElementName(char*& p) Boolean XmlParser::_getElementName(char*& p)
 { {
     if (!isalpha(*p) && *p != '_')      if (!String::isUTF8(p))
         throw XmlException(XmlException::BAD_START_TAG, _line);         throw XmlException(XmlException::BAD_START_TAG, _line);
  
     while (*p &&      while ((*p) &&
         (isalnum(*p) || *p == '_' || *p == '-' || *p == ':' || *p == '.'))             (((*p >= 'A') && (*p <= 'Z')) ||
               ((*p >= 'a') && (*p <= 'z')) ||
               *p == '_' || *p == '-' || *p == ':' || *p == '.'))
         p++;         p++;
  
     // The next character must be a space:     // The next character must be a space:
Line 517 
Line 519 
 { {
     openCloseElement = false;     openCloseElement = false;
  
     if (!isalpha(*p) && *p != '_')      if (!String::isUTF8(p))
         throw XmlException(XmlException::BAD_START_TAG, _line);         throw XmlException(XmlException::BAD_START_TAG, _line);
  
     while (*p &&      while ((*p) &&
         (isalnum(*p) || *p == '_' || *p == '-' || *p == ':' || *p == '.'))             (((*p >= 'A') && (*p <= 'Z')) ||
               ((*p >= 'a') && (*p <= 'z')) ||
               *p == '_' || *p == '-' || *p == ':' || *p == '.'))
         p++;         p++;
  
     // The next character must be a space:     // The next character must be a space:
Line 551 
Line 555 
  
 void XmlParser::_getAttributeNameAndEqual(char*& p) void XmlParser::_getAttributeNameAndEqual(char*& p)
 { {
     if (!isalpha(*p) && *p != '_')      if (!String::isUTF8(p))
         throw XmlException(XmlException::BAD_ATTRIBUTE_NAME, _line);         throw XmlException(XmlException::BAD_ATTRIBUTE_NAME, _line);
  
     while (*p &&      while ((*p) &&
         (isalnum(*p) || *p == '_' || *p == '-' || *p == ':' || *p == '.'))             (((*p >= 'A') && (*p <= 'Z')) ||
               ((*p >= 'a') && (*p <= 'z')) ||
               *p == '_' || *p == '-' || *p == ':' || *p == '.'))
         p++;         p++;
  
     char* term = p;     char* term = p;
Line 871 
Line 877 
  
         return;         return;
     }     }
     else if (isalpha(*p) || *p == '_')      else if (String::isUTF8(p))
     {     {
         entry.type = XmlEntry::START_TAG;         entry.type = XmlEntry::START_TAG;
         entry.text = p;         entry.text = p;
Line 1095 
Line 1101 
     if (!getAttributeValue(name, tmp))     if (!getAttributeValue(name, tmp))
         return false;         return false;
  
     value = tmp;      value = String(tmp,STRING_FLAG_UTF8);
     return true;     return true;
 } }
  

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2