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.22 and 1.75.2.1

version 1.22, 2001/07/10 06:43:28

version 1.75.2.1, 2002/10/28 15:43:24

Line 1

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

// 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"), to

Line 21

Line 23

// Author: Mike Brasher (mbrasher@bmc.com)

// Modified By:

// Modified By: Carol Ann Krug Graves, Hewlett-Packard Company

// (carolann_graves@hp.com)

// Nitin Upasani, Hewlett-Packard Company (Nitin_Upasani@hp.com)

// Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)

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

#include <Pegasus/Common/Config.h>

#include <cassert>

#include <cctype>

#include <cstdio>

#include <cstdlib>

#if defined(PEGASUS_OS_TYPE_UNIX)

#include <errno.h>

#endif

#include "CIMName.h"

#include "XmlReader.h"

#include "XmlWriter.h"

Line 37

Line 44

#include "CIMClass.h"

#include "CIMInstance.h"

#include "CIMObject.h"

#include "CIMParamValue.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)

Line 59

Line 73

throw XmlValidationError(parser.getLine(),

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

}

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

throw XmlValidationError(

parser.getLine(), "missing xml.version attribute");

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 171

Line 215

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

// testEndTag>()

// testEndTag()

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

Line 236

Line 280

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

// testCimStartTag()

// getCimStartTag()

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

// <!ATTRLIST CIM

Line 245

Line 289

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

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;

return true;

}

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

{

value = false;

return true;

}

char buffer[62];

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

throw XmlSemanticError(lineNumber, buffer);

return false;

}

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

Line 465

Line 466

// 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)">

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

CIMType XmlReader::getCimTypeAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* tagName)

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, "missing %s.%s attribute", tagName, attributeName);

throw XmlValidationError(lineNumber, message);

}

else

{

return CIMTYPE_NONE;

}

CIMType type = CIMType::NONE;

CIMType type = CIMTYPE_NONE;

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

type = CIMType::BOOLEAN;

type = CIMTYPE_BOOLEAN;

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

type = CIMType::STRING;

type = CIMTYPE_STRING;

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

type = CIMType::CHAR16;

type = CIMTYPE_CHAR16;

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

type = CIMType::UINT8;

type = CIMTYPE_UINT8;

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

type = CIMType::SINT8;

type = CIMTYPE_SINT8;

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

type = CIMType::UINT16;

type = CIMTYPE_UINT16;

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

type = CIMType::SINT16;

type = CIMTYPE_SINT16;

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

type = CIMType::UINT32;

type = CIMTYPE_UINT32;

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

type = CIMType::SINT32;

type = CIMTYPE_SINT32;

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

type = CIMType::UINT64;

type = CIMTYPE_UINT64;

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

type = CIMType::SINT64;

type = CIMTYPE_SINT64;

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

type = CIMType::DATETIME;

type = CIMTYPE_DATETIME;

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

type = CIMType::REAL32;

type = CIMTYPE_REAL32;

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

type = CIMType::REAL64;

type = CIMTYPE_REAL64;

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

type = CIMType::REFERENCE;

type = CIMTYPE_REFERENCE;

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

if ((type == CIMTYPE_NONE) ||

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

((type == CIMTYPE_REFERENCE) &&

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

if (type == CIMType::NONE)

{

char message[MESSAGE_SIZE];

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

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

attributeName);

throw XmlSemanticError(lineNumber, message);

}

Line 580

Line 599

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

{

// Check the string against the DMTF-defined grammar

const char* p = stringValue;

if (!*p)

Line 636

Line 658

if (*p)

return false;

// Do the conversion

char* end;

errno = 0;

x = strtod(stringValue, &end);

if (*end || (errno == ERANGE))

{

return false;

}

return true;

}

inline Uint8 _hexCharToNumeric(const char c)

{

Uint8 n;

if (isdigit(c))

n = (c - '0');

else if (isupper(c))

n = (c - 'A' + 10);

else // if (islower(c))

n = (c - 'a' + 10);

return n;

}

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

// stringToSignedInteger

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

// or

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

// ATTN-B: handle conversion from hexadecimal.

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

Boolean XmlReader::stringToSignedInteger(

Line 657

Line 703

x = 0;

const char* p = stringValue;

if (!*p)

if (!p || !*p)

return false;

// Skip optional sign:

Line 667

Line 713

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

p++;

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

if (*p == '0')

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

{

if ( (p[1] == 'x') || (p[1] == 'X') )

// Expect a positive decimal digit:

{

// Convert a hexadecimal string

const char* first = p;

// Skip over the "0x"

p+=2;

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

// At least one hexadecimal digit is required

if (!isxdigit(*p))

return false;

p++;

// Build the Sint64 as a negative number, regardless of the

// eventual sign (negative numbers can be bigger than positive ones)

// Expect zero or more digits:

// Add on each digit, checking for overflow errors

while (isxdigit(*p))

{

// Make sure we won't overflow when we multiply by 16

if (x < PEGASUS_LLONG_MIN/16)

{

return false;

}

x = x << 4;

while (isdigit(*p))

// Make sure we don't overflow when we add the next digit

p++;

Sint64 newDigit = Sint64(_hexCharToNumeric(*p++));

if (PEGASUS_LLONG_MIN - x > -newDigit)

{

return false;

}

x = x - newDigit;

}

// If we found a non-hexadecimal digit, report an error

if (*p)

return false;

const char* last = p;

// Return the integer to positive, if necessary, checking for an

// overflow error

if (!negative)

{

if (x == PEGASUS_LLONG_MIN)

{

return false;

}

x = -x;

}

return true;

}

else

{

// A decimal string that starts with '0' must be exactly "0".

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

}

// Expect a positive decimal digit:

// At least one decimal digit is required

if (!isdigit(*p))

return false;

while (first != last)

// Build the Sint64 as a negative number, regardless of the

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

// eventual sign (negative numbers can be bigger than positive ones)

if (negative)

// Add on each digit, checking for overflow errors

x = -x;

while (isdigit(*p))

{

// Make sure we won't overflow when we multiply by 10

if (x < PEGASUS_LLONG_MIN/10)

{

return false;

}

x = 10 * x;

// Make sure we won't overflow when we add the next digit

Sint64 newDigit = (*p++ - '0');

if (PEGASUS_LLONG_MIN - x > -newDigit)

{

return false;

}

x = x - newDigit;

}

// If we found a non-decimal digit, report an error

if (*p)

return false;

// Return the integer to positive, if necessary, checking for an

// overflow error

if (!negative)

{

if (x == PEGASUS_LLONG_MIN)

{

return false;

}

x = -x;

}

return true;

}

Line 704

Line 820

// stringToUnsignedInteger

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

// ( positiveDecimalDigit *decimalDigit | "0" )

// or

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

// ATTN-B: handle conversion from hexadecimal.

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

Boolean XmlReader::stringToUnsignedInteger(

Line 716

Line 833

x = 0;

const char* p = stringValue;

if (!*p)

if (!p || !*p)

return false;

// Skip optional sign:

if (*p == '0')

{

if ( (p[1] == 'x') || (p[1] == 'X') )

{

// Convert a hexadecimal string

// Skip over the "0x"

p+=2;

if (*p == '-')

// At least one hexadecimal digit is required

if (!*p)

return false;

if (*p == '+')

// Add on each digit, checking for overflow errors

p++;

while (isxdigit(*p))

{

// Make sure we won't overflow when we multiply by 16

if (x > PEGASUS_ULLONG_MAX/16)

{

return false;

}

x = x << 4;

// We can't overflow when we add the next digit

Uint64 newDigit = Uint64(_hexCharToNumeric(*p++));

if (PEGASUS_ULLONG_MAX - x < newDigit)

{

return false;

}

x = x + newDigit;

}

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

// If we found a non-hexadecimal digit, report an error

if (*p)

return false;

if (*p == '0')

return true;

}

else

{

// A decimal string that starts with '0' must be exactly "0".

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

}

// Expect a positive decimal digit:

const char* first = p;

// Add on each digit, checking for overflow errors

while (isdigit(*p))

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

{

// Make sure we won't overflow when we multiply by 10

if (x > PEGASUS_ULLONG_MAX/10)

{

return false;

}

x = 10 * x;

p++;

// Make sure we won't overflow when we add the next digit

Uint64 newDigit = (*p++ - '0');

// Expect zero or more digits:

if (PEGASUS_ULLONG_MAX - x < newDigit)

{

while (isdigit(*p))

return false;

p++;

}

x = x + newDigit;

}

// If we found a non-decimal digit, report an error

if (*p)

return false;

const char* last = p;

while (first != last)

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

return true;

}

Line 761

Line 913

// 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.

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

Line 773

Line 927

{

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

if (strlen(valueString)==0)

// Create value per type

{

switch (type)

{

case CIMType::BOOLEAN: return CIMValue(false);

case CIMType::STRING: return CIMValue(valueString);

case CIMType::CHAR16: return CIMValue(Char16('\0'));

case CIMType::UINT8: return CIMValue(Uint8(0));

case CIMType::UINT16: return CIMValue(Uint16(0));

case CIMType::UINT32: return CIMValue(Uint32(0));

case CIMType::UINT64: return CIMValue(Uint64(0));

case CIMType::SINT8: return CIMValue(Sint8(0));

case CIMType::SINT16: return CIMValue(Sint16(0));

case CIMType::SINT32: return CIMValue(Sint32(0));

case CIMType::SINT64: return CIMValue(Sint64(0));

case CIMType::REAL32: return CIMValue(Real32(0));

case CIMType::REAL64: return CIMValue(Real64(0));

}

switch (type)

{

case CIMType::BOOLEAN:

case CIMTYPE_BOOLEAN:

{

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

return CIMValue(true);

Line 806

Line 941

lineNumber, "Bad boolean value");

}

case CIMType::STRING:

case CIMTYPE_STRING:

{

return CIMValue(valueString);

return CIMValue(String(valueString));

}

case CIMType::CHAR16:

case CIMTYPE_CHAR16:

{

if (strlen(valueString) != 1)

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

Line 819

Line 954

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

}

case CIMType::UINT8:

case CIMTYPE_UINT8:

case CIMType::UINT16:

case CIMTYPE_UINT16:

case CIMType::UINT32:

case CIMTYPE_UINT32:

case CIMType::UINT64:

case CIMTYPE_UINT64:

{

Uint64 x;

Line 834

Line 969

switch (type)

{

case CIMType::UINT8: return CIMValue(Uint8(x));

case CIMTYPE_UINT8:

case CIMType::UINT16: return CIMValue(Uint16(x));

{

case CIMType::UINT32: return CIMValue(Uint32(x));

if (x >= (Uint64(1)<<8))

case CIMType::UINT64: return CIMValue(Uint64(x));

{

throw XmlSemanticError(

lineNumber, "Uint8 value out of range");

}

return CIMValue(Uint8(x));

}

case CIMTYPE_UINT16:

{

if (x >= (Uint64(1)<<16))

{

throw XmlSemanticError(

lineNumber, "Uint16 value out of range");

}

return CIMValue(Uint16(x));

}

case CIMTYPE_UINT32:

{

if (x >= (Uint64(1)<<32))

{

throw XmlSemanticError(

lineNumber, "Uint32 value out of range");

}

return CIMValue(Uint32(x));

}

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

default: break;

}

case CIMType::SINT8:

case CIMTYPE_SINT8:

case CIMType::SINT16:

case CIMTYPE_SINT16:

case CIMType::SINT32:

case CIMTYPE_SINT32:

case CIMType::SINT64:

case CIMTYPE_SINT64:

{

Sint64 x;

Line 857

Line 1016

switch (type)

{

case CIMType::SINT8: return CIMValue(Sint8(x));

case CIMTYPE_SINT8:

case CIMType::SINT16: return CIMValue(Sint16(x));

{

case CIMType::SINT32: return CIMValue(Sint32(x));

if( (x >= (Sint64(1)<<7)) || (x < (-(Sint64(1)<<7))) )

case CIMType::SINT64: return CIMValue(Sint64(x));

{

throw XmlSemanticError(

lineNumber, "Sint8 value out of range");

}

return CIMValue(Sint8(x));

}

case CIMTYPE_SINT16:

{

if( (x >= (Sint64(1)<<15)) || (x < (-(Sint64(1)<<15))) )

{

throw XmlSemanticError(

lineNumber, "Sint16 value out of range");

}

return CIMValue(Sint16(x));

}

case CIMTYPE_SINT32:

{

if( (x >= (Sint64(1)<<31)) || (x < (-(Sint64(1)<<31))) )

{

throw XmlSemanticError(

lineNumber, "Sint32 value out of range");

}

return CIMValue(Sint32(x));

}

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

default: break;

}

case CIMType::DATETIME:

case CIMTYPE_DATETIME:

{

CIMDateTime tmp;

Line 881

Line 1064

return CIMValue(tmp);

}

case CIMType::REAL32:

case CIMTYPE_REAL32:

{

Real64 x;

if (!stringToReal(valueString, x))

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

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

return CIMValue(Real32(x));

}

case CIMType::REAL64:

case CIMTYPE_REAL64:

{

Real64 x;

if (!stringToReal(valueString, x))

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

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

return CIMValue(x);

}

Line 915

Line 1098

// <!ELEMENT VALUE (#PCDATA)>

// Return: false if no value element.

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

Boolean XmlReader::getValueElement(

Line 922

Line 1107

CIMType type,

CIMValue& value)

{

// Get VALUE start tag:

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

XmlEntry entry;

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

Line 986

Line 1171

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

// getPropertyValue

// Use: Decode property value from getPropertyResponse

// Use: Decode property value from SetProperty request and

// Expect (ERROR|IRETURNVALUE).!ELEMENT VALUE (#PCDATA)>

// GetProperty response.

// PropertyValue is one of:

// PropertyValue:

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

// <!ELEMENT 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)

{

//Test for Element value type

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

CIMType type = CIMType::STRING;

const CIMType type = CIMTYPE_STRING;

// Test for VALUE element

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

{

//cout << "DEBUG xmlReader::getPropertyValue " << __LINE__

// << " CimValue = " << cimValue.toString << endl;

return true;

}

//Test for Element.array value

// Test for VALUE.ARRAY element

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

{

return true;

}

// Test for Value.reference type

// Test for VALUE.REFERENCE element

// ATTN:This returns a different type (CIMReference)

CIMObjectPath reference;

// ATTN: Possibly change to simply return result after

// we figure out the type differences.

CIMReference 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;

}

Line 1063

Line 1259

{

switch (type)

{

case CIMType::BOOLEAN:

case CIMTYPE_BOOLEAN:

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

case CIMType::STRING:

case CIMTYPE_STRING:

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

case CIMType::CHAR16:

case CIMTYPE_CHAR16:

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

case CIMType::UINT8:

case CIMTYPE_UINT8:

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

case CIMType::UINT16:

case CIMTYPE_UINT16:

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

case CIMType::UINT32:

case CIMTYPE_UINT32:

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

case CIMType::UINT64:

case CIMTYPE_UINT64:

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

case CIMType::SINT8:

case CIMTYPE_SINT8:

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

case CIMType::SINT16:

case CIMTYPE_SINT16:

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

case CIMType::SINT32:

case CIMTYPE_SINT32:

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

case CIMType::SINT64:

case CIMTYPE_SINT64:

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

case CIMType::DATETIME:

case CIMTYPE_DATETIME:

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

case CIMType::REAL32:

case CIMTYPE_REAL32:

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

case CIMType::REAL64:

case CIMTYPE_REAL64:

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

default:

Line 1119

Line 1315

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

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

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

Boolean XmlReader::getValueArrayElement(

Line 1126

Line 1324

CIMType type,

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 1159

Line 1357

}

expectEndTag(parser, "VALUE.ARRAY");

}

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

return true;

Line 1201

Line 1400

Boolean translatable = getCimBooleanAttribute(

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

Uint32 flavor = 0;

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

// getCimBooleanAttribute() calls above.

Uint32 flavor = CIMFlavor::NONE;

if (overridable)

flavor |= CIMFlavor::OVERRIDABLE;

else

flavor |= CIMFlavor::DISABLEOVERRIDE;

if (toSubClass)

flavor |= CIMFlavor::TOSUBCLASS;

else

flavor |= CIMFlavor::RESTRICTED;

if (toInstance)

flavor |= CIMFlavor::TOINSTANCE;

Line 1288

Line 1493

// getQualifierElement()

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

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

// <!ATTLIST QUALIFIER

// %CIMName;

// %CIMType; #REQUIRED

Line 1331

Line 1536

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>:

Line 1409

Line 1613

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

// Create property:

// Create property: Sets type and !isarray

CIMValue value;

CIMValue value(type, false);

value.setNullValue(type, false);

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

property = CIMProperty(

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

if (!empty)

{

Line 1422

Line 1624

getQualifierElements(parser, property);

// Get value:

// Get value: Insert value if getValueElement exists (returns True)

if (getValueElement(parser, type, value))

property.setValue(value);

Line 1521

Line 1723

// Create property:

CIMValue nullValue;

CIMValue value(type, true, arraySize);

nullValue.setNullValue(type, true, arraySize);

property = CIMProperty(

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

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

if (!empty)

{

Line 1534

Line 1735

// Get value:

CIMValue value;

if (getValueArrayElement(parser, type, value))

{

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

Line 1766

Line 1965

// <!ATTLIST KEYVALUE

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

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

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

Boolean XmlReader::getKeyValueElement(

Line 1810

Line 2007

// <!ATTLIST KEYBINDING

// %CIMName;>

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

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

Boolean XmlReader::getKeyBindingElement(

Line 1828

Line 2023

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

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

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

{

CIMObjectPath reference;

if (!getValueReferenceElement(parser, reference))

{

throw XmlValidationError(parser.getLine(),

"Expected KEYVALUE or VALUE.REFERENCE element");

}

type = KeyBinding::REFERENCE;

value = reference.toString();

}

expectEndTag(parser, "KEYBINDING");

return true;

Line 1842

Line 2048

// <!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

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

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

Line 1863

Line 2070

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

if (!empty)

if (empty)

{

return true;

}

String name;

KeyBinding::Type type;

String value;

CIMObjectPath reference;

if (getKeyValueElement(parser, type, value))

{

// Use empty key name because none was specified

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

}

else if (getValueReferenceElement(parser, reference))

{

// Use empty key name because none was specified

type = KeyBinding::REFERENCE;

value = reference.toString();

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

}

else

{

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

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

}

if (!empty)

expectEndTag(parser, "INSTANCENAME");

}

return true;

}

Boolean XmlReader::getInstanceNameElement(

XmlParser& parser,

CIMReference& instanceName)

CIMObjectPath& instanceName)

{

String className;

Array<KeyBinding> keyBindings;

Line 1903

Line 2127

Boolean XmlReader::getInstancePathElement(

XmlParser& parser,

CIMReference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 1944

Line 2168

Boolean XmlReader::getLocalInstancePathElement(

XmlParser& parser,

CIMReference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 1984

Line 2208

Boolean XmlReader::getClassPathElement(

XmlParser& parser,

CIMReference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 2024

Line 2248

Boolean XmlReader::getLocalClassPathElement(

XmlParser& parser,

CIMReference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 2066

Line 2290

Boolean XmlReader::getValueReferenceElement(

XmlParser& parser,

CIMReference& reference)

CIMObjectPath& reference)

{

XmlEntry entry;

Line 2127

Line 2351

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

// 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 2171

Line 2434

// Create property:

CIMValue value;

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

value.set(CIMReference());

// value.set(CIMObjectPath());

property = CIMProperty(

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

Line 2180

Line 2443

{

getQualifierElements(parser, property);

CIMReference reference;

CIMObjectPath reference;

if (getValueReferenceElement(parser, reference))

property.setValue(reference);

Line 2346

Line 2609

// Create parameter:

parameter = CIMParameter(name, CIMType::REFERENCE, false, 0, referenceClass);

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

if (!empty)

{

Line 2359

Line 2622

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

// 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:

String name = getCimNameAttribute(

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

// Get PARAMETER.REFERENCECLASS attribute:

String 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 2370

Line 2686

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

XmlReader::getParameterArrayElement(parser, parameter) ||

XmlReader::getParameterReferenceElement(parser, parameter))

XmlReader::getParameterReferenceElement(parser, parameter) ||

XmlReader::getParameterReferenceArrayElement(parser, parameter))

{

try

{

Line 2420

Line 2737

// 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 2477

Line 2794

expectEndTag(parser, "QUALIFIER.DECLARATION");

}

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

if (value.getType() == CIMTYPE_NONE)

{

if (isArray)

value.setNullValue(type, true, arraySize);

Line 2526

Line 2843

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 2620

Line 2939

}

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

// 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))

{

throw XmlValidationError(parser.getLine(),

"expected INSTANCENAME element");

}

// Get INSTANCE elements:

if (!getInstanceElement(parser, namedInstance))

{

throw XmlValidationError(parser.getLine(),

"expected INSTANCE element");

}

// Get VALUE.NAMEDINSTANCE end tag:

expectEndTag(parser, "VALUE.NAMEDINSTANCE");

namedInstance.setPath (instanceName);

return true;

}

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

// getObject()

Line 2673

Line 3035

Boolean XmlReader::getMessageStartTag(

XmlParser& parser,

String& id,

const char*& protocolVersion)

String& protocolVersion)

{

XmlEntry entry;

Line 2794

Line 3156

expectContentOrCData(parser, entry);

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

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

result = true;

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

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

result = false;

else

throw XmlSemanticError(parser.getLine(),

Line 2820

Line 3182

Boolean XmlReader::getErrorElement(

XmlParser& parser,

CIMStatusCode& code,

CIMException& cimException,

const char*& description,

Boolean required)

{

XmlEntry entry;

Line 2843

Line 3204

throw XmlValidationError(

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

code = CIMStatusCode(tmpCode);

// Get ERROR.DESCRIPTION:

description = "";

String tmpDescription;

entry.getAttributeValue("DESCRIPTION", description);

entry.getAttributeValue("DESCRIPTION", tmpDescription);

if (!empty)

expectEndTag(parser, "ERROR");

cimException = PEGASUS_CIM_EXCEPTION(CIMStatusCode(tmpCode), tmpDescription);

return true;

}

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

// getObjectWithPath()

// 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

{

throw XmlValidationError(parser.getLine(),

"Expected INSTANCE or CLASS element");

}

expectEndTag(parser, "VALUE.OBJECT");

return true;

}

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

// getValueObjectWithPathElement()

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

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

Boolean XmlReader::getObjectWithPath(

Boolean XmlReader::getValueObjectWithPathElement(

XmlParser& parser,

CIMObjectWithPath& objectWithPath)

CIMObject& objectWithPath)

{

XmlEntry entry;

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

return false;

CIMReference reference;

CIMObjectPath reference;

Boolean isInstance = false;

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

Line 2881

Line 3280

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

{

throw XmlValidationError(parser.getLine(),

"Expected INSTANCE element");

"Expected INSTANCEPATH or CLASSPATH element");

}

if (isInstance)

Line 2891

Line 3290

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

{

throw XmlValidationError(parser.getLine(),

"Expected INSTANCEPATH or CLASSPATH element");

"Expected INSTANCE element");

}

objectWithPath.set(reference, CIMObject(cimInstance));

objectWithPath = CIMObject (cimInstance);

objectWithPath.setPath (reference);

}

else

{

Line 2904

Line 3304

throw XmlValidationError(parser.getLine(),

"Expected CLASS element");

}

objectWithPath.set(reference, CIMObject(cimClass));

objectWithPath = CIMObject (cimClass);

objectWithPath.setPath (reference);

}

expectEndTag(parser, "VALUE.OBJECTWITHPATH");

Line 2913

Line 3314

}

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

// 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))

{

throw XmlValidationError(parser.getLine(),

"Expected LOCALINSTANCEPATH or LOCALCLASSPATH element");

}

if (isInstance)

{

CIMInstance cimInstance;

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

{

throw XmlValidationError(parser.getLine(),

"Expected INSTANCE element");

}

objectWithPath = CIMObject (cimInstance);

objectWithPath.setPath (reference);

}

else

{

CIMClass cimClass;

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

{

throw XmlValidationError(parser.getLine(),

"Expected CLASS element");

}

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)

Line 2920

Line 3416

Boolean XmlReader::getObjectNameElement(

XmlParser& parser,

CIMReference& objectName)

CIMObjectPath& objectName)

{

String className;

CIMReference instanceName;

if (getClassNameElement(parser, className, false))

{

Line 2949

Line 3444

Boolean XmlReader::getObjectPathElement(

XmlParser& parser,

CIMReference& objectPath)

CIMObjectPath& objectPath)

{

XmlEntry entry;

Line 2972

Line 3467

"expected INSTANCEPATH or CLASSPATH element");

}

PEGASUS_UNREACHABLE ( return false; )

}

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

// 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))

throw XmlValidationError(parser.getLine(),

"Missing EXPMETHODCALL.NAME attribute");

return true;

}

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

// getEMethodResponseStartTag()

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

Boolean XmlReader::getEMethodResponseStartTag(

XmlParser& parser,

const char*& name)

{

XmlEntry entry;

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

return false;

// Get EXPMETHODRESPONSE.NAME attribute:

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

throw XmlValidationError(parser.getLine(),

"Missing EXPMETHODRESPONSE.NAME attribute");

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))

throw XmlValidationError(parser.getLine(),

"Missing METHODCALL.NAME attribute");

return true;

}

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

// getMethodResponseStartTag()

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

Boolean XmlReader::getMethodResponseStartTag(

XmlParser& parser,

const char*& name)

{

XmlEntry entry;

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

return false;

// Get METHODRESPONSE.NAME attribute:

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

throw XmlValidationError(parser.getLine(),

"Missing METHODRESPONSE.NAME attribute");

return true;

}

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

// getParamValueElement()

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

// <!ATTLIST PARAMVALUE

// %CIMName;

// %ParamType;>

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

Boolean XmlReader::getParamValueElement(

XmlParser& parser,

CIMParamValue& paramValue)

{

XmlEntry entry;

const char* name;

CIMType type;

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))

throw XmlValidationError(parser.getLine(),

"Missing PARAMVALUE.NAME attribute");

// Get PARAMVALUE.PARAMTYPE attribute:

type = getCimTypeAttribute(parser.getLine(), entry, "PARAMVALUE",

"PARAMTYPE", false);

if (!empty)

{

// Parse VALUE.REFERENCE and VALUE.REFARRAY type

if ( (type == CIMTYPE_REFERENCE) || (type == CIMTYPE_NONE) )

{

CIMObjectPath reference;

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

{

value.set(reference);

type = CIMTYPE_REFERENCE;

}

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

{

type = CIMTYPE_REFERENCE;

}

// If type==reference but no VALUE.REFERENCE found, use null value

}

// Parse non-reference value

if ( type != CIMTYPE_REFERENCE )

{

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

CIMType effectiveType = type;

if ( effectiveType == CIMTYPE_NONE)

{

effectiveType = CIMTYPE_STRING;

}

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

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

{

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

}

expectEndTag(parser, "PARAMVALUE");

}

paramValue = CIMParamValue(name, value, Boolean(type!=CIMTYPE_NONE));

return true;

}

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

// getReturnValueElement()

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

// <!ATTLIST RETURNVALUE

// %ParamType;>

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

Boolean XmlReader::getReturnValueElement(

XmlParser& parser,

CIMValue& returnValue)

{

XmlEntry entry;

CIMType type;

CIMValue value;

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

return false;

// Get RETURNVALUE.PARAMTYPE attribute:

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

type = getCimTypeAttribute(parser.getLine(), entry, "RETURNVALUE",

"PARAMTYPE", false);

// Parse VALUE.REFERENCE type

if ( (type == CIMTYPE_REFERENCE) || (type == CIMTYPE_NONE) )

{

CIMObjectPath reference;

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

{

returnValue.set(reference);

type = CIMTYPE_REFERENCE;

}

else if (type == CIMTYPE_REFERENCE)

{

throw XmlValidationError(parser.getLine(),

"expected VALUE.REFERENCE element");

}

// Parse non-reference return value

if ( type != CIMTYPE_REFERENCE )

{

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

if ( type == CIMTYPE_NONE)

{

type = CIMTYPE_STRING;

}

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

{

throw XmlValidationError(parser.getLine(),

"expected VALUE element");

}

expectEndTag(parser, "RETURNVALUE");

return true;

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.22
changed lines
	Added in v.1.75.2.1

No CVS admin address has been configured