pegasus/src/Pegasus/Common/XmlReader.cpp - diff

Return to XmlReader.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlReader.cpp between version 1.1.1.1 and 1.129

version 1.1.1.1, 2001/01/14 19:53:32

version 1.129, 2008/01/30 18:56:21

Line 1

//BEGIN_LICENSE

//%2006////////////////////////////////////////////////////////////////////////

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// Permission is hereby granted, free of charge, to any person obtaining a

// copy of this software and associated documentation files (the "Software"),

// IBM Corp.; EMC Corporation, The Open Group.

// to deal in the Software without restriction, including without limitation

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// and/or sell copies of the Software, and to permit persons to whom the

// Software is furnished to do so, subject to the following conditions:

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

// EMC Corporation; Symantec Corporation; The Open Group.

// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

// Permission is hereby granted, free of charge, to any person obtaining a copy

// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// of this software and associated documentation files (the "Software"), to

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// deal in the Software without restriction, including without limitation the

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// DEALINGS IN THE SOFTWARE.

// sell copies of the Software, and to permit persons to whom the Software is

// furnished to do so, subject to the following conditions:

//END_LICENSE

//BEGIN_HISTORY

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// Author:

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// $Log$

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// Revision 1.1.1.1 2001/01/14 19:53:32 mike

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// Pegasus import

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//END_HISTORY

//==============================================================================

#include <cassert>

//%/////////////////////////////////////////////////////////////////////////////

#include <Pegasus/Common/Config.h>

#include <errno.h>

#include <cctype>

#include <cstdio>

#include <cstdlib>

#include "Name.h"

#if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS)

# include <errno.h>

#endif

#include "CIMName.h"

#include "XmlReader.h"

#include "XmlWriter.h"

#include "Qualifier.h"

#include "CIMQualifier.h"

#include "QualifierDecl.h"

#include "CIMQualifierDecl.h"

#include "ClassDecl.h"

#include "CIMClass.h"

#include "InstanceDecl.h"

#include "CIMInstance.h"

#include "CIMObject.h"

#include "CIMParamValue.h"

#include "System.h"

#include "XmlConstants.h"

#include <Pegasus/Common/MessageLoader.h>

#include <Pegasus/Common/StringConversion.h>

#include <Pegasus/Common/AutoPtr.h>

#include "CIMNameUnchecked.h"

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

static const Uint32 MESSAGE_SIZE = 128;

//------------------------------------------------------------------------------

// expectXmlDeclaration()

// getXmlDeclaration()

// <?xml version="1.0" encoding="utf-8"?>

//------------------------------------------------------------------------------

void XmlReader::expectXmlDeclaration(

void XmlReader::getXmlDeclaration(

XmlParser& parser,

XmlEntry& entry)

const char*& xmlVersion,

const char*& xmlEncoding)

{

XmlEntry entry;

if (!parser.next(entry) ||

entry.type != XmlEntry::XML_DECLARATION ||

strcmp(entry.text, "xml") != 0)

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_XML_STYLE",

"Expected <?xml ... ?> style declaration");

throw XmlValidationError(parser.getLine(), mlParms);

}

if (!entry.getAttributeValue("version", xmlVersion))

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_XML_ATTRIBUTE",

"missing xml.version attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

if (!entry.getAttributeValue("encoding", xmlEncoding))

{

// ATTN-RK-P3-20020403: Is there a default encoding?

}

//------------------------------------------------------------------------------

// testXmlDeclaration ()

//------------------------------------------------------------------------------

Boolean XmlReader::testXmlDeclaration (

XmlParser& parser,

XmlEntry& entry)

{

if (!parser.next (entry) ||

entry.type != XmlEntry::XML_DECLARATION ||

strcmp (entry.text, "xml") != 0)

{

parser.putBack (entry);

return false;

}

return true;

}

//------------------------------------------------------------------------------

Line 79

Line 135

entry.type != XmlEntry::START_TAG ||

strcmp(entry.text, tagName) != 0)

{

char message[MESSAGE_SIZE];

MessageLoaderParms mlParms(

sprintf(message, "Expected open of %s element", tagName);

"Common.XmlReader.EXPECTED_OPEN",

throw XmlValidationError(parser.getLine(), message);

"Expected open of $0 element",

tagName);

throw XmlValidationError(parser.getLine(), mlParms);

}

Line 99

Line 157

entry.type != XmlEntry::END_TAG ||

strcmp(entry.text, tagName) != 0)

{

char message[MESSAGE_SIZE];

MessageLoaderParms mlParms(

sprintf(message, "Expected close of %s element", tagName);

"Common.XmlReader.EXPECTED_CLOSE",

throw XmlValidationError(parser.getLine(), message);

"Expected close of $0 element, got $1 instead",

tagName,entry.text);

throw XmlValidationError(parser.getLine(), mlParms);

}

Line 121

Line 181

entry.type != XmlEntry::EMPTY_TAG) ||

strcmp(entry.text, tagName) != 0)

{

char message[MESSAGE_SIZE];

MessageLoaderParms mlParms(

sprintf(message,

"Common.XmlReader.EXPECTED_OPENCLOSE",

"Expected either open or open/close %s element", tagName);

"Expected either open or open/close $0 element",

throw XmlValidationError(parser.getLine(), message);

tagName);

throw XmlValidationError(parser.getLine(), mlParms);

}

Line 142

Line 203

(entry.type != XmlEntry::CONTENT &&

entry.type != XmlEntry::CDATA))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CDATA",

"Expected content of CDATA");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

Line 173

Line 236

//------------------------------------------------------------------------------

// testEndTag>()

// testEndTag()

//------------------------------------------------------------------------------

Line 217

Line 280

//------------------------------------------------------------------------------

// testStartTagOrEmptyTag()

//------------------------------------------------------------------------------

Boolean XmlReader::testStartTagOrEmptyTag(

XmlParser& parser,

XmlEntry& entry)

{

if (!parser.next(entry) ||

(entry.type != XmlEntry::START_TAG &&

entry.type != XmlEntry::EMPTY_TAG))

{

parser.putBack(entry);

return false;

}

return true;

}

//------------------------------------------------------------------------------

// testContentOrCData()

//------------------------------------------------------------------------------

Line 238

Line 322

//------------------------------------------------------------------------------

// testCimStartTag()

// getCimStartTag()

// <!ELEMENT CIM (MESSAGE|DECLARATION)>

// <!ATTRLIST CIM

Line 247

Line 331

//------------------------------------------------------------------------------

void XmlReader::testCimStartTag(XmlParser& parser)

void XmlReader::getCimStartTag(

XmlParser& parser,

const char*& cimVersion,

const char*& dtdVersion)

{

XmlEntry entry;

XmlReader::expectStartTag(parser, entry, "CIM");

const char* cimVersion;

if (!entry.getAttributeValue("CIMVERSION", cimVersion))

throw XmlValidationError(

parser.getLine(), "missing CIM.CIMVERSION attribute");

if (strcmp(cimVersion, "2.0") != 0)

throw XmlValidationError(parser.getLine(),

"CIM.CIMVERSION attribute must be \"2.0\"");

const char* dtdVersion;

if (!entry.getAttributeValue("DTDVERSION", dtdVersion))

throw XmlValidationError(

parser.getLine(), "missing CIM.DTDVERSION attribute");

if (strcmp(dtdVersion, "2.0") != 0)

throw XmlValidationError(parser.getLine(),

"CIM.DTDVERSION attribute must be \"2.0\"");

}

//------------------------------------------------------------------------------

// getIsArrayAttribute()

//------------------------------------------------------------------------------

Boolean XmlReader::getIsArrayAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* tagName,

Boolean& value)

{

const char* tmp;

if (!entry.getAttributeValue("ISARRAY", tmp))

return false;

if (strcmp(tmp, "true") == 0)

{

value = true;

MessageLoaderParms mlParms(

return true;

"Common.XmlReader.MISSING_CIMVERSION_ATTRIBUTE",

"missing CIM.CIMVERSION attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

else if (strcmp(tmp, "false") == 0)

if (!entry.getAttributeValue("DTDVERSION", dtdVersion))

{

value = false;

MessageLoaderParms mlParms(

return true;

"Common.XmlReader.MISSING_DTDVERSION_ATTRIBUTE",

"missing CIM.DTDVERSION attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

char buffer[62];

sprintf(buffer, "Bad %s.%s attribute value", "ISARRAY", tagName);

throw XmlSemanticError(lineNumber, buffer);

return false;

}

//------------------------------------------------------------------------------

Line 315

Line 364

//------------------------------------------------------------------------------

String XmlReader::getCimNameAttribute(

CIMName XmlReader::getCimNameAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName,

Line 326

Line 375

if (!entry.getAttributeValue("NAME", name))

{

char buffer[MESSAGE_SIZE];

sprintf(buffer, "missing %s.NAME attribute", elementName);

sprintf(buffer, "%s.NAME", elementName);

throw XmlValidationError(lineNumber, buffer);

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_ATTRIBUTE",

"missing $0 attribute",

buffer);

throw XmlValidationError(lineNumber, mlParms);

}

if (acceptNull && name.getLength() == 0)

if (acceptNull && name.size() == 0)

return name;

return CIMName ();

if (!Name::legal(name))

if (!CIMName::legal(name))

{

#ifdef PEGASUS_SNIA_INTEROP_TEST

// In testing, replace illegal CIMName with this value to avoid the

// exception and let xml parsing continue. THIS IS TEMP.

name = "BADNAMESUBSTITUTEDBYPEGASUSCLIENT";

#else

char buffer[MESSAGE_SIZE];

sprintf(buffer, "Illegal value for %s.NAME attribute", elementName);

sprintf(buffer, "%s.NAME", elementName);

throw XmlSemanticError(lineNumber, buffer);

}

return name;

MessageLoaderParms mlParms(

"Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

#endif

}

return CIMNameUnchecked(name);

}

//------------------------------------------------------------------------------

Line 361

Line 428

if (!entry.getAttributeValue("CLASSNAME", name))

{

char buffer[MESSAGE_SIZE];

sprintf(buffer, "missing %s.CLASSNAME attribute", elementName);

sprintf(buffer, "%s.CLASSNAME", elementName);

throw XmlValidationError(lineNumber, buffer);

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_ATTRIBUTE",

"missing $0 attribute",

buffer);

throw XmlValidationError(lineNumber, mlParms);

}

if (!Name::legal(name))

if (!CIMName::legal(name))

{

char buffer[MESSAGE_SIZE];

sprintf(buffer,

sprintf(buffer, "%s.CLASSNAME", elementName);

"Illegal value for %s.CLASSNAME attribute", elementName);

throw XmlSemanticError(lineNumber, buffer);

MessageLoaderParms mlParms(

"Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

}

return name;

Line 384

Line 461

//------------------------------------------------------------------------------

String XmlReader::getClassOriginAttribute(

CIMName XmlReader::getClassOriginAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* tagName)

Line 392

Line 469

String name;

if (!entry.getAttributeValue("CLASSORIGIN", name))

return String();

return CIMName();

if (!Name::legal(name))

if (!CIMName::legal(name))

{

char buffer[MESSAGE_SIZE];

sprintf(buffer,

sprintf(buffer, "%s.CLASSORIGIN", tagName);

"Illegal value for %s.CLASSORIGIN attribute", tagName);

throw XmlSemanticError(lineNumber, buffer);

MessageLoaderParms mlParms(

"Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

}

return name;

Line 407

Line 488

//------------------------------------------------------------------------------

// getEmbeddedObjectAttribute()

// <!ENTITY % EmbeddedObject "EmbeddedObject (object | instance) #IMPLIED">

//------------------------------------------------------------------------------

String XmlReader::getEmbeddedObjectAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName)

{

String embeddedObject;

// Check for both upper case and mixed case "EmbeddedObject"

// because of an error in an earlier pegasus version where we

// used upper case in the generation of the attribute name

// whereas the DMTF spec calls for mixed case.

if (!entry.getAttributeValue("EmbeddedObject", embeddedObject) &&

!entry.getAttributeValue("EMBEDDEDOBJECT", embeddedObject))

return String();

// The embeddedObject attribute, if present, must have the string

// value "object" or "instance".

if (!(String::equal(embeddedObject, "object") ||

String::equal(embeddedObject, "instance")))

{

char buffer[MESSAGE_SIZE];

sprintf(buffer, "%s.EmbeddedObject", elementName);

MessageLoaderParms mlParms(

"Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

}

return embeddedObject;

}

//------------------------------------------------------------------------------

// getReferenceClassAttribute()

// <!ENTITY % ReferenceClass "REFERENCECLASS CDATA #IMPLIED">

//------------------------------------------------------------------------------

String XmlReader::getReferenceClassAttribute(

CIMName XmlReader::getReferenceClassAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName)

Line 421

Line 543

String name;

if (!entry.getAttributeValue("REFERENCECLASS", name))

return String();

return CIMName();

if (!Name::legal(name))

if (!CIMName::legal(name))

{

#ifdef PEGASUS_SNIA_INTEROP_TEST

name = "PEGASUS_SUBSTITUED_THIS_FOR_BAD_NAME";

return name;

#endif

char buffer[MESSAGE_SIZE];

sprintf(buffer,

sprintf(buffer, "%s.REFERENCECLASS", elementName);

"Illegal value for %s.REFERENCECLASS attribute", elementName);

throw XmlSemanticError(lineNumber, buffer);

MessageLoaderParms mlParms(

"Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

}

return name;

Line 442

Line 573

//------------------------------------------------------------------------------

String XmlReader::getSuperClassAttribute(

CIMName XmlReader::getSuperClassAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* tagName)

Line 450

Line 581

String superClass;

if (!entry.getAttributeValue("SUPERCLASS", superClass))

return String();

return CIMName();

if (!Name::legal(superClass))

if (!CIMName::legal(superClass))

{

char buffer[MESSAGE_SIZE];

sprintf(

sprintf(buffer, "%s.SUPERCLASS", tagName);

buffer, "Illegal value for %s.SUPERCLASS attribute", tagName);

throw XmlSemanticError(lineNumber, buffer);

MessageLoaderParms mlParms(

"Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

}

return superClass;

Line 467

Line 602

// getCimTypeAttribute()

// This method can be used to get a TYPE attribute or a PARAMTYPE attribute.

// The only significant difference is that PARAMTYPE may specify a value of

// "reference" type. This method recognizes these attributes by name, and

// does not allow a "TYPE" attribute to be of "reference" type.

// <!ENTITY % ParamType "PARAMTYPE (boolean|string|char16|uint8|sint8

// |reference)">

//------------------------------------------------------------------------------

Type XmlReader::getCimTypeAttribute(

Boolean XmlReader::getCimTypeAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* tagName)

CIMType& cimType, // Output parameter

const char* tagName,

const char* attributeName,

Boolean required)

{

const char* typeName;

if (!entry.getAttributeValue("TYPE", typeName))

if (!entry.getAttributeValue(attributeName, typeName))

{

if (required)

{

char message[MESSAGE_SIZE];

sprintf(message, "missing %s.TYPE attribute", tagName);

sprintf(message, "%s.%s", tagName, attributeName);

throw XmlValidationError(lineNumber, message);

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_ATTRIBUTE",

"missing $0 attribute",

message);

throw XmlValidationError(lineNumber, mlParms);

}

else

{

return false;

}

Type type = Type::NONE;

CIMType type = CIMTYPE_BOOLEAN;

Boolean unrecognizedType = false;

if (strcmp(typeName, "boolean") == 0)

type = Type::BOOLEAN;

type = CIMTYPE_BOOLEAN;

else if (strcmp(typeName, "string") == 0)

type = Type::STRING;

type = CIMTYPE_STRING;

else if (strcmp(typeName, "char16") == 0)

type = Type::CHAR16;

type = CIMTYPE_CHAR16;

else if (strcmp(typeName, "uint8") == 0)

type = Type::UINT8;

type = CIMTYPE_UINT8;

else if (strcmp(typeName, "sint8") == 0)

type = Type::SINT8;

type = CIMTYPE_SINT8;

else if (strcmp(typeName, "uint16") == 0)

type = Type::UINT16;

type = CIMTYPE_UINT16;

else if (strcmp(typeName, "sint16") == 0)

type = Type::SINT16;

type = CIMTYPE_SINT16;

else if (strcmp(typeName, "uint32") == 0)

type = Type::UINT32;

type = CIMTYPE_UINT32;

else if (strcmp(typeName, "sint32") == 0)

type = Type::SINT32;

type = CIMTYPE_SINT32;

else if (strcmp(typeName, "uint64") == 0)

type = Type::UINT64;

type = CIMTYPE_UINT64;

else if (strcmp(typeName, "sint64") == 0)

type = Type::SINT64;

type = CIMTYPE_SINT64;

else if (strcmp(typeName, "datetime") == 0)

type = Type::DATETIME;

type = CIMTYPE_DATETIME;

else if (strcmp(typeName, "real32") == 0)

type = Type::REAL32;

type = CIMTYPE_REAL32;

else if (strcmp(typeName, "real64") == 0)

type = Type::REAL64;

type = CIMTYPE_REAL64;

else if (strcmp(typeName, "reference") == 0)

type = Type::REFERENCE;

type = CIMTYPE_REFERENCE;

// PEP 194:

// Note that "object" (ie. CIMTYPE_OBJECT) is not a real CIM datatype, just a

// Pegasus internal representation of an embedded object, so it won't be

// found here.

else unrecognizedType = true;

if (unrecognizedType ||

((type == CIMTYPE_REFERENCE) &&

(strcmp(attributeName, "PARAMTYPE") != 0)))

{

char buffer[MESSAGE_SIZE];

sprintf(buffer, "%s.%s", tagName, attributeName);

// ATTN: "reference" is not legal according to the DTD; however, it is

MessageLoaderParms mlParms(

// used by the XML version of the CIM schema.

"Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

if (type == Type::NONE)

throw XmlSemanticError(lineNumber, mlParms);

{

char message[MESSAGE_SIZE];

sprintf(message, "Illegal value for %s.TYPE attribute", tagName);

throw XmlSemanticError(lineNumber, message);

}

return type;

cimType = type;

return true;

}

//------------------------------------------------------------------------------

Line 553

Line 724

if (!required)

return defaultValue;

char buffer[62];

char buffer[MESSAGE_SIZE];

sprintf(buffer, "missing required %s.%s attribute",

sprintf(buffer, "%s.%s", attributeName, tagName);

attributeName, tagName);

throw XmlValidationError(lineNumber, buffer);

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_REQUIRED_ATTRIBUTE",

"missing required $0 attribute",

buffer);

throw XmlValidationError(lineNumber, mlParms);

}

if (strcmp(tmp, "true") == 0)

Line 565

Line 739

else if (strcmp(tmp, "false") == 0)

return false;

char buffer[62];

char buffer[MESSAGE_SIZE];

sprintf(buffer, "Bad %s.%s attribute value", attributeName, tagName);

sprintf(buffer, "%s.%s", attributeName, tagName);

throw XmlSemanticError(lineNumber, buffer);

return false;

}

//------------------------------------------------------------------------------

// SringToReal()

// [ "+" | "-" ] *decimalDigit "." 1*decimalDigit

// [ ( "e" | "E" ) [ "+" | "-" ] 1*decimalDigit ]

//------------------------------------------------------------------------------

Boolean XmlReader::stringToReal(const char* stringValue, Real64& x)

{

const char* p = stringValue;

if (!*p)

return false;

// Skip optional sign:

if (*p == '+' || *p == '-')

p++;

// Skip optional first set of digits:

while (isdigit(*p))

p++;

// Test required dot:

if (*p++ != '.')

MessageLoaderParms mlParms(

return false;

"Common.XmlReader.INVALID_ATTRIBUTE",

"Invalid $0 attribute value",

buffer);

// One or more digits required:

throw XmlSemanticError(lineNumber, mlParms);

if (!isdigit(*p++))

return false;

}

while (isdigit(*p))

// See http://www.ietf.org/rfc/rfc2396.txt section 2

p++;

// Also see the "CIM Operations over HTTP" spec, section 3.3.2 and

// If there is an exponent now:

// 3.3.3, for the treatment of non US-ASCII chars (UTF-8)

String XmlReader::decodeURICharacters(String uriString)

if (*p)

{

// Test exponent:

Uint32 i;

if (*p != 'e' && *p != 'E')

return false;

p++;

// Skip optional sign:

if (*p == '+' || *p == '-')

Array<Uint8> utf8Chars;

p++;

// One or more digits required:

for (i=0; i<uriString.size(); i++)

{

if (!isdigit(*p++))

if (uriString[i] == '%')

return false;

{

if (i+2 >= uriString.size())

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_URI_ENCODING",

"Invalid URI encoding");

throw ParseError(MessageLoader::getMessage(mlParms));

}

while (isdigit(*p))

Uint8 digit1 =

p++;

StringConversion::hexCharToNumeric(char(uriString[++i]));

Uint8 digit2 =

StringConversion::hexCharToNumeric(char(uriString[++i]));

if ( (digit1 > 15) || (digit2 > 15) )

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_URI_ENCODING",

"Invalid URI encoding");

throw ParseError(MessageLoader::getMessage(mlParms));

}

if (*p)

Uint16 decodedChar = Uint16(digit1<<4) + Uint16(digit2);

return false;

utf8Chars.append((Uint8)decodedChar);

}

else

{

utf8Chars.append((Uint8)uriString[i]);

}

char* end;

// If there was a string to decode...

x = strtod(stringValue, &end);

if (uriString.size() > 0)

return true;

{

// Convert UTF-8 to UTF-16 and return the String

utf8Chars.append('\0');

return String((char *)utf8Chars.getData());

}

else

{

return String();

}

//------------------------------------------------------------------------------

Line 648

Line 813

// stringToSignedInteger

// [ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" )

// or

// [ "+" | "-" ] ( "0x" | "0X" ) 1*hexDigit

// ATTN-B: handle conversion from hexadecimal.

//------------------------------------------------------------------------------

Boolean XmlReader::stringToSignedInteger(

const char* stringValue,

Sint64& x)

{

x = 0;

return (StringConversion::stringToSint64(

const char* p = stringValue;

stringValue, StringConversion::decimalStringToUint64, x) ||

StringConversion::stringToSint64(

if (!*p)

stringValue, StringConversion::hexStringToUint64, x));

return false;

// Skip optional sign:

Boolean negative = *p == '-';

if (negative || *p == '+')

p++;

// If the next thing is a zero, then it must be the last:

if (*p == '0')

return p[1] == '\0';

// Expect a positive decimal digit:

const char* first = p;

if (!isdigit(*p) || *p == '0')

return false;

p++;

// Expect zero or more digits:

while (isdigit(*p))

p++;

if (*p)

return false;

const char* last = p;

while (first != last)

x = 10 * x + (*first++ - '0');

if (negative)

x = -x;

return true;

}

//------------------------------------------------------------------------------

// stringToUnsignedInteger

// [ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" )

// ( positiveDecimalDigit *decimalDigit | "0" )

// or

// ( "0x" | "0X" ) 1*hexDigit

// ATTN-B: handle conversion from hexadecimal.

//------------------------------------------------------------------------------

Boolean XmlReader::stringToUnsignedInteger(

const char* stringValue,

Uint64& x)

{

x = 0;

return (StringConversion::decimalStringToUint64(stringValue, x) ||

const char* p = stringValue;

StringConversion::hexStringToUint64(stringValue, x));

if (!*p)

return false;

// Skip optional sign:

if (*p == '-')

return false;

if (*p == '+')

p++;

// If the next thing is a zero, then it must be the last:

if (*p == '0')

return p[1] == '\0';

// Expect a positive decimal digit:

const char* first = p;

if (!isdigit(*p) || *p == '0')

return false;

p++;

// Expect zero or more digits:

while (isdigit(*p))

p++;

if (*p)

return false;

const char* last = p;

while (first != last)

x = 10 * x + (*first++ - '0');

return true;

}

//------------------------------------------------------------------------------

// stringToValue()

// ATTN-C: note that integers are truncated without warning. What should be

// Return: CIMValue. If the string input is zero length creates a CIMValue

// done in this case? In C they are truncated without warning by design.

// with value defined by the type. Else the value is inserted.

// Note that this does not set the CIMValue Null if the string is empty.

//------------------------------------------------------------------------------

Value XmlReader::stringToValue(

CIMValue XmlReader::stringToValue(

Uint32 lineNumber,

const char* valueString,

Type type)

CIMType type)

{

// ATTN-B: accepting only UTF-8 for now! (affects string and char16):

// Create value per type

switch (type)

{

case Type::BOOLEAN:

case CIMTYPE_BOOLEAN:

{

if (strcmp(valueString, "TRUE") == 0)

if (System::strcasecmp(valueString, "TRUE") == 0)

return Value(true);

return CIMValue(true);

else if (strcmp(valueString, "FALSE") == 0)

else if (System::strcasecmp(valueString, "FALSE") == 0)

return Value(false);

return CIMValue(false);

else

throw XmlSemanticError(

{

lineNumber, "Bad boolean value");

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_BOOLEAN_VALUE",

"Invalid boolean value");

throw XmlSemanticError(lineNumber, mlParms);

}

case Type::STRING:

case CIMTYPE_STRING:

{

return Value(valueString);

return CIMValue(String(valueString));

}

case Type::CHAR16:

case CIMTYPE_CHAR16:

{

if (strlen(valueString) != 1)

// Converts UTF-8 to UTF-16

throw XmlSemanticError(lineNumber, "Bad char16 value");

String tmp(valueString);

if (tmp.size() != 1)

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_CHAR16_VALUE",

"Invalid char16 value");

throw XmlSemanticError(lineNumber, mlParms);

}

return Value(Char16(valueString[0]));

return CIMValue(tmp[0]);

}

case Type::UINT8:

case CIMTYPE_UINT8:

case Type::UINT16:

case CIMTYPE_UINT16:

case Type::UINT32:

case CIMTYPE_UINT32:

case Type::UINT64:

case CIMTYPE_UINT64:

{

Uint64 x;

if (!stringToUnsignedInteger(valueString, x))

{

throw XmlSemanticError(

MessageLoaderParms mlParms(

lineNumber, "Bad unsigned integer value");

"Common.XmlReader.INVALID_UI_VALUE",

"Invalid unsigned integer value");

throw XmlSemanticError(lineNumber, mlParms);

}

switch (type)

{

case Type::UINT8: return Value(Uint8(x));

case CIMTYPE_UINT8:

case Type::UINT16: return Value(Uint16(x));

{

case Type::UINT32: return Value(Uint32(x));

if (!StringConversion::checkUintBounds(x, type))

case Type::UINT64: return Value(Uint64(x));

{

MessageLoaderParms mlParms(

"Common.XmlReader.U8_VALUE_OUT_OF_RANGE",

"Uint8 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Uint8(x));

}

case CIMTYPE_UINT16:

{

if (!StringConversion::checkUintBounds(x, type))

{

MessageLoaderParms mlParms(

"Common.XmlReader.U16_VALUE_OUT_OF_RANGE",

"Uint16 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Uint16(x));

}

case CIMTYPE_UINT32:

{

if (!StringConversion::checkUintBounds(x, type))

{

MessageLoaderParms mlParms(

"Common.XmlReader.U32_VALUE_OUT_OF_RANGE",

"Uint32 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Uint32(x));

}

case CIMTYPE_UINT64: return CIMValue(Uint64(x));

default: break;

}

case Type::SINT8:

case CIMTYPE_SINT8:

case Type::SINT16:

case CIMTYPE_SINT16:

case Type::SINT32:

case CIMTYPE_SINT32:

case Type::SINT64:

case CIMTYPE_SINT64:

{

Sint64 x;

if (!stringToSignedInteger(valueString, x))

{

throw XmlSemanticError(

MessageLoaderParms mlParms(

lineNumber, "Bad signed integer value");

"Common.XmlReader.INVALID_SI_VALUE",

"Invalid signed integer value");

throw XmlSemanticError(lineNumber, mlParms);

}

switch (type)

{

case Type::SINT8: return Value(Sint8(x));

case CIMTYPE_SINT8:

case Type::SINT16: return Value(Sint16(x));

{

case Type::SINT32: return Value(Sint32(x));

if (!StringConversion::checkSintBounds(x, type))

case Type::SINT64: return Value(Sint64(x));

{

MessageLoaderParms mlParms(

"Common.XmlReader.S8_VALUE_OUT_OF_RANGE",

"Sint8 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Sint8(x));

}

case CIMTYPE_SINT16:

{

if (!StringConversion::checkSintBounds(x, type))

{

MessageLoaderParms mlParms(

"Common.XmlReader.S16_VALUE_OUT_OF_RANGE",

"Sint16 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Sint16(x));

}

case CIMTYPE_SINT32:

{

if (!StringConversion::checkSintBounds(x, type))

{

MessageLoaderParms mlParms(

"Common.XmlReader.S32_VALUE_OUT_OF_RANGE",

"Sint32 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Sint32(x));

}

case CIMTYPE_SINT64: return CIMValue(Sint64(x));

default: break;

}

case Type::DATETIME:

case CIMTYPE_DATETIME:

{

DateTime tmp;

CIMDateTime tmp;

try

{

// KS 20021002 - Exception if no datetime value. Test for

// zero length and leave the NULL value in the variable

// Bugzilla 137 Adds the following if line.

// Expect this to become permanent but test only for now

#ifdef PEGASUS_SNIA_INTEROP_TEST

if (strlen(valueString) != 0)

#endif

tmp.set(valueString);

}

catch (BadDateTimeFormat&)

catch (InvalidDateTimeFormatException&)

{

throw XmlSemanticError(lineNumber, "Bad datetime value");

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_DATETIME_VALUE",

"Invalid datetime value");

throw XmlSemanticError(lineNumber, mlParms);

}

return Value(tmp);

return CIMValue(tmp);

}

case Type::REAL32:

case CIMTYPE_REAL32:

{

Real64 x;

if (!stringToReal(valueString, x))

if (!StringConversion::stringToReal64(valueString, x))

throw XmlSemanticError(lineNumber, "Bad real value");

{

MessageLoaderParms mlParms(

return Value(Real32(x));

"Common.XmlReader.INVALID_RN_VALUE",

"Invalid real number value");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Real32(x));

}

case Type::REAL64:

case CIMTYPE_REAL64:

{

Real64 x;

if (!stringToReal(valueString, x))

if (!StringConversion::stringToReal64(valueString, x))

throw XmlSemanticError(lineNumber, "Bad real value");

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_RN_VALUE",

"Invalid real number value");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(x);

}

// PEP 194:

// Note that "object" (ie. CIMTYPE_OBJECT) is not a real CIM datatype, but

// just a Pegasus internal representation of an embedded object. However,

// this case is used when decoding string representations of embedded objects.

case CIMTYPE_OBJECT:

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

case CIMTYPE_INSTANCE:

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

{

CIMObject x;

if (*valueString == '\0')

{

return CIMValue(type, false, 0);

}

else

{

// Convert the non-NULL string to a CIMObject (containing

// either a CIMInstance or a CIMClass).

return Value(x);

// First we need to create a new "temporary" XmlParser that is

// just the value of the Embedded Object in String

// representation.

AutoArrayPtr<char> tmp_buffer(

new char[strlen(valueString) + 1]);

strcpy(tmp_buffer.get(), valueString);

XmlParser tmp_parser(tmp_buffer.get());

// The next bit of logic constructs a CIMObject from the

// Embedded Object String. It is similar to the method

// XmlReader::getValueObjectElement().

CIMInstance cimInstance;

CIMClass cimClass;

if (XmlReader::getInstanceElement(tmp_parser, cimInstance))

{

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

if (type == CIMTYPE_INSTANCE)

return CIMValue(cimInstance);

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

x = CIMObject(cimInstance);

}

else if (XmlReader::getClassElement(tmp_parser, cimClass))

{

x = CIMObject(cimClass);

}

else

{

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

if (type == CIMTYPE_OBJECT)

{

// change "element" to "embedded object"

MessageLoaderParms mlParms(

"Common.XmlReader."

"EXPECTED_INSTANCE_OR_CLASS_ELEMENT",

"Expected INSTANCE or CLASS element");

throw XmlValidationError(lineNumber, mlParms);

}

else

{

// change "element" to "embedded object"

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"Expected INSTANCE element");

throw XmlValidationError(lineNumber, mlParms);

}

#else

// change "element" to "embedded object"

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCE_OR_CLASS_ELEMENT",

"Expected INSTANCE or CLASS element");

throw XmlValidationError(lineNumber, mlParms);

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

}

// Ok, now we can delete the storage for the temporary

// XmlParser.

tmp_buffer.reset();

}

return CIMValue(x);

}

default:

break;

}

throw XmlSemanticError(lineNumber, "malformed XML");

MessageLoaderParms mlParms(

"Common.XmlReader.MALFORMED_XML",

"malformed XML");

throw XmlSemanticError(lineNumber, mlParms);

return false;

}

//------------------------------------------------------------------------------

// skipElement()

//------------------------------------------------------------------------------

void XmlReader::skipElement(

XmlParser& parser,

XmlEntry& entry)

{

const char * tag_name = entry.text;

if (entry.type == XmlEntry::EMPTY_TAG)

{

return;

}

while (testStartTagOrEmptyTag(parser, entry))

{

skipElement(parser, entry);

}

if (testContentOrCData(parser, entry))

{

; // skip

}

expectEndTag(parser, tag_name);

return;

}

//------------------------------------------------------------------------------

// getValueElement()

// <!ELEMENT VALUE (#PCDATA)>

// Return: false if no value element.

//------------------------------------------------------------------------------

Boolean XmlReader::getValueElement(

XmlParser& parser,

Type type,

CIMType type,

Value& value)

CIMValue& value)

{

// Get VALUE start tag:

// Get VALUE start tag: Return false if no VALUE start Tag

XmlEntry entry;

if (!testStartTagOrEmptyTag(parser, entry, "VALUE"))

{

return false;

}

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

// Get VALUE content:

const char* valueString = "";

if (!empty)

{

if (testContentOrCData(parser, entry))

{

valueString = entry.text;

}

expectEndTag(parser, "VALUE");

}

#ifdef PEGASUS_SNIA_INTEROP_TEST

// KS 20021004 - tries to put value in even if empty.

// Think this is general problem with empty value

// Need to check meaning of (#PCDATA) - Does it allow empty.

// Bugzilla tbd

if (!empty)

#endif

value = stringToValue(parser.getLine(), valueString,type);

return true;

}

//------------------------------------------------------------------------------

// getStringValueElement()

// <!ELEMENT VALUE (#PCDATA)>

//------------------------------------------------------------------------------

Boolean XmlReader::getStringValueElement(

XmlParser& parser,

String& str,

Boolean required)

{

XmlEntry entry;

if (!testStartTagOrEmptyTag(parser, entry, "VALUE"))

{

if (required)

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_VALUE_ELEMENT",

"Expected VALUE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

return false;

}

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

const char* valueString = "";

Line 925

Line 1276

expectEndTag(parser, "VALUE");

}

value = stringToValue(parser.getLine(), valueString,type);

str = String(valueString);

return true;

}

//----------------------------------------------------------------------------

// getPropertyValue

// Use: Decode property value from SetProperty request and

// GetProperty response.

// PropertyValue is one of:

// <!ELEMENT VALUE.ARRAY (VALUE*)>

// <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME|

// <!ELEMENT VALUE.ARRAY (VALUE*)>

// <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME|

// INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)>

// <!ELEMENT VALUE.REFARRAY (VALUE.REFERENCE*)>

//----------------------------------------------------------------------------

Boolean XmlReader::getPropertyValue(

XmlParser& parser,

CIMValue& cimValue)

{

// Can not test for value type, so assume String

const CIMType type = CIMTYPE_STRING;

// Test for VALUE element

if (XmlReader::getValueElement(parser, type, cimValue))

{

return true;

}

// Test for VALUE.ARRAY element

if (XmlReader::getValueArrayElement(parser, type, cimValue))

{

return true;

}

// Test for VALUE.REFERENCE element

CIMObjectPath reference;

if (XmlReader::getValueReferenceElement(parser, reference))

{

cimValue.set(reference);

return true;

}

// Test for VALUE.REFARRAY element

if (XmlReader::getValueReferenceArrayElement(parser, cimValue))

{

return true;

}

return false;

}

//------------------------------------------------------------------------------

// stringArrayToValue()

Line 936

Line 1343

//------------------------------------------------------------------------------

template<class T>

Value StringArrayToValueAux(

CIMValue StringArrayToValueAux(

Uint32 lineNumber,

const Array<const char*>& stringArray,

Type type,

CIMType type,

T*)

{

Array<T> array;

for (Uint32 i = 0, n = stringArray.getSize(); i < n; i++)

for (Uint32 i = 0, n = stringArray.size(); i < n; i++)

{

Value value = XmlReader::stringToValue(

CIMValue value = XmlReader::stringToValue(

lineNumber, stringArray[i], type);

T x;

Line 954

Line 1361

array.append(x);

}

return Value(array);

return CIMValue(array);

}

Value XmlReader::stringArrayToValue(

CIMValue XmlReader::stringArrayToValue(

Uint32 lineNumber,

const Array<const char*>& array,

Type type)

CIMType type)

{

switch (type)

{

case Type::BOOLEAN:

case CIMTYPE_BOOLEAN:

return StringArrayToValueAux(lineNumber, array, type, (Boolean*)0);

case Type::STRING:

case CIMTYPE_STRING:

return StringArrayToValueAux(lineNumber, array, type, (String*)0);

case Type::CHAR16:

case CIMTYPE_CHAR16:

return StringArrayToValueAux(lineNumber, array, type, (Char16*)0);

case Type::UINT8:

case CIMTYPE_UINT8:

return StringArrayToValueAux(lineNumber, array, type, (Uint8*)0);

case Type::UINT16:

case CIMTYPE_UINT16:

return StringArrayToValueAux(lineNumber, array, type, (Uint16*)0);

case Type::UINT32:

case CIMTYPE_UINT32:

return StringArrayToValueAux(lineNumber, array, type, (Uint32*)0);

case Type::UINT64:

case CIMTYPE_UINT64:

return StringArrayToValueAux(lineNumber, array, type, (Uint64*)0);

case Type::SINT8:

case CIMTYPE_SINT8:

return StringArrayToValueAux(lineNumber, array, type, (Sint8*)0);

case Type::SINT16:

case CIMTYPE_SINT16:

return StringArrayToValueAux(lineNumber, array, type, (Sint16*)0);

case Type::SINT32:

case CIMTYPE_SINT32:

return StringArrayToValueAux(lineNumber, array, type, (Sint32*)0);

case Type::SINT64:

case CIMTYPE_SINT64:

return StringArrayToValueAux(lineNumber, array, type, (Sint64*)0);

case Type::DATETIME:

case CIMTYPE_DATETIME:

return StringArrayToValueAux(lineNumber, array, type, (DateTime*)0);

return StringArrayToValueAux(

lineNumber, array, type, (CIMDateTime*)0);

case Type::REAL32:

case CIMTYPE_REAL32:

return StringArrayToValueAux(lineNumber, array, type, (Real32*)0);

case Type::REAL64:

case CIMTYPE_REAL64:

return StringArrayToValueAux(lineNumber, array, type, (Real64*)0);

// PEP 194:

// Note that "object" (ie. CIMTYPE_OBJECT) is not a real CIM datatype, but

// just a Pegasus internal representation of an embedded object. However,

// this case is used when decoding string representations of embedded objects.

case CIMTYPE_OBJECT:

return StringArrayToValueAux(

lineNumber, array, type, (CIMObject*)0);

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

case CIMTYPE_INSTANCE:

return StringArrayToValueAux(

lineNumber, array, type, (CIMInstance*)0);

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

default:

break;

}

// Unreachable:

return Value();

return CIMValue();

}

//------------------------------------------------------------------------------

Line 1020

Line 1441

// <!ELEMENT VALUE.ARRAY (VALUE*)>

// Return: Boolean. Returns false if there is no VALUE.ARRAY start element

//------------------------------------------------------------------------------

Boolean XmlReader::getValueArrayElement(

XmlParser& parser,

Type type,

CIMType type,

Value& value)

CIMValue& value)

{

// Clears any values from the Array. Assumes this is array CIMValue

value.clear();

// Get VALUE.ARRAY open tag:

XmlEntry entry;

Array<const char*> stringArray;

// If no VALUE.ARRAY start tag, return false

if (!testStartTagOrEmptyTag(parser, entry, "VALUE.ARRAY"))

return false;

if (entry.type == XmlEntry::EMPTY_TAG)

if (entry.type != XmlEntry::EMPTY_TAG)

return true;

{

// For each VALUE element:

Array<const char*> stringArray;

while (testStartTagOrEmptyTag(parser, entry, "VALUE"))

{

if (entry.type == XmlEntry::EMPTY_TAG)

Line 1060

Line 1483

}

expectEndTag(parser, "VALUE.ARRAY");

}

value = stringArrayToValue(parser.getLine(), stringArray, type);

return true;

Line 1077

Line 1501

//------------------------------------------------------------------------------

Uint32 XmlReader::getFlavor(

CIMFlavor XmlReader::getFlavor(

XmlEntry& entry,

Uint32 lineNumber,

const char* tagName)

Line 1102

Line 1526

Boolean translatable = getCimBooleanAttribute(

lineNumber, entry, tagName, "TRANSLATABLE", false, false);

Uint32 flavor = 0;

// Start with CIMFlavor::NONE. Defaults are specified in the

// getCimBooleanAttribute() calls above.

CIMFlavor flavor = CIMFlavor (CIMFlavor::NONE);

if (overridable)

flavor |= Flavor::OVERRIDABLE;

flavor.addFlavor (CIMFlavor::OVERRIDABLE);

else

flavor.addFlavor (CIMFlavor::DISABLEOVERRIDE);

if (toSubClass)

flavor |= Flavor::TOSUBCLASS;

flavor.addFlavor (CIMFlavor::TOSUBCLASS);

else

flavor.addFlavor (CIMFlavor::RESTRICTED);

if (toInstance)

flavor |= Flavor::TOINSTANCE;

flavor.addFlavor (CIMFlavor::TOINSTANCE);

if (translatable)

flavor |= Flavor::TRANSLATABLE;

flavor.addFlavor (CIMFlavor::TRANSLATABLE);

return flavor;

}

Line 1136

Line 1566

//------------------------------------------------------------------------------

Uint32 XmlReader::getOptionalScope(XmlParser& parser)

CIMScope XmlReader::getOptionalScope(XmlParser& parser)

{

XmlEntry entry;

CIMScope scope;

if (!parser.next(entry))

return false;

return scope; // No SCOPE element found; return the empty scope

Boolean isEmptyTag = entry.type == XmlEntry::EMPTY_TAG;

Line 1149

Line 1580

entry.type != XmlEntry::START_TAG) ||

strcmp(entry.text, "SCOPE") != 0)

{

// No SCOPE element found; return the empty scope

parser.putBack(entry);

return 0;

return scope;

}

Uint32 line = parser.getLine();

Uint32 scope = 0;

if (getCimBooleanAttribute(line, entry, "SCOPE", "CLASS", false, false))

scope |= Scope::CLASS;

scope.addScope (CIMScope::CLASS);

if (getCimBooleanAttribute(

line, entry, "SCOPE", "ASSOCIATION", false, false))

scope |= Scope::ASSOCIATION;

scope.addScope (CIMScope::ASSOCIATION);

if (getCimBooleanAttribute(

line, entry, "SCOPE", "REFERENCE", false, false))

scope |= Scope::REFERENCE;

scope.addScope (CIMScope::REFERENCE);

if (getCimBooleanAttribute(line, entry, "SCOPE", "PROPERTY", false, false))

scope |= Scope::PROPERTY;

scope.addScope (CIMScope::PROPERTY);

if (getCimBooleanAttribute(line, entry, "SCOPE", "METHOD", false, false))

scope |= Scope::METHOD;

scope.addScope (CIMScope::METHOD);

if (getCimBooleanAttribute(line, entry, "SCOPE", "PARAMETER", false, false))

scope |= Scope::PARAMETER;

scope.addScope (CIMScope::PARAMETER);

if (getCimBooleanAttribute(line, entry, "SCOPE", "INDICATION",false, false))

scope |= Scope::INDICATION;

scope.addScope (CIMScope::INDICATION);

if (!isEmptyTag)

expectEndTag(parser, "SCOPE");

Line 1189

Line 1620

// getQualifierElement()

// <!ELEMENT QUALIFIER (VALUE|VALUE.ARRAY)>

// <!ELEMENT QUALIFIER (VALUE|VALUE.ARRAY)?>

// <!ATTLIST QUALIFIER

// %CIMName;

// %CIMType; #REQUIRED

Line 1200

Line 1631

Boolean XmlReader::getQualifierElement(

XmlParser& parser,

Qualifier& qualifier)

CIMQualifier& qualifier)

{

// Get QUALIFIER element:

XmlEntry entry;

if (!testStartTag(parser, entry, "QUALIFIER"))

if (!testStartTagOrEmptyTag(parser, entry, "QUALIFIER"))

return false;

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

// Get QUALIFIER.NAME attribute:

String name = getCimNameAttribute(parser.getLine(), entry, "QUALIFIER");

CIMName name = getCimNameAttribute(parser.getLine(), entry, "QUALIFIER");

// Get QUALIFIER.TYPE attribute:

Type type = getCimTypeAttribute(parser.getLine(), entry, "QUALIFIER");

CIMType type;

getCimTypeAttribute(parser.getLine(), entry, type, "QUALIFIER");

// Get QUALIFIER.PROPAGATED

Line 1223

Line 1657

// Get flavor oriented attributes:

Uint32 flavor = getFlavor(entry, parser.getLine(), "QUALIFIER");

CIMFlavor flavor = getFlavor(entry, parser.getLine(), "QUALIFIER");

// Get VALUE or VALUE.ARRAY element:

Value value;

CIMValue value;

if (empty)

{

value.setNullValue(type, false);

}

else

{

if (!getValueElement(parser, type, value) &&

!getValueArrayElement(parser, type, value))

{

throw XmlSemanticError(parser.getLine(),

value.setNullValue(type, false);

"Expected VALUE or VALUE.ARRAY element");

}

// Expect </QUALIFIER>:

expectEndTag(parser, "QUALIFIER");

}

// Build qualifier:

qualifier = Qualifier(name, value, flavor, propagated);

qualifier = CIMQualifier(name, value, flavor, propagated);

return true;

}

Line 1255

Line 1695

template<class CONTAINER>

void getQualifierElements(XmlParser& parser, CONTAINER& container)

{

Qualifier qualifier;

CIMQualifier qualifier;

while (XmlReader::getQualifierElement(parser, qualifier))

{

Line 1263

Line 1703

{

container.addQualifier(qualifier);

}

catch (AlreadyExists&)

catch (AlreadyExistsException&)

{

throw XmlSemanticError(parser.getLine(), "duplicate qualifier");

MessageLoaderParms mlParms(

"Common.XmlReader.DUPLICATE_QUALIFIER",

"duplicate qualifier");

throw XmlSemanticError(parser.getLine(), mlParms);

}

Line 1279

Line 1722

// %CIMName;

// %ClassOrigin;

// %Propagated;

// %EmbeddedObject; #IMPLIED

// %CIMType; #REQUIRED>

//------------------------------------------------------------------------------

Boolean XmlReader::getPropertyElement(XmlParser& parser, Property& property)

Boolean XmlReader::getPropertyElement(XmlParser& parser, CIMProperty& property)

{

XmlEntry entry;

Line 1294

Line 1738

// Get PROPERTY.NAME attribute:

String name = getCimNameAttribute(parser.getLine(), entry, "PROPERTY");

CIMName name = getCimNameAttribute(parser.getLine(), entry, "PROPERTY");

// Get PROPERTY.CLASSORIGIN attribute:

String classOrigin =

CIMName classOrigin =

getClassOriginAttribute(parser.getLine(), entry, "PROPERTY");

// Get PROPERTY.PROPAGATED

Line 1306

Line 1750

Boolean propagated = getCimBooleanAttribute(

parser.getLine(), entry, "PROPERTY", "PROPAGATED", false, false);

// Get PROPERTY.EmbeddedObject attribute:

String embeddedObject = getEmbeddedObjectAttribute(

parser.getLine(), entry, "PROPERTY");

// Get PROPERTY.TYPE attribute:

Type type = getCimTypeAttribute(parser.getLine(), entry, "PROPERTY");

CIMType type;

getCimTypeAttribute(parser.getLine(), entry, type, "PROPERTY");

// Create property:

// Create property: Sets type and !isarray

Value value;

CIMValue value(type, false);

value.setNullValue(type, false);

property = CIMProperty(name, value, 0, CIMName(), classOrigin, propagated);

property = Property(

name, value, 0, String(), classOrigin, propagated);

if (!empty)

{

// Get qualifiers:

// Get qualifiers. We need to do this before checking for the

// property as an embedded object, because we need to also check

// for the EmbeddedObject qualifier.

getQualifierElements(parser, property);

}

Boolean embeddedObjectQualifierValue = false;

Uint32 ix = property.findQualifier(CIMName("EmbeddedObject"));

if (ix != PEG_NOT_FOUND)

{

property.getQualifier(ix).getValue().get(embeddedObjectQualifierValue);

}

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

String embeddedInstanceQualifierValue;

ix = property.findQualifier(CIMName("EmbeddedInstance"));

if (ix != PEG_NOT_FOUND)

{

property.getQualifier(ix).getValue().get(

embeddedInstanceQualifierValue);

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

// If the EmbeddedObject attribute is present with value "object"

// or the EmbeddedObject qualifier exists on this property with value "true"

// then convert the EmbeddedObject-encoded string into a CIMObject

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

Boolean isEmbeddedObject = String::equal(embeddedObject, "object") ||

embeddedObjectQualifierValue;

Boolean isEmbeddedInstance = String::equal(embeddedObject, "instance") ||

embeddedInstanceQualifierValue.size() > 0;

if (isEmbeddedObject || isEmbeddedInstance)

{

// The EmbeddedObject attribute is only valid on Properties of type

// string

if (type == CIMTYPE_STRING)

{

if (isEmbeddedObject)

type = CIMTYPE_OBJECT;

else

type = CIMTYPE_INSTANCE;

CIMValue new_value(type, false);

CIMProperty new_property = CIMProperty(

name, new_value, 0, CIMName(), classOrigin, propagated);

// Copy the qualifiers from the String property to the CIMObject

// property.

for (Uint32 ix = 0; ix < property.getQualifierCount(); ++ix)

{

// All properties are copied, including the EmbeddedObject

// qualifier. This way we don't have to keep track to know

// that the EmbeddedObject qualifier needs to be added back

// during the encode step.

new_property.addQualifier(property.getQualifier(ix));

}

value = new_value;

property = new_property;

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on string types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#else

if (String::equal(embeddedObject, "object") || embeddedObjectQualifierValue)

{

// The EmbeddedObject attribute is only valid on Properties of type

// string

if (type == CIMTYPE_STRING)

{

type = CIMTYPE_OBJECT;

CIMValue new_value(type, false);

CIMProperty new_property = CIMProperty(

name, new_value, 0, CIMName(), classOrigin, propagated);

// Get value:

// Copy the qualifiers from the String property to the CIMObject

// property.

for (Uint32 ix = 0; ix < property.getQualifierCount(); ++ix)

{

// All properties are copied, including the EmbeddedObject

// qualifier. This way we don't have to keep track to know

// that the EmbeddedObject qualifier needs to be added back

// during the encode step.

new_property.addQualifier(property.getQualifier(ix));

}

value = new_value;

property = new_property;

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on string types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

// Continue on to get property value, if not empty.

if (!empty)

{

if (getValueElement(parser, type, value))

property.setValue(value);

expectEndTag(parser, "PROPERTY");

}

Line 1358

Line 1902

Uint64 arraySize;

if (!stringToUnsignedInteger(tmp, arraySize) || arraySize == 0)

if (!stringToUnsignedInteger(tmp, arraySize) || (arraySize == 0) ||

!StringConversion::checkUintBounds(arraySize, CIMTYPE_UINT32))

{

char message[128];

sprintf(message, "Illegal value for %s.%s", tagName, "ARRAYSIZE");

sprintf(message, "%s.%s", tagName, "ARRAYSIZE");

throw XmlSemanticError(lineNumber, message);

MessageLoaderParms mlParms(

"Common.XmlReader.ILLEGAL_VALUE",

"Illegal value for $0",

message);

throw XmlSemanticError(lineNumber, mlParms);

}

value = Uint32(arraySize);

Line 1379

Line 1929

// %CIMType; #REQUIRED

// %ArraySize;

// %ClassOrigin;

// %Propagated;>

// %Propagated;

// %EmbeddedObject; #IMPLIED>

//------------------------------------------------------------------------------

Boolean XmlReader::getPropertyArrayElement(

XmlParser& parser,

Property& property)

CIMProperty& property)

{

// Get PROPERTY element:

Line 1398

Line 1949

// Get PROPERTY.NAME attribute:

String name =

CIMName name =

getCimNameAttribute(parser.getLine(), entry, "PROPERTY.ARRAY");

// Get PROPERTY.TYPE attribute:

Type type = getCimTypeAttribute(parser.getLine(), entry, "PROPERTY.ARRAY");

CIMType type;

getCimTypeAttribute(parser.getLine(), entry, type, "PROPERTY.ARRAY");

// Get PROPERTY.ARRAYSIZE attribute:

Line 1412

Line 1964

// Get PROPERTY.CLASSORIGIN attribute:

String classOrigin

CIMName classOrigin =

= getClassOriginAttribute(parser.getLine(), entry, "PROPERTY.ARRAY");

getClassOriginAttribute(parser.getLine(), entry, "PROPERTY.ARRAY");

// Get PROPERTY.ARRAY.PROPAGATED

Boolean propagated = getCimBooleanAttribute(

parser.getLine(), entry, "PROPERTY.ARRAY", "PROPAGATED", false, false);

parser.getLine(),

entry,

"PROPERTY.ARRAY",

"PROPAGATED",

false,

false);

// Get PROPERTY.EmbeddedObject attribute:

String embeddedObject = getEmbeddedObjectAttribute(

parser.getLine(), entry, "PROPERTY.ARRAY");

// Create property:

Value nullValue;

CIMValue value(type, true, arraySize);

nullValue.setNullValue(type, true, arraySize);

property = CIMProperty(

property = Property(

name, value, arraySize, CIMName(), classOrigin, propagated);

name, nullValue, arraySize, String(), classOrigin, propagated);

if (!empty)

{

// Get qualifiers:

getQualifierElements(parser, property);

}

Boolean embeddedObjectQualifierValue = false;

Uint32 ix = property.findQualifier(CIMName("EmbeddedObject"));

if (ix != PEG_NOT_FOUND)

{

property.getQualifier(ix).getValue().get(embeddedObjectQualifierValue);

}

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

String embeddedInstanceQualifierValue;

ix = property.findQualifier(CIMName("EmbeddedInstance"));

if (ix != PEG_NOT_FOUND)

{

property.getQualifier(ix).getValue().get(

embeddedInstanceQualifierValue);

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

// If the EmbeddedObject attribute is present with value "object"

// or the EmbeddedObject qualifier exists on this property with value "true"

// then

// Convert the EmbeddedObject-encoded string into a CIMObject

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

Boolean isEmbeddedObject = String::equal(embeddedObject, "object") ||

embeddedObjectQualifierValue;

Boolean isEmbeddedInstance = String::equal(embeddedObject, "instance") ||

embeddedInstanceQualifierValue.size() > 0;

if (isEmbeddedObject || isEmbeddedInstance)

{

// The EmbeddedObject attribute is only valid on Properties of type

// string

if (type == CIMTYPE_STRING)

{

if (isEmbeddedObject)

type = CIMTYPE_OBJECT;

else

type = CIMTYPE_INSTANCE;

CIMValue new_value(type, true, arraySize);

CIMProperty new_property = CIMProperty(

name, new_value, arraySize, CIMName(), classOrigin, propagated);

// Copy the qualifiers from the String property to the CIMObject

// property.

for (Uint32 ix = 0; ix < property.getQualifierCount(); ++ix)

{

// All properties are copied, including the EmbeddedObject

// qualifier. This way we don't have to keep track to know

// that the EmbeddedObject qualifier needs to be added back

// during the encode step.

new_property.addQualifier(property.getQualifier(ix));

}

// Get value:

value = new_value;

property = new_property;

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on string types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#else

if (String::equal(embeddedObject, "object") || embeddedObjectQualifierValue)

{

// The EmbeddedObject attribute is only valid on Properties of type

// string

if (type == CIMTYPE_STRING)

{

type = CIMTYPE_OBJECT;

CIMValue new_value(type, true, arraySize);

CIMProperty new_property = CIMProperty(

name, new_value, arraySize, CIMName(), classOrigin, propagated);

Value value;

// Copy the qualifiers from the String property to the CIMObject

// property.

for (Uint32 ix = 0; ix < property.getQualifierCount(); ++ix)

{

// All properties are copied, including the EmbeddedObject

// qualifier. This way we don't have to keep track to know

// that the EmbeddedObject qualifier needs to be added back

// during the encode step.

new_property.addQualifier(property.getQualifier(ix));

}

value = new_value;

property = new_property;

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on string types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

// Continue on to get property array value, if not empty.

// Else not an embedded object, if not empty, get the property array value.

if (!empty)

{

if (getValueArrayElement(parser, type, value))

{

if (arraySize && arraySize != value.getArraySize())

{

throw XmlSemanticError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.ARRAY_SIZE_DIFFERENT",

"ARRAYSIZE attribute and value-array size are different");

throw XmlSemanticError(parser.getLine(), mlParms);

}

property.setValue(value);

}

expectEndTag(parser, "PROPERTY.ARRAY");

}

Line 1470

Line 2127

if (!testStartTag(parser, entry, "HOST"))

return false;

#ifdef PEGASUS_SNIA_INTEROP_TEST

// Temp code to allow empty HOST field.

// SNIA CIMOMs return empty field particularly on enumerateinstance.

// Simply substitute a string for the empty.

if (!parser.next(entry))

throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine());

if (entry.type == XmlEntry::CONTENT)

host = String(entry.text);

else

{

parser.putBack(entry);

host = "HOSTNAMEINSERTEDBYPEGASUSCLIENT";

}

#else

if (!parser.next(entry) || entry.type != XmlEntry::CONTENT)

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CONTENT_ELEMENT",

"expected content of HOST element");

throw XmlValidationError(parser.getLine(), mlParms);

}

host = entry.text;

host = String(entry.text);

#endif

expectEndTag(parser, "HOST");

return true;

}

Line 1494

Line 2169

Boolean XmlReader::getNameSpaceElement(

XmlParser& parser,

String& nameSpaceComponent)

CIMName& nameSpaceComponent)

{

XmlEntry entry;

Line 1529

Line 2204

if (!testStartTag(parser, entry, "LOCALNAMESPACEPATH"))

return false;

String nameSpaceComponent;

CIMName nameSpaceComponent;

while (getNameSpaceElement(parser, nameSpaceComponent))

{

if (nameSpace.getLength())

if (nameSpace.size())

nameSpace += '/';

nameSpace.append('/');

nameSpace += nameSpaceComponent;

nameSpace.append(nameSpaceComponent.getString());

}

if (!nameSpace.getLength())

if (!nameSpace.size())

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_NAMESPACE_ELEMENTS",

"Expected one or more NAMESPACE elements within "

"LOCALNAMESPACEPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

expectEndTag(parser, "LOCALNAMESPACEPATH");

Line 1572

Line 2249

return false;

if (!getHostElement(parser, host))

throw XmlValidationError(parser.getLine(), "expected HOST element");

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_HOST_ELEMENT",

"expected HOST element");

throw XmlValidationError(parser.getLine(), mlParms);

}

if (!getLocalNameSpacePathElement(parser, nameSpace))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_LOCALNAMESPACEPATH_ELEMENT",

"expected LOCALNAMESPACEPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

expectEndTag(parser, "NAMESPACEPATH");

Line 1596

Line 2280

Boolean XmlReader::getClassNameElement(

XmlParser& parser,

String& className,

CIMName& className,

Boolean required)

{

XmlEntry entry;

Line 1605

Line 2289

{

if (required)

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CLASSNAME_ELEMENT",

"expected CLASSNAME element");

throw XmlValidationError(parser.getLine(), mlParms);

}

else

return false;

}

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

className = getCimNameAttribute(

parser.getLine(), entry, "CLASSNAME", true);

parser.getLine(), entry, "CLASSNAME", false);

if (!empty)

expectEndTag(parser, "CLASSNAME");

Line 1631

Line 2316

//------------------------------------------------------------------------------

KeyBinding::Type XmlReader::getValueTypeAttribute(

CIMKeyBinding::Type XmlReader::getValueTypeAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName)

Line 1639

Line 2324

String tmp;

if (!entry.getAttributeValue("VALUETYPE", tmp))

return KeyBinding::STRING;

return CIMKeyBinding::STRING;

if (tmp == "string")

if (String::equal(tmp, "string"))

return KeyBinding::STRING;

return CIMKeyBinding::STRING;

else if (tmp == "boolean")

else if (String::equal(tmp, "boolean"))

return KeyBinding::BOOLEAN;

return CIMKeyBinding::BOOLEAN;

else if (tmp == "numeric")

else if (String::equal(tmp, "numeric"))

return KeyBinding::NUMERIC;

return CIMKeyBinding::NUMERIC;

char buffer[MESSAGE_SIZE];

sprintf(buffer, "%s.VALUETYPE", elementName);

sprintf(buffer,

MessageLoaderParms mlParms(

"Illegal value for %s.VALUETYPE attribute; "

"Common.XmlReader.ILLEGAL_VALUE_FOR_CIMVALUE_ATTRIBUTE",

"Value must be one of \"string\", \"boolean\", or \"numeric\"",

"Illegal value for $0 attribute; CIMValue must be one of \"string\", "

elementName);

"\"boolean\", or \"numeric\"",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

throw XmlSemanticError(lineNumber, buffer);

return CIMKeyBinding::BOOLEAN;

return KeyBinding::BOOLEAN;

}

//------------------------------------------------------------------------------

Line 1667

Line 2354

// <!ATTLIST KEYVALUE

// VALUETYPE (string|boolean|numeric) 'string'>

// ATTN-B: VALUE.REFERENCE ignored above; can't understand why it is needed!

//------------------------------------------------------------------------------

Boolean XmlReader::getKeyValueElement(

XmlParser& parser,

KeyBinding::Type& type,

CIMKeyBinding::Type& type,

String& value)

{

XmlEntry entry;

Line 1693

Line 2378

throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine());

if (entry.type == XmlEntry::CONTENT)

value = entry.text;

value = String(entry.text);

else

parser.putBack(entry);

Line 1711

Line 2396

// <!ATTLIST KEYBINDING

// %CIMName;>

// ATTN-B: VALUE.REFERENCE ignored above; can't understand why it is needed!

//------------------------------------------------------------------------------

Boolean XmlReader::getKeyBindingElement(

XmlParser& parser,

String& name,

CIMName& name,

String& value,

KeyBinding::Type& type)

CIMKeyBinding::Type& type)

{

XmlEntry entry;

Line 1729

Line 2412

name = getCimNameAttribute(parser.getLine(), entry, "KEYBINDING");

if (!getKeyValueElement(parser, type, value))

throw XmlValidationError(parser.getLine(), "Expected KEYVALUE element");

{

CIMObjectPath reference;

if (!getValueReferenceElement(parser, reference))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_KEYVALUE_OR_REFERENCE_ELEMENT",

"Expected KEYVALUE or VALUE.REFERENCE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

type = CIMKeyBinding::REFERENCE;

value = reference.toString();

}

expectEndTag(parser, "KEYBINDING");

return true;

Line 1743

Line 2439

// <!ATTLIST INSTANCENAME

// %ClassName;>

// ATTN-B: VALUE.REFERENCE sub-element not accepted yet.

// Note: An empty key name is used in the keyBinding when the INSTANCENAME is

// ATTN-B: KEYVALUE sub-element nothandled yet.

// specified using a KEYVALUE or a VALUE.REFERENCE.

//------------------------------------------------------------------------------

Boolean XmlReader::getInstanceNameElement(

XmlParser& parser,

String& className,

Array<KeyBinding>& keyBindings)

Array<CIMKeyBinding>& keyBindings)

{

className.clear();

keyBindings.clear();

Line 1765

Line 2461

className = getClassNameAttribute(parser.getLine(), entry, "INSTANCENAME");

if (!empty)

if (empty)

{

String name;

return true;

KeyBinding::Type type;

}

CIMName name;

CIMKeyBinding::Type type;

String value;

CIMObjectPath reference;

if (getKeyValueElement(parser, type, value))

{

// Use empty key name because none was specified

keyBindings.append(CIMKeyBinding(name, value, type));

}

else if (getValueReferenceElement(parser, reference))

{

// Use empty key name because none was specified

type = CIMKeyBinding::REFERENCE;

value = reference.toString();

keyBindings.append(CIMKeyBinding(name, value, type));

}

else

{

while (getKeyBindingElement(parser, name, value, type))

keyBindings.append(KeyBinding(name, value, type));

keyBindings.append(CIMKeyBinding(name, value, type));

}

if (!empty)

expectEndTag(parser, "INSTANCENAME");

}

return true;

}

//------------------------------------------------------------------------------

Boolean XmlReader::getInstanceNameElement(

XmlParser& parser,

// getInstancePathElement()

CIMObjectPath& instanceName)

{

String className;

Array<CIMKeyBinding> keyBindings;

if (!XmlReader::getInstanceNameElement(parser, className, keyBindings))

return false;

instanceName.set(String(), CIMNamespaceName(), className, keyBindings);

return true;

}

//------------------------------------------------------------------------------

// getInstancePathElement()

// <!ELEMENT INSTANCEPATH (NAMESPACEPATH,INSTANCENAME)>

//------------------------------------------------------------------------------

Boolean XmlReader::getInstancePathElement(

XmlParser& parser,

Reference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 1803

Line 2530

if (!getNameSpacePathElement(parser, host, nameSpace))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_NAMESPACEPATH_ELEMENT",

"expected NAMESPACEPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

String className;

Array<KeyBinding> keyBindings;

Array<CIMKeyBinding> keyBindings;

if (!getInstanceNameElement(parser, className, keyBindings))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCENAME_ELEMENT",

"expected INSTANCENAME element");

throw XmlValidationError(parser.getLine(), mlParms);

}

reference.set(host, nameSpace, className, keyBindings);

Line 1832

Line 2563

Boolean XmlReader::getLocalInstancePathElement(

XmlParser& parser,

Reference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 1843

Line 2574

if (!getLocalNameSpacePathElement(parser, nameSpace))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_LOCALNAMESPACEPATH_ELEMENT",

"expected LOCALNAMESPACEPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

String className;

Array<KeyBinding> keyBindings;

Array<CIMKeyBinding> keyBindings;

if (!getInstanceNameElement(parser, className, keyBindings))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCENAME_ELEMENT",

"expected INSTANCENAME element");

throw XmlValidationError(parser.getLine(), mlParms);

}

reference.set(String(), nameSpace, className, keyBindings);

Line 1872

Line 2607

Boolean XmlReader::getClassPathElement(

XmlParser& parser,

Reference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 1884

Line 2619

if (!getNameSpacePathElement(parser, host, nameSpace))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_NAMESPACEPATH_ELEMENT",

"expected NAMESPACEPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

String className;

CIMName className;

if (!getClassNameElement(parser, className))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CLASSNAME_ELEMENT",

"expected CLASSNAME element");

throw XmlValidationError(parser.getLine(), mlParms);

}

reference.set(host, nameSpace, className);

Line 1912

Line 2651

Boolean XmlReader::getLocalClassPathElement(

XmlParser& parser,

Reference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 1923

Line 2662

if (!getLocalNameSpacePathElement(parser, nameSpace))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_LOCALNAMESPACEPATH_ELEMENT",

"expected LOCALNAMESPACEPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

String className;

CIMName className;

if (!getClassNameElement(parser, className))

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CLASSNAME_ELEMENT",

"expected CLASSNAME element");

throw XmlValidationError(parser.getLine(), mlParms);

}

reference.set(String(), nameSpace, className);

Line 1954

Line 2697

Boolean XmlReader::getValueReferenceElement(

XmlParser& parser,

Reference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 1967

Line 2710

if (entry.type != XmlEntry::START_TAG &&

entry.type != XmlEntry::EMPTY_TAG)

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Expected one of the following start tags: "

"Common.XmlReader.EXPECTED_START_TAGS",

"CLASSPATH, LOCALCLASSPATH, CLASSNAME, INSTANCEPATH, "

"Expected one of the following start tags: CLASSPATH, "

"LOCALINSTANCEPATH, INSTANCENAME");

"LOCALCLASSPATH, CLASSNAME, INSTANCEPATH, LOCALINSTANCEPATH, "

"INSTANCENAME");

throw XmlValidationError(parser.getLine(), mlParms);

}

if (strcmp(entry.text, "CLASSPATH") == 0)

Line 1986

Line 2731

else if (strcmp(entry.text, "CLASSNAME") == 0)

{

parser.putBack(entry);

String className;

CIMName className;

getClassNameElement(parser, className);

reference.set(String(), String(), className);

reference.set(String(), CIMNamespaceName(), className);

}

else if (strcmp(entry.text, "INSTANCEPATH") == 0)

{

Line 2004

Line 2749

{

parser.putBack(entry);

String className;

Array<KeyBinding> keyBindings;

Array<CIMKeyBinding> keyBindings;

getInstanceNameElement(parser, className, keyBindings);

reference.set(String(), String(), className, keyBindings);

reference.set(String(), CIMNamespaceName(), className, keyBindings);

}

expectEndTag(parser, "VALUE.REFERENCE");

Line 2015

Line 2760

//------------------------------------------------------------------------------

// getValueReferenceArrayElement()

// <!ELEMENT VALUE.REFARRAY (VALUE.REFERENCE*)>

//------------------------------------------------------------------------------

Boolean XmlReader::getValueReferenceArrayElement(

XmlParser& parser,

CIMValue& value)

{

XmlEntry entry;

Array<CIMObjectPath> referenceArray;

CIMObjectPath reference;

value.clear();

// Get VALUE.REFARRAY open tag:

if (!testStartTagOrEmptyTag(parser, entry, "VALUE.REFARRAY"))

return false;

if (entry.type != XmlEntry::EMPTY_TAG)

{

// For each VALUE.REFERENCE element:

while (getValueReferenceElement(parser, reference))

{

referenceArray.append(reference);

}

expectEndTag(parser, "VALUE.REFARRAY");

}

value.set(referenceArray);

return true;

}

//------------------------------------------------------------------------------

// getPropertyReferenceElement()

// <!ELEMENT PROPERTY.REFERENCE (QUALIFIER*,(VALUE.REFERENCE)?)>

Line 2028

Line 2812

Boolean XmlReader::getPropertyReferenceElement(

XmlParser& parser,

Property& property)

CIMProperty& property)

{

XmlEntry entry;

Line 2039

Line 2823

// Get PROPERTY.NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

parser.getLine(), entry, "PROPERTY.REFERENCE");

// Get PROPERTY.REFERENCECLASS attribute:

String referenceClass = getReferenceClassAttribute(

CIMName referenceClass = getReferenceClassAttribute(

parser.getLine(), entry, "PROPERTY.REFERENCE");

// Get PROPERTY.CLASSORIGIN attribute:

String classOrigin =

CIMName classOrigin =

getClassOriginAttribute(parser.getLine(), entry, "PROPERTY.REFERENCE");

// Get PROPERTY.PROPAGATED

Line 2059

Line 2843

// Create property:

Value value;

CIMValue value = CIMValue(CIMTYPE_REFERENCE, false, 0);

value.set(Reference());

// value.set(CIMObjectPath());

property = Property(

property = CIMProperty(

name, value, 0, referenceClass, classOrigin, propagated);

if (!empty)

{

getQualifierElements(parser, property);

Reference reference;

CIMObjectPath reference;

if (getValueReferenceElement(parser, reference))

property.setValue(reference);

Line 2088

Line 2872

template<class CONTAINER>

void GetPropertyElements(XmlParser& parser, CONTAINER& container)

{

Property property;

CIMProperty property;

while (XmlReader::getPropertyElement(parser, property) ||

XmlReader::getPropertyArrayElement(parser, property) ||

Line 2098

Line 2882

{

container.addProperty(property);

}

catch (AlreadyExists&)

catch (AlreadyExistsException&)

{

throw XmlSemanticError(parser.getLine(), "duplicate property");

MessageLoaderParms mlParms(

"Common.XmlReader.DUPLICATE_PROPERTY",

"duplicate property");

throw XmlSemanticError(parser.getLine(), mlParms);

}

Line 2118

Line 2905

Boolean XmlReader::getParameterElement(

XmlParser& parser,

Parameter& parameter)

CIMParameter& parameter)

{

XmlEntry entry;

Line 2129

Line 2916

// Get PARAMETER.NAME attribute:

String name = getCimNameAttribute(parser.getLine(), entry, "PARAMETER");

CIMName name = getCimNameAttribute(parser.getLine(), entry, "PARAMETER");

// Get PARAMETER.TYPE attribute:

Type type = getCimTypeAttribute(parser.getLine(), entry, "PARAMETER");

CIMType type;

getCimTypeAttribute(parser.getLine(), entry, type, "PARAMETER");

// Create parameter:

parameter = Parameter(name, type);

parameter = CIMParameter(name, type);

if (!empty)

{

Line 2163

Line 2951

Boolean XmlReader::getParameterArrayElement(

XmlParser& parser,

Parameter& parameter)

CIMParameter& parameter)

{

XmlEntry entry;

Line 2174

Line 2962

// Get PARAMETER.ARRAY.NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

parser.getLine(), entry, "PARAMETER.ARRAY");

// Get PARAMETER.ARRAY.TYPE attribute:

Type type = getCimTypeAttribute(parser.getLine(), entry, "PARAMETER.ARRAY");

CIMType type;

getCimTypeAttribute(parser.getLine(), entry, type, "PARAMETER.ARRAY");

// Get PARAMETER.ARRAYSIZE attribute:

Line 2188

Line 2977

// Create parameter:

parameter = Parameter(name, type, true, arraySize);

parameter = CIMParameter(name, type, true, arraySize);

if (!empty)

{

Line 2213

Line 3002

Boolean XmlReader::getParameterReferenceElement(

XmlParser& parser,

Parameter& parameter)

CIMParameter& parameter)

{

XmlEntry entry;

Line 2224

Line 3013

// Get PARAMETER.NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

parser.getLine(), entry, "PARAMETER.REFERENCE");

// Get PARAMETER.REFERENCECLASS attribute:

String referenceClass = getReferenceClassAttribute(

CIMName referenceClass = getReferenceClassAttribute(

parser.getLine(), entry, "PARAMETER.REFERENCE");

// Create parameter:

parameter = Parameter(name, Type::REFERENCE, false, 0, referenceClass);

parameter = CIMParameter(name, CIMTYPE_REFERENCE, false, 0, referenceClass);

if (!empty)

{

Line 2247

Line 3036

//------------------------------------------------------------------------------

// getParameterReferenceArrayElement()

// <!ELEMENT PARAMETER.REFARRAY (QUALIFIER*)>

// <!ATTLIST PARAMETER.REFARRAY

// %CIMName;

// %ReferenceClass;

// %ArraySize;>

//------------------------------------------------------------------------------

Boolean XmlReader::getParameterReferenceArrayElement(

XmlParser& parser,

CIMParameter& parameter)

{

XmlEntry entry;

if (!testStartTagOrEmptyTag(parser, entry, "PARAMETER.REFARRAY"))

return false;

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

// Get PARAMETER.NAME attribute:

CIMName name = getCimNameAttribute(

parser.getLine(), entry, "PARAMETER.REFARRAY");

// Get PARAMETER.REFERENCECLASS attribute:

CIMName referenceClass = getReferenceClassAttribute(

parser.getLine(), entry, "PARAMETER.REFARRAY");

// Get PARAMETER.ARRAYSIZE attribute:

Uint32 arraySize = 0;

getArraySizeAttribute(

parser.getLine(), entry, "PARAMETER.REFARRAY", arraySize);

// Create parameter:

parameter = CIMParameter(

name, CIMTYPE_REFERENCE, true, arraySize, referenceClass);

if (!empty)

{

getQualifierElements(parser, parameter);

expectEndTag(parser, "PARAMETER.REFARRAY");

}

return true;

}

//------------------------------------------------------------------------------

// GetParameterElements()

//------------------------------------------------------------------------------

Line 2254

Line 3096

template<class CONTAINER>

void GetParameterElements(XmlParser& parser, CONTAINER& container)

{

Parameter parameter;

CIMParameter parameter;

while (XmlReader::getParameterElement(parser, parameter) ||

XmlReader::getParameterArrayElement(parser, parameter) ||

XmlReader::getParameterReferenceElement(parser, parameter))

XmlReader::getParameterReferenceElement(parser, parameter) ||

XmlReader::getParameterReferenceArrayElement(parser, parameter))

{

try

{

container.addParameter(parameter);

}

catch (AlreadyExists&)

catch (AlreadyExistsException&)

{

throw XmlSemanticError(parser.getLine(), "duplicate parameter");

MessageLoaderParms mlParms(

"Common.XmlReader.DUPLICATE_PARAMETER",

"duplicate parameter");

throw XmlSemanticError(parser.getLine(), mlParms);

}

Line 2287

Line 3133

Boolean XmlReader::getQualifierDeclElement(

XmlParser& parser,

QualifierDecl& qualifierDecl)

CIMQualifierDecl& qualifierDecl)

{

XmlEntry entry;

Line 2298

Line 3144

// Get NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

parser.getLine(), entry, "QUALIFIER.DECLARATION");

// Get TYPE attribute:

Type type = getCimTypeAttribute(

CIMType type;

parser.getLine(), entry, "QUALIFIER.DECLARATION");

getCimTypeAttribute(parser.getLine(), entry, type, "QUALIFIER.DECLARATION");

// Get ISARRAY attribute:

Boolean isArray = false;

Boolean isArray = getCimBooleanAttribute(

getIsArrayAttribute(

parser.getLine(), entry, "QUALIFIER.DECLARATION", "ISARRAY",

parser.getLine(), entry, "QUALIFIER.DECLARATION", isArray);

false, false);

// Get ARRAYSIZE attribute:

Line 2320

Line 3166

// Get flavor oriented attributes:

Uint32 flavor = getFlavor(entry,parser.getLine(), "QUALIFIER.DECLARATION");

CIMFlavor flavor = getFlavor (entry, parser.getLine (),

"QUALIFIER.DECLARATION");

// No need to look for interior elements if empty tag:

Uint32 scope = Scope::NONE;

CIMScope scope = CIMScope ();

Value value;

CIMValue value;

Boolean gotValue = false;

if (!empty)

{

Line 2339

Line 3187

{

if (!isArray)

{

throw XmlSemanticError(parser.getLine(),

MessageLoaderParms mlParms(

"VALUE.ARRAY element encountered without "

"Common.XmlReader.ARRAY_WITHOUT_ISARRAY",

"ISARRAY attribute");

"VALUE.ARRAY element encountered without ISARRAY "

"attribute");

throw XmlSemanticError(parser.getLine(), mlParms);

}

if (arraySize && arraySize != value.getArraySize())

{

throw XmlSemanticError(parser.getLine(),

MessageLoaderParms mlParms(

"VALUE.ARRAY size is not the same as "

"Common.XmlReader.ARRAY_SIZE_NOT_SAME",

"ARRAYSIZE attribute");

"VALUE.ARRAY size is not the same as ARRAYSIZE attribute");

throw XmlSemanticError(parser.getLine(), mlParms);

}

gotValue = true;

}

else if (getValueElement(parser, type, value))

{

if (isArray)

{

throw XmlSemanticError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.ARRAY_ATTRIBUTE_DIFFERENT",

"ISARRAY attribute used but VALUE element encountered");

throw XmlSemanticError(parser.getLine(), mlParms);

}

gotValue = true;

}

// Now get the closing tag:

Line 2365

Line 3222

expectEndTag(parser, "QUALIFIER.DECLARATION");

}

if (value.getType() == Type::NONE)

if (!gotValue)

{

if (isArray)

value.setNullValue(type, true, arraySize);

Line 2373

Line 3230

value.setNullValue(type, false);

}

QualifierDecl tmp(name, value, scope, flavor, arraySize);

CIMQualifierDecl tmp(name, value, scope, flavor, arraySize);

qualifierDecl = QualifierDecl(name, value, scope, flavor, arraySize);

qualifierDecl = CIMQualifierDecl(name, value, scope, flavor, arraySize);

return true;

}

Line 2391

Line 3248

//------------------------------------------------------------------------------

Boolean XmlReader::getMethodElement(XmlParser& parser, Method& method)

Boolean XmlReader::getMethodElement(XmlParser& parser, CIMMethod& method)

{

XmlEntry entry;

Line 2400

Line 3257

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

String name = getCimNameAttribute(parser.getLine(), entry, "PROPERTY");

CIMName name = getCimNameAttribute(parser.getLine(), entry, "METHOD");

Type type = getCimTypeAttribute(parser.getLine(), entry, "PROPERTY");

CIMType type;

getCimTypeAttribute(parser.getLine(), entry, type, "METHOD");

String classOrigin =

CIMName classOrigin =

getClassOriginAttribute(parser.getLine(), entry, "PROPERTY");

getClassOriginAttribute(parser.getLine(), entry, "METHOD");

Boolean propagated = getCimBooleanAttribute(

parser.getLine(), entry, "PROPERTY", "PROPAGATED", false, false);

parser.getLine(), entry, "METHOD", "PROPAGATED", false, false);

method = Method(name, type, classOrigin, propagated);

method = CIMMethod(name, type, classOrigin, propagated);

if (!empty)

{

// ATTN-RK-P2-20020219: Decoding algorithm must not depend on the

// ordering of qualifiers and parameters.

getQualifierElements(parser, method);

GetParameterElements(parser, method);

Line 2433

Line 3293

//------------------------------------------------------------------------------

Boolean XmlReader::getClassElement(XmlParser& parser, ClassDecl& classDecl)

Boolean XmlReader::getClassElement(XmlParser& parser, CIMClass& cimClass)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "CLASS"))

if (!testStartTagOrEmptyTag(parser, entry, "CLASS"))

return false;

String name = getCimNameAttribute(parser.getLine(), entry, "CLASS");

CIMName name = getCimNameAttribute(parser.getLine(), entry, "CLASS");

String superClass = getSuperClassAttribute(parser.getLine(), entry,"CLASS");

CIMName superClass =

getSuperClassAttribute(parser.getLine(), entry,"CLASS");

classDecl = ClassDecl(name, superClass);

cimClass = CIMClass(name, superClass);

if (entry.type != XmlEntry::EMPTY_TAG)

{

// Get QUALIFIER elements:

getQualifierElements(parser, classDecl);

getQualifierElements(parser, cimClass);

// Get PROPERTY elements:

GetPropertyElements(parser, classDecl);

GetPropertyElements(parser, cimClass);

// Get METHOD elements:

Method method;

CIMMethod method;

while (getMethodElement(parser, method))

classDecl.addMethod(method);

cimClass.addMethod(method);

// Get CLASS end tag:

expectEndTag(parser, "CLASS");

}

return true;

}

Line 2480

Line 3344

Boolean XmlReader::getInstanceElement(

XmlParser& parser,

InstanceDecl& instanceDecl)

CIMInstance& cimInstance)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "INSTANCE"))

if (!testStartTagOrEmptyTag(parser, entry, "INSTANCE"))

return false;

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

String className = getClassNameAttribute(

parser.getLine(), entry, "INSTANCE");

instanceDecl = InstanceDecl(className);

cimInstance = CIMInstance(className);

if (!empty)

{

// Get QUALIFIER elements:

getQualifierElements(parser, cimInstance);

getQualifierElements(parser, instanceDecl);

// Get PROPERTY elements:

GetPropertyElements(parser, cimInstance);

GetPropertyElements(parser, instanceDecl);

// Get INSTANCE end tag:

expectEndTag(parser, "INSTANCE");

}

return true;

}

//------------------------------------------------------------------------------

// getNamedInstanceElement()

// <!ELEMENT VALUE.NAMEDINSTANCE (INSTANCENAME,INSTANCE)>

//------------------------------------------------------------------------------

Boolean XmlReader::getNamedInstanceElement(

XmlParser& parser,

CIMInstance& namedInstance)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "VALUE.NAMEDINSTANCE"))

return false;

CIMObjectPath instanceName;

// Get INSTANCENAME elements:

if (!getInstanceNameElement(parser, instanceName))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCENAME_ELEMENT",

"expected INSTANCENAME element");

throw XmlValidationError(parser.getLine(), mlParms);

}

// Get INSTANCE elements:

if (!getInstanceElement(parser, namedInstance))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"expected INSTANCE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

// Get VALUE.NAMEDINSTANCE end tag:

expectEndTag(parser, "VALUE.NAMEDINSTANCE");

namedInstance.setPath (instanceName);

return true;

}

//------------------------------------------------------------------------------

// getObject()

//------------------------------------------------------------------------------

void XmlReader::getObject(XmlParser& parser, CIMClass& x)

{

if (!getClassElement(parser, x))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CLASS_ELEMENT",

"expected CLASS element");

throw XmlValidationError(parser.getLine(), mlParms);

}

//------------------------------------------------------------------------------

// getObject()

//------------------------------------------------------------------------------

void XmlReader::getObject(XmlParser& parser, CIMInstance& x)

{

if (!getInstanceElement(parser, x))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"expected INSTANCE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

//------------------------------------------------------------------------------

// getObject()

//------------------------------------------------------------------------------

void XmlReader::getObject(XmlParser& parser, CIMQualifierDecl& x)

{

if (!getQualifierDeclElement(parser, x))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_QUALIFIER_DECLARATION_ELEMENT",

"expected QUALIFIER.DECLARATION element");

throw XmlValidationError(parser.getLine(), mlParms);

}

//------------------------------------------------------------------------------

// getMessageStartTag()

//------------------------------------------------------------------------------

Boolean XmlReader::getMessageStartTag(

XmlParser& parser,

Uint32& id,

String& id,

const char*& protocolVersion)

String& protocolVersion)

{

XmlEntry entry;

Line 2526

Line 3490

// Get MESSAGE.ID:

if (!entry.getAttributeValue("ID", id))

throw XmlValidationError(parser.getLine(),

{

"Bad or missing MESSAGE.ID attribute");

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_MISSING_MESSAGE_ID_ATTRIBUTE",

"Invalid or missing MESSAGE.ID attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

// Get MESSAGE.PROTOCOLVERSION:

if (!entry.getAttributeValue("PROTOCOLVERSION", protocolVersion))

throw XmlValidationError(parser.getLine(),

{

"Bad or missing MESSAGE.ID attribute");

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_MISSING_PROTOCOLVERSION_ATTRIBUTE",

"Invalid or missing MESSAGE.PROTOCOLVERSION attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

Line 2555

Line 3528

// Get IMETHODCALL.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

throw XmlValidationError(parser.getLine(),

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_IMETHODCALL_ATTRIBUTE",

"Missing IMETHODCALL.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

Line 2570

Line 3549

Boolean XmlReader::getIMethodResponseStartTag(

XmlParser& parser,

const char*& name)

const char*& name,

Boolean& isEmptyTag)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "IMETHODRESPONSE"))

if (!testStartTagOrEmptyTag(parser, entry, "IMETHODRESPONSE"))

return false;

isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG);

// Get IMETHODRESPONSE.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

throw XmlValidationError(parser.getLine(),

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_IMETHODRESPONSE_ATTRIBUTE",

"Missing IMETHODRESPONSE.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

Line 2594

Line 3581

Boolean XmlReader::getIParamValueTag(

XmlParser& parser,

const char*& name)

const char*& name,

Boolean& isEmptyTag)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "IPARAMVALUE"))

if (!testStartTagOrEmptyTag(parser, entry, "IPARAMVALUE"))

return false;

isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG);

// Get IPARAMVALUE.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

throw XmlValidationError(parser.getLine(),

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_IPARAMVALUE_ATTRIBUTE",

"Missing IPARAMVALUE.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

//------------------------------------------------------------------------------

// rejectNullIParamValue()

//------------------------------------------------------------------------------

void XmlReader::rejectNullIParamValue(

XmlParser& parser,

Boolean isEmptyTag,

const char* paramName)

{

if (isEmptyTag)

{

MessageLoaderParms mlParms("Common.XmlReader.INVALID_NULL_IPARAMVALUE",

"A null value is not valid for IPARAMVALUE \"$0\".",

paramName);

throw XmlValidationError(parser.getLine(), mlParms);

}

//------------------------------------------------------------------------------

// getBooleanValueElement()

// Get an elements like: "<VALUE>FALSE</VALUE>"

Line 2629

Line 3643

{

if (required)

{

throw XmlValidationError(parser.getLine(),

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_VALUE_ELEMENT",

"Expected VALUE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

return false;

}

expectContentOrCData(parser, entry);

if (strcmp(entry.text, "TRUE") == 0)

if (System::strcasecmp(entry.text, "TRUE") == 0)

result = true;

else if (strcmp(entry.text, "FALSE") == 0)

else if (System::strcasecmp(entry.text, "FALSE") == 0)

result = false;

else

throw XmlSemanticError(parser.getLine(),

{

"Bad value for VALUE element: must be \"TRUE\" or \"FALSE\"");

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_VALUE_FOR_VALUE_ELEMENT",

"Invalid value for VALUE element: must be \"TRUE\" or \"FALSE\"");

throw XmlSemanticError(parser.getLine(), mlParms);

}

expectEndTag(parser, "VALUE");

Line 2652

Line 3672

//------------------------------------------------------------------------------

// getErrorElement()

// DMTF CR Pending

// <!ELEMENT ERROR EMPTY>

// <!ELEMENT ERROR (INSTANCE*)>

// <!ATTLIST ERROR

// CODE CDATA #REQUIRED

// DESCRIPTION CDATA #IMPLIED>

Line 2663

Line 3683

Boolean XmlReader::getErrorElement(

XmlParser& parser,

CimException::Code& code,

CIMException& cimException,

const char*& description,

Boolean required)

{

XmlEntry entry;

Line 2672

Line 3691

if (!testStartTagOrEmptyTag(parser, entry, "ERROR"))

{

if (required)

throw XmlValidationError(parser.getLine(),"Expected ERROR element");

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_ERROR_ELEMENT",

"Expected ERROR element");

throw XmlValidationError(parser.getLine(), mlParms);

}

return false;

}

Line 2683

Line 3707

Uint32 tmpCode;

if (!entry.getAttributeValue("CODE", tmpCode))

throw XmlValidationError(

{

parser.getLine(), "missing ERROR.CODE attribute");

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_ERROR_CODE_ATTRIBUTE",

code = CimException::Code(tmpCode);

"missing ERROR.CODE attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

// Get ERROR.DESCRIPTION:

description = "";

String tmpDescription;

entry.getAttributeValue("DESCRIPTION", description);

entry.getAttributeValue("DESCRIPTION", tmpDescription);

cimException =

PEGASUS_CIM_EXCEPTION(CIMStatusCode(tmpCode), tmpDescription);

if (!empty)

{

CIMInstance instance;

while (getInstanceElement(parser, instance))

{

cimException.addError(instance);

}

expectEndTag(parser, "ERROR");

}

return true;

}

//------------------------------------------------------------------------------

// getValueObjectElement()

// <!ELEMENT VALUE.OBJECT (CLASS|INSTANCE)>

//------------------------------------------------------------------------------

Boolean XmlReader::getValueObjectElement(

XmlParser& parser,

CIMObject& object)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "VALUE.OBJECT"))

return false;

CIMInstance cimInstance;

CIMClass cimClass;

if (XmlReader::getInstanceElement(parser, cimInstance))

{

object = CIMObject(cimInstance);

}

else if (XmlReader::getClassElement(parser, cimClass))

{

object = CIMObject(cimClass);

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCE_OR_CLASS_ELEMENT",

"Expected INSTANCE or CLASS element");

throw XmlValidationError(parser.getLine(), mlParms);

}

expectEndTag(parser, "VALUE.OBJECT");

return true;

}

//------------------------------------------------------------------------------

// getValueObjectWithPathElement()

// <!ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH,CLASS)|(INSTANCEPATH,INSTANCE))>

//------------------------------------------------------------------------------

Boolean XmlReader::getValueObjectWithPathElement(

XmlParser& parser,

CIMObject& objectWithPath)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "VALUE.OBJECTWITHPATH"))

return false;

CIMObjectPath reference;

Boolean isInstance = false;

if (XmlReader::getInstancePathElement(parser, reference))

isInstance = true;

else if (!XmlReader::getClassPathElement(parser, reference))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCEPATH_OR_CLASSPATH_ELEMENT",

"Expected INSTANCEPATH or CLASSPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

if (isInstance)

{

CIMInstance cimInstance;

if (!XmlReader::getInstanceElement(parser, cimInstance))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"Expected INSTANCE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

objectWithPath = CIMObject (cimInstance);

objectWithPath.setPath (reference);

}

else

{

CIMClass cimClass;

if (!XmlReader::getClassElement(parser, cimClass))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CLASS_ELEMENT",

"Expected CLASS element");

throw XmlValidationError(parser.getLine(), mlParms);

}

objectWithPath = CIMObject (cimClass);

objectWithPath.setPath (reference);

}

expectEndTag(parser, "VALUE.OBJECTWITHPATH");

return true;

}

//------------------------------------------------------------------------------

// getValueObjectWithLocalPathElement()

// <!ELEMENT VALUE.OBJECTWITHLOCALPATH

// ((LOCALCLASSPATH,CLASS)|(LOCALINSTANCEPATH,INSTANCE))>

//------------------------------------------------------------------------------

Boolean XmlReader::getValueObjectWithLocalPathElement(

XmlParser& parser,

CIMObject& objectWithPath)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "VALUE.OBJECTWITHLOCALPATH"))

return false;

CIMObjectPath reference;

Boolean isInstance = false;

if (XmlReader::getLocalInstancePathElement(parser, reference))

isInstance = true;

else if (!XmlReader::getLocalClassPathElement(parser, reference))

{

MessageLoaderParms mlParms(

"Common.XmlConstants.MISSING_ELEMENT_LOCALPATH",

MISSING_ELEMENT_LOCALPATH);

throw XmlValidationError(parser.getLine(), mlParms);

}

if (isInstance)

{

CIMInstance cimInstance;

if (!XmlReader::getInstanceElement(parser, cimInstance))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"Expected INSTANCE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

objectWithPath = CIMObject (cimInstance);

objectWithPath.setPath (reference);

}

else

{

CIMClass cimClass;

if (!XmlReader::getClassElement(parser, cimClass))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CLASS_ELEMENT",

"Expected CLASS element");

throw XmlValidationError(parser.getLine(), mlParms);

}

objectWithPath = CIMObject (cimClass);

objectWithPath.setPath (reference);

}

expectEndTag(parser, "VALUE.OBJECTWITHLOCALPATH");

return true;

}

//------------------------------------------------------------------------------

// getObjectArray()

// <object>

// (VALUE.OBJECT|VALUE.OBJECTWITHLOCALPATH|VALUE.OBJECTWITHPATH)

//------------------------------------------------------------------------------

void XmlReader::getObjectArray(

XmlParser& parser,

Array<CIMObject>& objectArray)

{

CIMObject object;

CIMObject objectWithPath;

objectArray.clear();

if (getValueObjectElement(parser, object))

{

objectArray.append(object);

while (getValueObjectElement(parser, object))

objectArray.append(object);

}

else if (getValueObjectWithPathElement(parser, objectWithPath))

{

objectArray.append(objectWithPath);

while (getValueObjectWithPathElement(parser, objectWithPath))

objectArray.append(objectWithPath);

}

else if (getValueObjectWithLocalPathElement(parser, objectWithPath))

{

objectArray.append(objectWithPath);

while (getValueObjectWithLocalPathElement(parser, objectWithPath))

objectArray.append(objectWithPath);

}

//------------------------------------------------------------------------------

// <objectName>: (CLASSNAME|INSTANCENAME)

//------------------------------------------------------------------------------

Boolean XmlReader::getObjectNameElement(

XmlParser& parser,

CIMObjectPath& objectName)

{

CIMName className;

if (getClassNameElement(parser, className, false))

{

objectName.set(String(), CIMNamespaceName(), className);

return true;

}

if (!getInstanceNameElement(parser, objectName))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_CLASSNAME_OR_INSTANCENAME_ELEMENT",

"Expected CLASSNAME or INSTANCENAME element");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

//------------------------------------------------------------------------------

// <!ELEMENT OBJECTPATH (INSTANCEPATH|CLASSPATH)>

//------------------------------------------------------------------------------

Boolean XmlReader::getObjectPathElement(

XmlParser& parser,

CIMObjectPath& objectPath)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "OBJECTPATH"))

return false;

if (!getClassPathElement(parser, objectPath) &&

!getInstancePathElement(parser, objectPath))

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_INSTANCEPATH_OR_CLASSPATH_ELEMENT",

"expected INSTANCEPATH or CLASSPATH element");

throw XmlValidationError(parser.getLine(), mlParms);

}

expectEndTag(parser, "OBJECTPATH");

return true;

}

//------------------------------------------------------------------------------

// getEMethodCallStartTag()

//------------------------------------------------------------------------------

Boolean XmlReader::getEMethodCallStartTag(

XmlParser& parser,

const char*& name)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "EXPMETHODCALL"))

return false;

// Get EXPMETHODCALL.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_EXPMETHODCALL_ATTRIBUTE",

"Missing EXPMETHODCALL.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

//------------------------------------------------------------------------------

// getEMethodResponseStartTag()

//------------------------------------------------------------------------------

Boolean XmlReader::getEMethodResponseStartTag(

XmlParser& parser,

const char*& name,

Boolean& isEmptyTag)

{

XmlEntry entry;

if (!testStartTagOrEmptyTag(parser, entry, "EXPMETHODRESPONSE"))

return false;

isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG);

// Get EXPMETHODRESPONSE.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_EXPMETHODRESPONSE_ATTRIBUTE",

"Missing EXPMETHODRESPONSE.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

//------------------------------------------------------------------------------

// getEParamValueTag()

//------------------------------------------------------------------------------

Boolean XmlReader::getEParamValueTag(

XmlParser& parser,

const char*& name)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "EXPPARAMVALUE"))

return false;

// Get EXPPARAMVALUE.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_EXPPARAMVALUE_ATTRIBUTE",

"Missing EXPPARAMVALUE.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

//------------------------------------------------------------------------------

// getMethodCallStartTag()

//------------------------------------------------------------------------------

Boolean XmlReader::getMethodCallStartTag(

XmlParser& parser,

const char*& name)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "METHODCALL"))

return false;

// Get METHODCALL.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_METHODCALL_ATTRIBUTE",

"Missing METHODCALL.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

//------------------------------------------------------------------------------

// getMethodResponseStartTag()

//------------------------------------------------------------------------------

Boolean XmlReader::getMethodResponseStartTag(

XmlParser& parser,

const char*& name,

Boolean& isEmptyTag)

{

XmlEntry entry;

if (!testStartTagOrEmptyTag(parser, entry, "METHODRESPONSE"))

return false;

isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG);

// Get METHODRESPONSE.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_METHODRESPONSE_ATTRIBUTE",

"Missing METHODRESPONSE.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

return true;

}

//------------------------------------------------------------------------------

// getParamValueElement()

// <!ELEMENT PARAMVALUE (VALUE|VALUE.REFERENCE|VALUE.ARRAY|VALUE.REFARRAY)?>

// <!ATTLIST PARAMVALUE

// %CIMName;

// %EmbeddedObject; #IMPLIED

// %ParamType;>

//------------------------------------------------------------------------------

Boolean XmlReader::getParamValueElement(

XmlParser& parser,

CIMParamValue& paramValue)

{

XmlEntry entry;

const char* name;

CIMType type=CIMTYPE_BOOLEAN;

CIMValue value;

if (!testStartTagOrEmptyTag(parser, entry, "PARAMVALUE"))

return false;

Boolean empty = entry.type == XmlEntry::EMPTY_TAG;

// Get PARAMVALUE.NAME attribute:

if (!entry.getAttributeValue("NAME", name))

{

MessageLoaderParms mlParms(

"Common.XmlReader.MISSING_PARAMVALUE_ATTRIBUTE",

"Missing PARAMVALUE.NAME attribute");

throw XmlValidationError(parser.getLine(), mlParms);

}

// Get PROPERTY.EmbeddedObject

String embeddedObject = getEmbeddedObjectAttribute(

parser.getLine(), entry, "PARAMVALUE");

// Get PARAMVALUE.PARAMTYPE attribute:

Boolean gotType = getCimTypeAttribute(parser.getLine(), entry, type,

"PARAMVALUE", "PARAMTYPE", false);

if (empty)

{

gotType = false; // Can't distinguish array and non-array types

}

else

{

// Parse VALUE.REFERENCE and VALUE.REFARRAY type

if ( (type == CIMTYPE_REFERENCE) || !gotType )

{

CIMObjectPath reference;

if (XmlReader::getValueReferenceElement(parser, reference))

{

value.set(reference);

type = CIMTYPE_REFERENCE;

gotType = true;

}

else if (XmlReader::getValueReferenceArrayElement(parser, value))

{

type = CIMTYPE_REFERENCE;

gotType = true;

}

else

{

gotType = false; // Can't distinguish array and non-array types

}

// Parse non-reference value

if ( type != CIMTYPE_REFERENCE )

{

CIMType effectiveType;

if (!gotType)

{

// If we don't know what type the value is, read it as a String

effectiveType = CIMTYPE_STRING;

}

else

{

effectiveType = type;

}

// If the EmbeddedObject attribute is present with value "object"

// then

// Convert the EmbeddedObject-encoded string into a CIMObject

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

Boolean isEmbeddedObject = String::equal(embeddedObject, "object");

Boolean isEmbeddedInstance =

String::equal(embeddedObject, "instance");

if (isEmbeddedObject || isEmbeddedInstance)

{

// The EmbeddedObject attribute is only valid on Parameters

// of type string

// The type must have been specified.

if (gotType && (type == CIMTYPE_STRING))

{

if (isEmbeddedObject)

// Used below by getValueElement() or

// getValueArrayElement()

effectiveType = CIMTYPE_OBJECT;

else

effectiveType = CIMTYPE_INSTANCE;

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on "

"string types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#else

if (String::equal(embeddedObject, "object"))

{

// The EmbeddedObject attribute is only valid on Parameters

// of type string

// The type must have been specified.

if (gotType && (type == CIMTYPE_STRING))

{

// Used below by getValueElement() or getValueArrayElement()

effectiveType = CIMTYPE_OBJECT;

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on "

"string types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

if (!XmlReader::getValueArrayElement(parser, effectiveType, value)

&& !XmlReader::getValueElement(parser, effectiveType, value))

{

gotType = false; // Can't distinguish array and non-array types

value.clear(); // Isn't necessary; should already be cleared

}

expectEndTag(parser, "PARAMVALUE");

}

paramValue = CIMParamValue(name, value, gotType);

return true;

}

//------------------------------------------------------------------------------

// getReturnValueElement()

// <!ELEMENT RETURNVALUE (VALUE|VALUE.REFERENCE)>

// <!ATTLIST RETURNVALUE

// %EmbeddedObject; #IMPLIED

// %ParamType;>

//------------------------------------------------------------------------------

Boolean XmlReader::getReturnValueElement(

XmlParser& parser,

CIMValue& returnValue)

{

XmlEntry entry;

CIMType type;

CIMValue value;

if (!testStartTag(parser, entry, "RETURNVALUE"))

return false;

// Get PROPERTY.EmbeddedObject

String embeddedObject = getEmbeddedObjectAttribute(

parser.getLine(), entry, "RETURNVALUE");

// Get RETURNVALUE.PARAMTYPE attribute:

// NOTE: Array type return values are not allowed (2/20/02)

Boolean gotType = getCimTypeAttribute(parser.getLine(), entry, type,

"RETURNVALUE", "PARAMTYPE", false);

// Parse VALUE.REFERENCE type

if ( (type == CIMTYPE_REFERENCE) || !gotType )

{

CIMObjectPath reference;

if (XmlReader::getValueReferenceElement(parser, reference))

{

returnValue.set(reference);

type = CIMTYPE_REFERENCE;

gotType = true;

}

else if (type == CIMTYPE_REFERENCE)

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_VALUE_REFERENCE_ELEMENT",

"expected VALUE.REFERENCE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

// Parse non-reference return value

if ( type != CIMTYPE_REFERENCE )

{

if (!gotType)

{

// If we don't know what type the value is, read it as a String

type = CIMTYPE_STRING;

}

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

Boolean isEmbeddedObject = String::equal(embeddedObject, "object");

Boolean isEmbeddedInstance = String::equal(embeddedObject, "instance");

if (isEmbeddedObject || isEmbeddedInstance)

{

if (gotType && (type == CIMTYPE_STRING))

{

if (isEmbeddedObject)

// Used below by getValueElement() or getValueArrayElement()

type = CIMTYPE_OBJECT;

else

type = CIMTYPE_INSTANCE;

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on string "

"types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#else

if (String::equal(embeddedObject, "object"))

{

if (gotType && (type == CIMTYPE_STRING))

{

type = CIMTYPE_OBJECT; // Used below by getValueElement()

}

else

{

MessageLoaderParms mlParms(

"Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

"The EmbeddedObject attribute is only valid on string "

"types.");

throw XmlValidationError(parser.getLine(), mlParms);

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

if ( !XmlReader::getValueElement(parser, type, returnValue) )

{

MessageLoaderParms mlParms(

"Common.XmlReader.EXPECTED_VALUE_ELEMENT",

"expected VALUE element");

throw XmlValidationError(parser.getLine(), mlParms);

}

expectEndTag(parser, "RETURNVALUE");

return true;

}

//-----------------------------------------------------------------------------

// The following is a common set of version tests used by the different

// Pegasus Request and Response Decoders

//------------------------------------------------------------------------------

// isSupportedCIMVersion()

// tests for valid CIMVersion number

// Reject cimVersion not in 2.[0-9]+

// CIMXML Secification, Version 2.2 Final, Sect 3.2.1.1

// The CIMVERSION attribute defines the version of the CIM Specification to

// which the XML Document conforms. It MUST be in the form of "M.N". Where

// M is the Major Version of the specification in numeric form and N is the

// minor version of the specification in numeric form. For example, "2.0",

// "2.1". Implementations must only validate the major version as all minor

// versions are backward compatible. Implementations may look at the minor

// version to determine additional capabilites.

//------------------------------------------------------------------------------

Boolean XmlReader::isSupportedCIMVersion(

const char* cimVersion)

{

Boolean cimVersionAccepted = false;

//printf("testCIMVersion %s \n", cimVersion);

if ((cimVersion[0] == '2') &&

(cimVersion[1] == '.') &&

(cimVersion[2] != 0))

{

// Verify that all characters after the '.' are digits

Uint32 index = 2;

while (isdigit(cimVersion[index]))

{

index++;

}

if (cimVersion[index] == 0)

{

cimVersionAccepted = true;

}

return cimVersionAccepted;

}

//------------------------------------------------------------------------------

// isSupportedProtocolVersion()

// tests for valid ProtocolVersion number

// Reject ProtocolVersion not 1.[0-9]

// cimxml spec 2.2 Final Section 3261

// The PROTOCOLVERSION attribute defines the version of the CIM Operations to

// which this message conforms. It MUST be in the form of "M.N". Where M is

// the Major Version of the specification in numeric form and N is the minor

// version of the specification in numeric form. For example, "1.0", "1.1".

// Implementations must only validate the major version as all minor versions

// are backward compatible. Implementations may look at the minor version to

// determine additional capabilites.

//------------------------------------------------------------------------------

Boolean XmlReader::isSupportedProtocolVersion(

const String& protocolVersion)

{

Boolean protocolVersionAccepted = false;

//cout << "testProtocolVersion " << protocolVersion << endl;

if ((protocolVersion.size() >= 3) &&

(protocolVersion[0] == '1') &&

(protocolVersion[1] == '.'))

{

// Verify that all characters after the '.' are digits

Uint32 index = 2;

while ((index < protocolVersion.size()) &&

(protocolVersion[index] >= '0') &&

(protocolVersion[index] <= '9'))

{

index++;

}

if (index == protocolVersion.size())

{

protocolVersionAccepted = true;

}

return protocolVersionAccepted;

}

//------------------------------------------------------------------------------

// isSupportedDTDVersion()

// Tests for Valid dtdVersion number

// We accept DTD version 2.[0-9]+ (see Bugzilla 1556)//

// CIM/XML Specification, V 2.2 Final, Section 3.2.1.1

// The DTDVERSION attribute defines the version of the CIM XML Mapping to

// which the XML Document conforms. It MUST be in the form of "M.N". Where

// M is the Major Version of the specification in numeric form and N is the

// minor version of the specification in numeric form. For example, "2.0",

// "2.1". Implementations must only validate the major version as all minor

// versions are backward compatible. Implementations may look at the minor

// version to determine additional capabilites.

//------------------------------------------------------------------------------

Boolean XmlReader::isSupportedDTDVersion(

const char* dtdVersion)

{

Boolean dtdVersionAccepted = false;

//printf("testDTDVersion %s \n", dtdVersion);

if ((dtdVersion[0] == '2') &&

(dtdVersion[1] == '.') &&

(dtdVersion[2] != 0))

{

// Verify that all characters after the '.' are digits

Uint32 index = 2;

while (isdigit(dtdVersion[index]))

{

index++;

}

if (dtdVersion[index] == 0)

{

dtdVersionAccepted = true;

}

return dtdVersionAccepted;

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.1.1.1
changed lines
	Added in v.1.129

No CVS admin address has been configured