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.98 and 1.102

version 1.98, 2004/05/01 16:52:23

version 1.102, 2004/07/23 00:45:57

Line 550

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

return CIMName();

// KS 200209 This may be temp but we are adding test for form

// CLASSNAME = "" for Wbemservices interoperability. Returns same

// as if attribute did not exist.

if (name.size() == 0)

return CIMName();

if (!CIMName::legal(name))

{

// l10n

Line 3909

Line 3903

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

Line 3943

Line 3940

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

Line 3970

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

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

Line 4495

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:

Line 4579

Line 4602

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:

Line 4622

Line 4648

{

XmlEntry entry;

const char* name;

CIMType type;

CIMType type=CIMTYPE_BOOLEAN;

CIMValue value;

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

Legend:

Removed from v.1.98
changed lines
	Added in v.1.102

No CVS admin address has been configured