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.27 and 1.39

version 1.27, 2002/02/20 23:14:19

version 1.39, 2002/03/20 19:13:40

Line 265

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

// testCimStartTag()

// getCimStartTag()

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

// <!ATTRLIST CIM

Line 274

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

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

}

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

Line 704

Line 695

const char* last = p;

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

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

while (first != last)

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

{

if (x < PEGASUS_LLONG_MIN/10)

{

return false;

}

x = 10 * x;

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

if (PEGASUS_LLONG_MIN - x > -newDigit)

{

return false;

}

x = x - newDigit;

}

if (negative)

if (!negative)

{

if (x == PEGASUS_LLONG_MIN)

{

return false;

}

x = -x;

}

return true;

}

Line 717

Line 728

// stringToUnsignedInteger

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

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

// ATTN-B: handle conversion from hexadecimal.

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

Line 765

Line 776

const char* last = p;

while (first != last)

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

{

if (x > PEGASUS_ULLONG_MAX/10)

{

return false;

}

x = 10 * x;

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

if (PEGASUS_ULLONG_MAX - x < newDigit)

{

return false;

}

x = x + newDigit;

}

return true;

}

Line 774

Line 797

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

Line 811

{

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

// If strlen == 0, set to default value for type

if (strlen(valueString)==0)

{

switch (type)

Line 806

Line 833

}

// Create value per type

switch (type)

{

case CIMType::BOOLEAN:

Line 847

Line 875

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

{

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;

}

Line 870

Line 922

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

{

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;

}

Line 901

Line 977

if (!stringToReal(valueString, x))

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

// ATTN-RK-P3-20010319: This value gets truncated.

return CIMValue(Real32(x));

}

Line 928

Line 1005

// <!ELEMENT VALUE (#PCDATA)>

// Return: false if no value element.

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

Boolean XmlReader::getValueElement(

Line 935

Line 1014

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 999

Line 1078

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

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

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

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

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

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

// INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)>

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

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

Boolean XmlReader::getPropertyValue(

XmlParser& parser,

CIMValue& cimValue)

{

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

CIMReference reference;

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

{

Line 1037

Line 1122

return true;

}

// Test for VALUE.REFARRAY element

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

{

return true;

}

return false;

}

Line 1131

Line 1222

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

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

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

Boolean XmlReader::getValueArrayElement(

Line 1138

Line 1231

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;

//ATTN: P1 KS KSTESTNULL - Need to relook at this one.

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

return true;

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

{

// For each VALUE element:

Array<const char*> stringArray;

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

{

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

Line 1171

Line 1268

}

expectEndTag(parser, "VALUE.ARRAY");

}

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

return true;

Line 1213

Line 1311

Boolean translatable = getCimBooleanAttribute(

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

Uint32 flavor = 0;

// ATTN: KS P1 5 Mar 2002 Should this not be CIMFlavor::DEFAULTS??

//Uint32 flavor = CIMFlavor::DEFAULTS;

// ATTN-RK-P1-20020307: No, Karl. If you initialize to the defaults,

// you have to unset the default flavors that don't apply. The code

// below only adds qualifiers.

Uint32 flavor = CIMFlavor::NONE;

if (overridable)

flavor |= CIMFlavor::OVERRIDABLE;

Line 1338

Line 1441

// Get VALUE or VALUE.ARRAY element:

// ATTN: KS P1 4 March 2002 - Requires either value or array element or

// generates exception. Correct for spec but means no NULL values on qualifier

// values. Alternative is to set NULL value and continue

CIMValue value;

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

Line 1421

Line 1528

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

// Create property:

// Create property: Sets type and !isarray

// ATTN: KS P1 change to use the correct constructor

CIMValue value;

value.setNullValue(type, false);

Line 1434

Line 1542

getQualifierElements(parser, property);

// Get value:

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

if (getValueElement(parser, type, value))

property.setValue(value);

Line 1533

Line 1641

// Create property:

// ATTN: KS P1 4 March 2002 Change to use correct constructor.

// ATTN: KS P3 4 March 2002. Why create extra value. Use same one.

CIMValue nullValue;

nullValue.setNullValue(type, true, arraySize);

property = CIMProperty(

Line 1546

Line 1657

// Get value:

// ATTN: KS P1 4 March 2002. Does not set array type into value.

// ATTN: Thus, if it returns false, the CIMValue is nothing.

CIMValue value;

if (getValueArrayElement(parser, type, value))

Line 2164

Line 2277

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

// getValueReferenceArrayElement()

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

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

Boolean XmlReader::getValueReferenceArrayElement(

XmlParser& parser,

CIMValue& value)

{

XmlEntry entry;

Array<CIMReference> referenceArray;

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

Line 2963

Boolean XmlReader::getMessageStartTag(

XmlParser& parser,

String& id,

const char*& protocolVersion)

String& protocolVersion)

{

XmlEntry entry;

Line 3255

Line 3407

value.set(reference);

type = CIMType::REFERENCE;

}

// ATTN-RK-P2-20010219: This method does not exist. CIMValue does

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

// not currently allow for an array of CIMReferences.

{

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

type = CIMType::REFERENCE;

//{

}

// type = CIMType::REFERENCE;

//}

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

}

Line 3284

Line 3434

expectEndTag(parser, "PARAMVALUE");

}

paramValue = CIMParamValue(CIMParameter(name, type), value);

paramValue = CIMParamValue(name, value, Boolean(type!=CIMType::NONE));

return true;

}

Legend:

Removed from v.1.27
changed lines
	Added in v.1.39

No CVS admin address has been configured