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.70 and 1.117

version 1.70, 2002/08/25 06:43:56

version 1.117, 2006/03/03 20:31:25

Line 1

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

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

// The Open Group, Tivoli Systems

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

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

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

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

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

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

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

Line 27

Line 35

// (carolann_graves@hp.com)

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

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

// Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)

// Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) for Bug#3103

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

#include <Pegasus/Common/Config.h>

#include <cctype>

#include <cstdio>

#include <cstdlib>

#if defined(PEGASUS_OS_TYPE_UNIX)

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

#include <errno.h>

#endif

#include "CIMName.h"

Line 45

Line 55

#include "CIMInstance.h"

#include "CIMObject.h"

#include "CIMParamValue.h"

#include "System.h"

#include "XmlConstants.h"

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#include "OS400ConvertChar.h"

#endif

// l10n

#include <Pegasus/Common/MessageLoader.h>

#include <Pegasus/Common/AutoPtr.h>

#include "CIMNameUnchecked.h"

//#define PEGASUS_SINT64_MIN (-PEGASUS_SINT64_LITERAL(9223372036854775808))

#define PEGASUS_SINT64_MIN (PEGASUS_SINT64_LITERAL(0x8000000000000000))

//#define PEGASUS_UINT64_MAX PEGASUS_UINT64_LITERAL(18446744073709551615)

#define PEGASUS_UINT64_MAX PEGASUS_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF)

#define PEGASUS_SINT64_MIN (-PEGASUS_SINT64_LITERAL((Sint64) 0x8000000000000000))

#define PEGASUS_UINT64_MAX PEGASUS_UINT64_LITERAL((Uint64) 0xFFFFFFFFFFFFFFFF)

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

Line 75

Line 92

entry.type != XmlEntry::XML_DECLARATION ||

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

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

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_XML_STYLE",

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

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

}

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

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

throw XmlValidationError(

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

// l10n

// throw XmlValidationError(

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

MessageLoaderParms mlParms("Common.XmlReader.MISSING_XML_ATTRIBUTE",

"missing xml.version attribute");

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

}

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

{

Line 125

Line 160

entry.type != XmlEntry::START_TAG ||

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

{

char message[MESSAGE_SIZE];

// l10n

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

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

// char message[MESSAGE_SIZE];

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

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

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_OPEN",

"Expected open of $0 element",

tagName);

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

}

Line 145

Line 188

entry.type != XmlEntry::END_TAG ||

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

{

char message[MESSAGE_SIZE];

sprintf(message, "Expected close of %s element, got %s instead",

// l10n

// char message[MESSAGE_SIZE];

// sprintf(message, "Expected close of %s element, got %s instead",

// tagName,entry.text);

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

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLOSE",

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

tagName,entry.text);

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

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

}

Line 168

Line 220

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

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

{

char message[MESSAGE_SIZE];

// l10n

sprintf(message,

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

// char message[MESSAGE_SIZE];

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

// sprintf(message,

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

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

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_OPENCLOSE",

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

tagName);

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

}

Line 189

Line 249

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

entry.type != XmlEntry::CDATA))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected content of CDATA");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CDATA",

"Expected content of CDATA");

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

}

return true;

Line 264

Line 332

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

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

Line 391

XmlEntry entry;

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

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

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

throw XmlValidationError(

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

// l10n

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

// throw XmlValidationError(

throw XmlValidationError(

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

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

MessageLoaderParms mlParms("Common.XmlReader.MISSING_CIMVERSION_ATTRIBUTE",

"missing CIM.CIMVERSION attribute");

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

}

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

// l10n

// throw XmlValidationError(

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

MessageLoaderParms mlParms("Common.XmlReader.MISSING_DTDVERSION_ATTRIBUTE",

"missing CIM.DTDVERSION attribute");

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

}

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

Line 319

Line 426

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

String XmlReader::getCimNameAttribute(

CIMName XmlReader::getCimNameAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName,

Line 329

Line 436

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

{

// l10n

// char buffer[MESSAGE_SIZE];

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

// throw XmlValidationError(lineNumber, buffer);

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.size() == 0)

return name;

return CIMName ();

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

// l10n

// char buffer[MESSAGE_SIZE];

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

// throw XmlSemanticError(lineNumber, buffer);

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 364

Line 500

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

{

// l10n

// char buffer[MESSAGE_SIZE];

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

// throw XmlValidationError(lineNumber, buffer);

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 (!CIMName::legal(name))

{

// l10n

// char buffer[MESSAGE_SIZE];

// sprintf(buffer,

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

// throw XmlSemanticError(lineNumber, buffer);

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 400

Line 562

if (!CIMName::legal(name))

{

// l10n

// char buffer[MESSAGE_SIZE];

// sprintf(buffer,

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

// throw XmlSemanticError(lineNumber, buffer);

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 411

Line 584

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

// getEmbeddedObjectAttribute()

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

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

String XmlReader::getEmbeddedObjectAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName)

{

String embeddedObject;

if (!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")

)

{

// l10n

// char buffer[MESSAGE_SIZE];

// sprintf(buffer,

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

// throw XmlSemanticError(lineNumber, buffer);

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

Line 429

Line 648

if (!CIMName::legal(name))

{

#ifdef PEGASUS_SNIA_INTEROP_TEST

name = "PEGASUS_SUBSTITUED_THIS_FOR_BAD_NAME";

return name;

#endif

// l10n

// char buffer[MESSAGE_SIZE];

// sprintf(buffer,

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

// throw XmlSemanticError(lineNumber, buffer);

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 458

Line 693

if (!CIMName::legal(superClass))

{

// l10n

// char buffer[MESSAGE_SIZE];

// sprintf(

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

// throw XmlSemanticError(lineNumber, buffer);

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 499

Line 746

{

if (required)

{

// l10n

// char message[MESSAGE_SIZE];

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

// throw XmlValidationError(lineNumber, message);

char message[MESSAGE_SIZE];

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

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

{

Line 542

Line 802

type = CIMTYPE_REAL64;

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

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 message[MESSAGE_SIZE];

// l10n

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

attributeName);

// char message[MESSAGE_SIZE];

throw XmlSemanticError(lineNumber, message);

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

// attributeName);

// throw XmlSemanticError(lineNumber, message);

char buffer[MESSAGE_SIZE];

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

MessageLoaderParms mlParms("Common.XmlReader.ILLEGAL_VALUE_FOR_ATTRIBUTE",

"Illegal value for $0 attribute",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

}

cimType = type;

Line 579

Line 853

if (!required)

return defaultValue;

// l10n

// char buffer[62];

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

// attributeName, tagName);

// throw XmlValidationError(lineNumber, buffer);

char buffer[62];

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 591

Line 876

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

return false;

// l10n

// char buffer[62];

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

// throw XmlSemanticError(lineNumber, buffer);

char buffer[62];

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

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

throw XmlSemanticError(lineNumber, buffer);

MessageLoaderParms mlParms("Common.XmlReader.INVALID_ATTRIBUTE",

"Invalid $0 attribute value",

buffer);

throw XmlSemanticError(lineNumber, mlParms);

return false;

}

Line 681

Line 978

return true;

}

inline Uint8 _hexCharToNumeric(const char c)

inline Uint8 _xmlReader_hexCharToNumeric(const char c)

{

Uint8 n;

Line 695

Line 992

return n;

}

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

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

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

String XmlReader::decodeURICharacters(String uriString)

{

Uint32 i;

Array<Uint8> utf8Chars;

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

{

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

{

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

{

// l10n

// throw ParseError("Invalid URI encoding");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_URI_ENCODING",

"Invalid URI encoding");

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

}

Uint8 digit1 = _xmlReader_hexCharToNumeric(char(uriString[++i]));

Uint8 digit2 = _xmlReader_hexCharToNumeric(char(uriString[++i]));

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

{

// l10n

// throw ParseError("Invalid URI encoding");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_URI_ENCODING",

"Invalid URI encoding");

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

}

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

utf8Chars.append((Uint8)decodedChar);

}

else

{

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

}

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

if (uriString.size() > 0)

{

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

utf8Chars.append('\0');

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

}

else

{

return String();

}

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

// stringToSignedInteger

Line 749

Line 1109

x = x << 4;

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

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

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

if (PEGASUS_SINT64_MIN - x > -newDigit)

{

return false;

Line 869

Line 1229

x = x << 4;

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

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

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

if (PEGASUS_UINT64_MAX - x < newDigit)

{

return false;

Line 941

Line 1301

{

case CIMTYPE_BOOLEAN:

{

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

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

return CIMValue(true);

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

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

return CIMValue(false);

else

else {

throw XmlSemanticError(

lineNumber, "Invalid boolean value");

// l10n

// throw XmlSemanticError(

// lineNumber, "Invalid boolean value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_BOOLEAN_VALUE",

"Invalid boolean value");

throw XmlSemanticError(lineNumber, mlParms);

}

case CIMTYPE_STRING:

Line 957

Line 1327

case CIMTYPE_CHAR16:

{

if (strlen(valueString) != 1)

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

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

// remove this test, utf-8 can be up to 6 bytes per char

if (strlen(valueString) != 1) {

// l10n

// throw XmlSemanticError(lineNumber, "Invalid char16 value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_CHAR16_VALUE",

"Invalid char16 value");

throw XmlSemanticError(lineNumber, mlParms);

}

// Converts UTF-8 to UTF-16

String tmp(valueString);

if (tmp.size() != 1)

{

// l10n

// throw XmlSemanticError(lineNumber, "Invalid char16 value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_CHAR16_VALUE",

"Invalid char16 value");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(tmp[0]);

}

case CIMTYPE_UINT8:

Line 972

Line 1367

if (!stringToUnsignedInteger(valueString, x))

{

throw XmlSemanticError(

lineNumber, "Invalid unsigned integer value");

// l10n

// throw XmlSemanticError(

// lineNumber, "Invalid unsigned integer value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_UI_VALUE",

"Invalid unsigned integer value");

throw XmlSemanticError(lineNumber, mlParms);

}

switch (type)

Line 982

Line 1386

{

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

{

throw XmlSemanticError(

lineNumber, "Uint8 value out of range");

// l10n

// throw XmlSemanticError(

// lineNumber, "Uint8 value out of range");

MessageLoaderParms mlParms("Common.XmlReader.U8_VALUE_OUT_OF_RANGE",

"Uint8 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Uint8(x));

}

Line 991

Line 1403

{

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

{

throw XmlSemanticError(

lineNumber, "Uint16 value out of range");

// l10n

// throw XmlSemanticError(

// lineNumber, "Uint16 value out of range");

MessageLoaderParms mlParms("Common.XmlReader.U16_VALUE_OUT_OF_RANGE",

"Uint16 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Uint16(x));

}

Line 1000

Line 1421

{

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

{

throw XmlSemanticError(

lineNumber, "Uint32 value out of range");

// l10n

// throw XmlSemanticError(

// lineNumber, "Uint32 value out of range");

MessageLoaderParms mlParms("Common.XmlReader.U32_VALUE_OUT_OF_RANGE",

"Uint32 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Uint32(x));

}

Line 1019

Line 1448

if (!stringToSignedInteger(valueString, x))

{

throw XmlSemanticError(

lineNumber, "Invalid signed integer value");

// l10n

// throw XmlSemanticError(

// lineNumber, "Invalid signed integer value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_SI_VALUE",

"Invalid signed integer value");

throw XmlSemanticError(lineNumber, mlParms);

}

switch (type)

Line 1029

Line 1467

{

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

{

throw XmlSemanticError(

lineNumber, "Sint8 value out of range");

// l10n

// throw XmlSemanticError(

// lineNumber, "Sint8 value out of range");

MessageLoaderParms mlParms("Common.XmlReader.S8_VALUE_OUT_OF_RANGE",

"Sint8 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Sint8(x));

}

Line 1038

Line 1484

{

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

{

throw XmlSemanticError(

lineNumber, "Sint16 value out of range");

// l10n

// throw XmlSemanticError(

// lineNumber, "Sint16 value out of range");

MessageLoaderParms mlParms("Common.XmlReader.S16_VALUE_OUT_OF_RANGE",

"Sint16 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Sint16(x));

}

Line 1047

Line 1501

{

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

{

throw XmlSemanticError(

lineNumber, "Sint32 value out of range");

// l10n

// throw XmlSemanticError(

// lineNumber, "Sint32 value out of range");

MessageLoaderParms mlParms("Common.XmlReader.S32_VALUE_OUT_OF_RANGE",

"Sint32 value out of range");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Sint32(x));

}

Line 1063

Line 1525

try

{

// KS 20021002 - Exception if no datatime 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 (InvalidDateTimeFormatException&)

{

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

// l10n

// throw XmlSemanticError(lineNumber, "Invalid datetime value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_DATETIME_VALUE",

"Invalid datetime value");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(tmp);

Line 1077

Line 1554

{

Real64 x;

if (!stringToReal(valueString, x))

if (!stringToReal(valueString, x)) {

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

// l10n

// throw XmlSemanticError(lineNumber, "Invalid real number value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_RN_VALUE",

"Invalid real number value");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(Real32(x));

}

Line 1087

Line 1572

{

Real64 x;

if (!stringToReal(valueString, x))

if (!stringToReal(valueString, x)) {

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

// l10n

// throw XmlSemanticError(lineNumber, "Invalid real number value");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_RN_VALUE",

"Invalid real number value");

throw XmlSemanticError(lineNumber, mlParms);

}

return CIMValue(x);

}

default:

// PEP 194:

break;

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

{

CIMObject x;

throw XmlSemanticError(lineNumber, "malformed XML");

if (*valueString == '\0')

return false;

{

return CIMValue(CIMTYPE_OBJECT, false, 0);

}

else

{

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

// CIMInstance or a CIMClass).

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

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

// just the value of the Embedded Object in String representation.

// getValueElement()

AutoArrayPtr<char> tmp_buffer(new char[strlen(valueString) + 1]);

strcpy(tmp_buffer.get(), valueString);

// <!ELEMENT VALUE (#PCDATA)>

XmlParser tmp_parser(tmp_buffer.get());

// Return: false if no value element.

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

{

x = CIMObject(cimInstance);

}

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

{

x = CIMObject(cimClass);

}

else

{

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected INSTANCE or CLASS element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCE_OR_CLASS_ELEMENT",

"Expected INSTANCE or CLASS element"); // change "element" to "embedded object"

throw XmlValidationError(lineNumber, mlParms);

}

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

tmp_buffer.reset();

}

return CIMValue(x);

}

default:

break;

}

// l10n

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

Line 1120

Line 1706

XmlEntry entry;

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

{

return false;

}

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

Line 1129

Line 1717

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;

Line 1156

Line 1752

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

{

if (required)

if (required) {

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

// l10n

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

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_VALUE_ELEMENT",

"Expected VALUE element");

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

}

return false;

}

Line 1173

Line 1780

expectEndTag(parser, "VALUE");

}

str = valueString;

str = String(valueString);

return true;

}

Line 1310

Line 1917

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

default:

break;

}

Line 1519

Line 2133

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

Line 1544

Line 2160

CIMValue value;

if (empty)

{

value.setNullValue(type, false);

}

else

{

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

!getValueArrayElement(parser, type, value))

{

Line 1553

Line 2175

// Expect </QUALIFIER>:

expectEndTag(parser, "QUALIFIER");

}

// Build qualifier:

Line 1579

Line 2202

}

catch (AlreadyExistsException&)

{

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

// l10n

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

MessageLoaderParms mlParms("Common.XmlReader.DUPLICATE_QUALIFIER",

"duplicate qualifier");

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

}

Line 1593

Line 2224

// %CIMName;

// %ClassOrigin;

// %Propagated;

// %EmbeddedObject; #IMPLIED

// %CIMType; #REQUIRED>

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

Line 1608

Line 2240

// Get PROPERTY.NAME attribute:

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

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

// Get PROPERTY.CLASSORIGIN attribute:

Line 1620

Line 2252

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:

CIMType type;

Line 1632

Line 2269

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

}

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

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

// 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: Insert value if getValueElement exists (returns True)

value = new_value;

property = new_property;

}

else

{

// Error -- throw exception

// (the EmbeddedObject attribute may be applied only to entities that have the type String)

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected string type");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

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

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

}

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

if (!empty)

{

if (getValueElement(parser, type, value))

property.setValue(value);

expectEndTag(parser, "PROPERTY");

}

Line 1673

Line 2360

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

{

// l10n

// char message[128];

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

// throw XmlSemanticError(lineNumber, message);

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 1692

Line 2390

// %CIMType; #REQUIRED

// %ArraySize;

// %ClassOrigin;

// %Propagated;>

// %Propagated;

// %EmbeddedObject; #IMPLIED>

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

Line 1711

Line 2410

// Get PROPERTY.NAME attribute:

String name =

CIMName name =

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

// Get PROPERTY.TYPE attribute:

Line 1726

Line 2425

// Get PROPERTY.CLASSORIGIN attribute:

CIMName classOrigin

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

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

// Get PROPERTY.ARRAY.PROPAGATED

Boolean propagated = getCimBooleanAttribute(

Boolean propagated = getCimBooleanAttribute(parser.getLine()

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

,entry

,"PROPERTY.ARRAY"

,"PROPAGATED"

,false

,false);

// Get PROPERTY.EMBEDDEDOBJECT attribute:

String embeddedObject = getEmbeddedObjectAttribute(parser.getLine()

,entry

,"PROPERTY.ARRAY");

// Create property:

CIMValue value(type, true, arraySize);

property = CIMProperty(

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

name, value, arraySize, CIMName(), 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);

}

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

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

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

{

// Error -- throw exception

// (the EmbeddedObject attribute may be applied only to entities that have the type String)

// l10n

// Get value:

// throw XmlValidationError(parser.getLine(),

// "expected string type");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

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

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

}

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

// l10n

// throw XmlSemanticError(parser.getLine(),

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

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 1781

Line 2546

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected content of HOST element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CONTENT_ELEMENT",

"expected content of HOST element");

}

host = entry.text;

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

}

host = String(entry.text);

#endif

expectEndTag(parser, "HOST");

return true;

}

Line 1805

Line 2595

Boolean XmlReader::getNameSpaceElement(

XmlParser& parser,

String& nameSpaceComponent)

CIMName& nameSpaceComponent)

{

XmlEntry entry;

Line 1840

Line 2630

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

return false;

String nameSpaceComponent;

CIMName nameSpaceComponent;

while (getNameSpaceElement(parser, nameSpaceComponent))

{

if (nameSpace.size())

nameSpace += '/';

nameSpace.append('/');

nameSpace += nameSpaceComponent;

nameSpace.append(nameSpaceComponent.getString());

}

if (!nameSpace.size())

{

throw XmlValidationError(parser.getLine(),

"Expected one or more NAMESPACE elements within "

// l10n

"LOCALNAMESPACEPATH element");

// throw XmlValidationError(parser.getLine(),

// "Expected one or more NAMESPACE elements within "

// "LOCALNAMESPACEPATH element");

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 1882

Line 2682

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

return false;

if (!getHostElement(parser, host))

if (!getHostElement(parser, host)) {

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

// l10n

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected LOCALNAMESPACEPATH element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_LOCALNAMESPACEPATH_ELEMENT",

"expected LOCALNAMESPACEPATH element");

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

}

expectEndTag(parser, "NAMESPACEPATH");

Line 1907

Line 2724

Boolean XmlReader::getClassNameElement(

XmlParser& parser,

String& className,

CIMName& className,

Boolean required)

{

XmlEntry entry;

Line 1916

Line 2733

{

if (required)

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected CLASSNAME element");

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 1942

Line 2766

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

KeyBinding::Type XmlReader::getValueTypeAttribute(

CIMKeyBinding::Type XmlReader::getValueTypeAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName)

Line 1950

Line 2774

String tmp;

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

return KeyBinding::STRING;

return CIMKeyBinding::STRING;

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

return KeyBinding::STRING;

return CIMKeyBinding::STRING;

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

return KeyBinding::BOOLEAN;

return CIMKeyBinding::BOOLEAN;

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

return KeyBinding::NUMERIC;

return CIMKeyBinding::NUMERIC;

// char buffer[MESSAGE_SIZE];

// sprintf(buffer,

// "Illegal value for %s.VALUETYPE attribute; "

// "CIMValue must be one of \"string\", \"boolean\", or \"numeric\"",

// elementName);

// throw XmlSemanticError(lineNumber, buffer);

char buffer[MESSAGE_SIZE];

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

sprintf(buffer,

MessageLoaderParms mlParms("Common.XmlReader.ILLEGAL_VALUE_FOR_CIMVALUE_ATTRIBUTE",

"Illegal value for %s.VALUETYPE attribute; "

"Illegal value for $0 attribute; CIMValue must be one of \"string\", \"boolean\", or \"numeric\"", buffer);

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

elementName);

throw XmlSemanticError(lineNumber, buffer);

throw XmlSemanticError(lineNumber, mlParms);

return KeyBinding::BOOLEAN;

return CIMKeyBinding::BOOLEAN;

}

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

Line 1982

Line 2816

Boolean XmlReader::getKeyValueElement(

XmlParser& parser,

KeyBinding::Type& type,

CIMKeyBinding::Type& type,

String& value)

{

XmlEntry entry;

Line 2002

Line 2836

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

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

value = entry.text;

value = String(entry.text);

else

parser.putBack(entry);

Line 2024

Line 2858

Boolean XmlReader::getKeyBindingElement(

XmlParser& parser,

String& name,

CIMName& name,

String& value,

KeyBinding::Type& type)

CIMKeyBinding::Type& type)

{

XmlEntry entry;

Line 2041

Line 2875

if (!getValueReferenceElement(parser, reference))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected KEYVALUE or VALUE.REFERENCE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_KEYVALUE_OR_REFERENCE_ELEMENT",

"Expected KEYVALUE or VALUE.REFERENCE element");

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

}

type = KeyBinding::REFERENCE;

type = CIMKeyBinding::REFERENCE;

value = reference.toString();

}

Line 2069

Line 2911

Boolean XmlReader::getInstanceNameElement(

XmlParser& parser,

String& className,

Array<KeyBinding>& keyBindings)

Array<CIMKeyBinding>& keyBindings)

{

className.clear();

keyBindings.clear();

Line 2088

Line 2930

return true;

}

String name;

CIMName name;

KeyBinding::Type type;

CIMKeyBinding::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));

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

}

else if (getValueReferenceElement(parser, reference))

{

// Use empty key name because none was specified

type = KeyBinding::REFERENCE;

type = CIMKeyBinding::REFERENCE;

value = reference.toString();

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

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

}

expectEndTag(parser, "INSTANCENAME");

Line 2121

Line 2963

CIMObjectPath& instanceName)

{

String className;

Array<KeyBinding> keyBindings;

Array<CIMKeyBinding> keyBindings;

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

return false;

Line 2152

Line 2994

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected NAMESPACEPATH element");

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected INSTANCENAME element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCENAME_ELEMENT",

"expected INSTANCENAME element");

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

}

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

Line 2192

Line 3053

if (!getLocalNameSpacePathElement(parser, nameSpace))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected LOCALNAMESPACEPATH element");

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected INSTANCENAME element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCENAME_ELEMENT",

"expected INSTANCENAME element");

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

}

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

Line 2233

Line 3112

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected NAMESPACEPATH element");

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected CLASSNAME element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLASSNAME_ELEMENT",

"expected CLASSNAME element");

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

}

reference.set(host, nameSpace, className);

Line 2272

Line 3169

if (!getLocalNameSpacePathElement(parser, nameSpace))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected LOCALNAMESPACEPATH element");

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected CLASSNAME element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLASSNAME_ELEMENT",

"expected CLASSNAME element");

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

}

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

Line 2316

Line 3231

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

entry.type != XmlEntry::EMPTY_TAG)

{

throw XmlValidationError(parser.getLine(),

"Expected one of the following start tags: "

// l10n

"CLASSPATH, LOCALCLASSPATH, CLASSNAME, INSTANCEPATH, "

"LOCALINSTANCEPATH, INSTANCENAME");

// throw XmlValidationError(parser.getLine(),

// "Expected one of the following start tags: "

// "CLASSPATH, LOCALCLASSPATH, CLASSNAME, INSTANCEPATH, "

// "LOCALINSTANCEPATH, INSTANCENAME");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_START_TAGS",

"Expected one of the following start tags: CLASSPATH, LOCALCLASSPATH, CLASSNAME, INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME");

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

}

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

Line 2335

Line 3259

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

{

parser.putBack(entry);

String className;

CIMName className;

getClassNameElement(parser, className);

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

}

Line 2353

Line 3277

{

parser.putBack(entry);

String className;

Array<KeyBinding> keyBindings;

Array<CIMKeyBinding> keyBindings;

getInstanceNameElement(parser, className, keyBindings);

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

}

Line 2427

Line 3351

// Get PROPERTY.NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

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

// Get PROPERTY.REFERENCECLASS attribute:

Line 2488

Line 3412

}

catch (AlreadyExistsException&)

{

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

// l10n

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

MessageLoaderParms mlParms("Common.XmlReader.DUPLICATE_PROPERTY",

"duplicate property");

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

}

Line 2517

Line 3449

// Get PARAMETER.NAME attribute:

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

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

// Get PARAMETER.TYPE attribute:

Line 2563

Line 3495

// Get PARAMETER.ARRAY.NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

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

// Get PARAMETER.ARRAY.TYPE attribute:

Line 2614

Line 3546

// Get PARAMETER.NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

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

// Get PARAMETER.REFERENCECLASS attribute:

Line 2660

Line 3592

// Get PARAMETER.NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

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

// Get PARAMETER.REFERENCECLASS attribute:

Line 2710

Line 3642

}

catch (AlreadyExistsException&)

{

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

// l10n

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

MessageLoaderParms mlParms("Common.XmlReader.DUPLICATE_PARAMETER",

"duplicate parameter");

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

}

Line 2742

Line 3682

// Get NAME attribute:

String name = getCimNameAttribute(

CIMName name = getCimNameAttribute(

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

// Get TYPE attribute:

Line 2785

Line 3725

{

if (!isArray)

{

throw XmlSemanticError(parser.getLine(),

"VALUE.ARRAY element encountered without "

// l10n

"ISARRAY attribute");

}

// throw XmlSemanticError(parser.getLine(),

// "VALUE.ARRAY element encountered without "

// "ISARRAY attribute");

MessageLoaderParms mlParms("Common.XmlReader.ARRAY_WITHOUT_ISARRAY",

"VALUE.ARRAY element encountered without ISARRAY attribute");

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

}

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

{

throw XmlSemanticError(parser.getLine(),

"VALUE.ARRAY size is not the same as "

// l10n

"ARRAYSIZE attribute");

// throw XmlSemanticError(parser.getLine(),

// "VALUE.ARRAY size is not the same as "

// "ARRAYSIZE attribute");

MessageLoaderParms mlParms("Common.XmlReader.ARRAY_SIZE_NOT_SAME",

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

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

}

gotValue = true;

Line 2803

Line 3759

{

if (isArray)

{

throw XmlSemanticError(parser.getLine(),

// l10n

// throw XmlSemanticError(parser.getLine(),

// "ISARRAY attribute used but VALUE element encountered");

MessageLoaderParms mlParms("Common.XmlReader.ARRAY_ATTRIBUTE_DIFFERENT",

"ISARRAY attribute used but VALUE element encountered");

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

}

gotValue = true;

Line 2850

Line 3814

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

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

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

CIMType type;

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

Line 2890

Line 3854

{

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

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

cimClass = CIMClass(name, superClass);

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

{

// Get QUALIFIER elements:

getQualifierElements(parser, cimClass);

Line 2917

Line 3884

// Get CLASS end tag:

expectEndTag(parser, "CLASS");

}

return true;

}

Line 2937

Line 3905

{

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

cimInstance = CIMInstance(className);

if (!empty)

{

// Get QUALIFIER elements:

getQualifierElements(parser, cimInstance);

// Get PROPERTY elements:

GetPropertyElements(parser, cimInstance);

// Get INSTANCE end tag:

expectEndTag(parser, "INSTANCE");

}

return true;

}

Line 2982

Line 3952

if (!getInstanceNameElement(parser, instanceName))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected INSTANCENAME element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCENAME_ELEMENT",

"expected INSTANCENAME element");

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

}

// Get INSTANCE elements:

if (!getInstanceElement(parser, namedInstance))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected INSTANCE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"expected INSTANCE element");

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

}

// Get VALUE.NAMEDINSTANCE end tag:

Line 3013

Line 4000

{

if (!getClassElement(parser, x))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected CLASS element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLASS_ELEMENT",

"expected CLASS element");

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

}

Line 3028

Line 4023

{

if (!getInstanceElement(parser, x))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected INSTANCE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"expected INSTANCE element");

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

}

Line 3043

Line 4046

{

if (!getQualifierDeclElement(parser, x))

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected QUALIFIER.DECLARATION element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_QUALIFIER_DECLARATION_ELEMENT",

"expected QUALIFIER.DECLARATION element");

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

}

Line 3066

Line 4077

// Get MESSAGE.ID:

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

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

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

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

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

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Invalid or missing MESSAGE.PROTOCOLVERSION attribute");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_MISSING_PROTOCOLVERSION_ATTRIBUTE",

"Invalid or missing MESSAGE.PROTOCOLVERSION attribute");

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

}

return true;

}

Line 3096

Line 4126

// Get IMETHODCALL.NAME attribute:

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

throw XmlValidationError(parser.getLine(),

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing IMETHODCALL.NAME attribute");

MessageLoaderParms mlParms("Common.XmlReader.MISSING_IMETHODCALL_ATTRIBUTE",

"Missing IMETHODCALL.NAME attribute");

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

}

return true;

}

Line 3111

Line 4152

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

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

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing IMETHODRESPONSE.NAME attribute");

MessageLoaderParms mlParms("Common.XmlReader.MISSING_IMETHODRESPONSE_ATTRIBUTE",

"Missing IMETHODRESPONSE.NAME attribute");

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

}

return true;

}

Line 3135

Line 4189

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

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

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing IPARAMVALUE.NAME attribute");

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 3170

Line 4256

{

if (required)

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected VALUE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_VALUE_ELEMENT",

"Expected VALUE element");

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

}

return false;

}

expectContentOrCData(parser, entry);

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

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

result = true;

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

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

result = false;

else

else {

throw XmlSemanticError(parser.getLine(),

// l10n

// throw XmlSemanticError(parser.getLine(),

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

return true;

Line 3193

Line 4296

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

// getErrorElement()

// DMTF CR Pending

// <!ELEMENT ERROR EMPTY>

// <!ELEMENT ERROR (INSTANCE*)>

// <!ATTLIST ERROR

// CODE CDATA #REQUIRED

// DESCRIPTION CDATA #IMPLIED>

Line 3211

Line 4314

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

{

if (required)

if (required) {

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

// l10n

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

Line 4335

Uint32 tmpCode;

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

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

throw XmlValidationError(

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

// l10n

// throw XmlValidationError(

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

MessageLoaderParms mlParms("Common.XmlReader.MISSING_ERROR_CODE_ATTRIBUTE",

"missing ERROR.CODE attribute");

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

}

// Get ERROR.DESCRIPTION:

Line 3233

Line 4357

entry.getAttributeValue("DESCRIPTION", tmpDescription);

if (!empty)

{

while (testStartTagOrEmptyTag(parser, entry))

{

skipElement(parser, entry);

}

expectEndTag(parser, "ERROR");

}

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

return true;

Line 3263

Line 4394

{

object = CIMObject(cimInstance);

}

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

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

{

object = CIMObject(cimClass);

}

else

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected INSTANCE or CLASS element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCE_OR_CLASS_ELEMENT",

"Expected INSTANCE or CLASS element");

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

}

expectEndTag(parser, "VALUE.OBJECT");

Line 3301

Line 4441

isInstance = true;

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

{

throw XmlValidationError(parser.getLine(),

// l10n 485

// throw XmlValidationError(parser.getLine(),

// "Expected INSTANCEPATH or CLASSPATH element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCEPATH_OR_CLASSPATH_ELEMENT",

"Expected INSTANCEPATH or CLASSPATH element");

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

}

if (isInstance)

Line 3311

Line 4459

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected INSTANCE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"Expected INSTANCE element");

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

}

objectWithPath = CIMObject (cimInstance);

objectWithPath.setPath (reference);

Line 3323

Line 4479

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected CLASS element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLASS_ELEMENT",

"Expected CLASS element");

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

}

objectWithPath = CIMObject (cimClass);

objectWithPath.setPath (reference);

Line 3359

Line 4523

isInstance = true;

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

{

throw XmlValidationError(parser.getLine(),

"Expected LOCALINSTANCEPATH or LOCALCLASSPATH element");

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected LOCALINSTANCEPATH or LOCALCLASSPATH element");

//l10n updated

MessageLoaderParms mlParms("Common.XmlConstants.MISSING_ELEMENT_LOCALPATH",

MISSING_ELEMENT_LOCALPATH);

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

}

if (isInstance)

Line 3369

Line 4543

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected INSTANCE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCE_ELEMENT",

"Expected INSTANCE element");

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

}

objectWithPath = CIMObject (cimInstance);

objectWithPath.setPath (reference);

Line 3381

Line 4564

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Expected CLASS element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLASS_ELEMENT",

"Expected CLASS element");

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

}

objectWithPath = CIMObject (cimClass);

objectWithPath.setPath (reference);

Line 3440

Line 4633

XmlParser& parser,

CIMObjectPath& objectName)

{

String className;

CIMName className;

if (getClassNameElement(parser, className, false))

{

Line 3451

Line 4644

return true;

else

{

throw XmlValidationError(parser.getLine(),

"expected CLASSNAME or INSTANCENAME element");

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected CLASSNAME or INSTANCENAME element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLASSNAME_OR_INSTANCENAME_ELEMENT",

"Expected CLASSNAME or INSTANCENAME element");

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

}

return false;

PEGASUS_UNREACHABLE( return false; )

}

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

Line 3485

Line 4687

}

else

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected INSTANCEPATH or CLASSPATH element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCEPATH_OR_CLASSPATH_ELEMENT",

"expected INSTANCEPATH or CLASSPATH element");

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

}

PEGASUS_UNREACHABLE ( return false; )

Line 3509

Line 4719

// Get EXPMETHODCALL.NAME attribute:

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

throw XmlValidationError(parser.getLine(),

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing EXPMETHODCALL.NAME attribute");

MessageLoaderParms mlParms("Common.XmlReader.MISSING_EXPMETHODCALL_ATTRIBUTE",

"Missing EXPMETHODCALL.NAME attribute");

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

}

return true;

}

Line 3524

Line 4744

Boolean XmlReader::getEMethodResponseStartTag(

XmlParser& parser,

const char*& name)

const char*& name,

Boolean& isEmptyTag)

{

XmlEntry entry;

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

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

return false;

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

// Get EXPMETHODRESPONSE.NAME attribute:

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

throw XmlValidationError(parser.getLine(),

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

// l10n

// throw XmlValidationError(

// parser.getLine(), "Missing EXPMETHODRESPONSE.NAME attribute");

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing EXPPARAMVALUE.NAME attribute");

MessageLoaderParms mlParms("Common.XmlReader.MISSING_EXPPARAMVALUE_ATTRIBUTE",

"Missing EXPPARAMVALUE.NAME attribute");

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

}

return true;

}

Line 3557

Line 4825

// Get METHODCALL.NAME attribute:

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

throw XmlValidationError(parser.getLine(),

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing METHODCALL.NAME attribute");

MessageLoaderParms mlParms("Common.XmlReader.MISSING_METHODCALL_ATTRIBUTE",

"Missing METHODCALL.NAME attribute");

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

}

return true;

}

Line 3572

Line 4851

Boolean XmlReader::getMethodResponseStartTag(

XmlParser& parser,

const char*& name)

const char*& name,

Boolean& isEmptyTag)

{

XmlEntry entry;

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

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

return false;

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

// Get METHODRESPONSE.NAME attribute:

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

throw XmlValidationError(parser.getLine(),

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

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing METHODRESPONSE.NAME attribute");

MessageLoaderParms mlParms("Common.XmlReader.MISSING_METHODRESPONSE_ATTRIBUTE",

"Missing METHODRESPONSE.NAME attribute");

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

}

return true;

}

Line 3595

Line 4887

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

// <!ATTLIST PARAMVALUE

// %CIMName;

// %EmbeddedObject; #IMPLIED

// %ParamType;>

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

Line 3605

Line 4898

{

XmlEntry entry;

const char* name;

CIMType type;

CIMType type=CIMTYPE_BOOLEAN;

CIMValue value;

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

Line 3615

Line 4908

// Get PARAMVALUE.NAME attribute:

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

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

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "Missing PARAMVALUE.NAME attribute");

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)

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 )

Line 3658

Line 4969

effectiveType = type;

}

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

// then

// Convert the EmbeddedObject-encoded string into a CIMObject

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

{

// Error -- throw exception

// (the EmbeddedObject attribute may be applied only to entities that have the type String)

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected string type");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

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

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

}

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;

Line 3679

Line 5022

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

// <!ATTLIST RETURNVALUE

// %EmbeddedObject; #IMPLIED

// %ParamType;>

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

Line 3694

Line 5038

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)

Line 3712

Line 5061

}

else if (type == CIMTYPE_REFERENCE)

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected VALUE.REFERENCE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_VALUE_REFERENCE_ELEMENT",

"expected VALUE.REFERENCE element");

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

}

Line 3726

Line 5083

type = CIMTYPE_STRING;

}

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

{

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

{

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

}

else

{

// Error -- throw exception

// (the EmbeddedObject attribute may be applied only to entities that have the type String)

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected string type");

MessageLoaderParms mlParms("Common.XmlReader.INVALID_EMBEDDEDOBJECT_TYPE",

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

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

}

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

{

throw XmlValidationError(parser.getLine(),

// l10n

// throw XmlValidationError(parser.getLine(),

// "expected VALUE element");

MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_VALUE_ELEMENT",

"expected VALUE element");

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

}

Line 3739

Line 5127

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.70
changed lines
	Added in v.1.117

No CVS admin address has been configured