version 1.27, 2002/02/20 23:14:19
|
version 1.52, 2002/05/11 21:36:29
|
|
|
// Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com) | // Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com) |
// | // |
//%///////////////////////////////////////////////////////////////////////////// | //%///////////////////////////////////////////////////////////////////////////// |
|
#include <Pegasus/Common/Config.h> |
#include <cassert> | #include <cassert> |
#include <cctype> | #include <cctype> |
#include <cstdio> | #include <cstdio> |
#include <cstdlib> | #include <cstdlib> |
|
#if defined(PEGASUS_OS_TYPE_UNIX) |
|
#include <errno.h> |
|
#endif |
#include "CIMName.h" | #include "CIMName.h" |
#include "XmlReader.h" | #include "XmlReader.h" |
#include "XmlWriter.h" | #include "XmlWriter.h" |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// expectXmlDeclaration() |
// getXmlDeclaration() |
|
// |
|
// <?xml version="1.0" encoding="utf-8"?> |
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
void XmlReader::expectXmlDeclaration( |
void XmlReader::getXmlDeclaration( |
XmlParser& parser, | XmlParser& parser, |
XmlEntry& entry) |
const char*& xmlVersion, |
|
const char*& xmlEncoding) |
{ | { |
|
XmlEntry entry; |
|
|
if (!parser.next(entry) || | if (!parser.next(entry) || |
entry.type != XmlEntry::XML_DECLARATION || | entry.type != XmlEntry::XML_DECLARATION || |
strcmp(entry.text, "xml") != 0) | strcmp(entry.text, "xml") != 0) |
|
|
throw XmlValidationError(parser.getLine(), | throw XmlValidationError(parser.getLine(), |
"Expected <?xml ... ?> style declaration"); | "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? |
|
} |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// testEndTag>() |
// testEndTag() |
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// testCimStartTag() |
// getCimStartTag() |
// | // |
// <!ELEMENT CIM (MESSAGE|DECLARATION)> | // <!ELEMENT CIM (MESSAGE|DECLARATION)> |
// <!ATTRLIST CIM | // <!ATTRLIST CIM |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
void XmlReader::testCimStartTag(XmlParser& parser) |
void XmlReader::getCimStartTag( |
|
XmlParser& parser, |
|
const char*& cimVersion, |
|
const char*& dtdVersion) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
XmlReader::expectStartTag(parser, entry, "CIM"); | XmlReader::expectStartTag(parser, entry, "CIM"); |
| |
const char* cimVersion; |
|
|
|
if (!entry.getAttributeValue("CIMVERSION", cimVersion)) | if (!entry.getAttributeValue("CIMVERSION", cimVersion)) |
throw XmlValidationError( | throw XmlValidationError( |
parser.getLine(), "missing CIM.CIMVERSION attribute"); | 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)) | if (!entry.getAttributeValue("DTDVERSION", dtdVersion)) |
throw XmlValidationError( | throw XmlValidationError( |
parser.getLine(), "missing CIM.DTDVERSION attribute"); | parser.getLine(), "missing CIM.DTDVERSION attribute"); |
|
|
if (strcmp(dtdVersion, "2.0") != 0) |
|
throw XmlValidationError(parser.getLine(), |
|
"CIM.DTDVERSION attribute must be \"2.0\""); |
|
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
| |
Boolean XmlReader::stringToReal(const char* stringValue, Real64& x) | Boolean XmlReader::stringToReal(const char* stringValue, Real64& x) |
{ | { |
|
// |
|
// Check the string against the DMTF-defined grammar |
|
// |
const char* p = stringValue; | const char* p = stringValue; |
| |
if (!*p) | if (!*p) |
|
|
if (*p) | if (*p) |
return false; | return false; |
| |
|
// |
|
// Do the conversion |
|
// |
char* end; | char* end; |
|
errno = 0; |
x = strtod(stringValue, &end); | x = strtod(stringValue, &end); |
|
if (*end || (errno == ERANGE)) |
|
{ |
|
return false; |
|
} |
|
|
return true; | 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 | // stringToSignedInteger |
// | // |
// [ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" ) | // [ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" ) |
|
// or |
|
// [ "+" | "-" ] ( "0x" | "0X" ) 1*hexDigit |
// | // |
// ATTN-B: handle conversion from hexadecimal. |
|
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
Boolean XmlReader::stringToSignedInteger( | Boolean XmlReader::stringToSignedInteger( |
|
|
x = 0; | x = 0; |
const char* p = stringValue; | const char* p = stringValue; |
| |
if (!*p) |
if (!p || !*p) |
return false; | return false; |
| |
// Skip optional sign: | // Skip optional sign: |
|
|
if (negative || *p == '+') | if (negative || *p == '+') |
p++; | p++; |
| |
// If the next thing is a zero, then it must be the last: |
|
|
|
if (*p == '0') | 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; | 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) | if (*p) |
return false; | 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; |
|
|
|
// Build the Sint64 as a negative number, regardless of the |
|
// eventual sign (negative numbers can be bigger than positive ones) |
|
|
|
// Add on each digit, checking for overflow errors |
|
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; |
| |
while (first != last) |
// Make sure we won't overflow when we add the next digit |
x = 10 * x + (*first++ - '0'); |
Sint64 newDigit = (*p++ - '0'); |
|
if (PEGASUS_LLONG_MIN - x > -newDigit) |
|
{ |
|
return false; |
|
} |
|
x = x - newDigit; |
|
} |
| |
if (negative) |
// If we found a non-decimal digit, report an error |
x = -x; |
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; | return true; |
} | } |
| |
|
|
// | // |
// stringToUnsignedInteger | // stringToUnsignedInteger |
// | // |
// [ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" ) |
// ( positiveDecimalDigit *decimalDigit | "0" ) |
|
// or |
|
// ( "0x" | "0X" ) 1*hexDigit |
// | // |
// ATTN-B: handle conversion from hexadecimal. |
|
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
Boolean XmlReader::stringToUnsignedInteger( | Boolean XmlReader::stringToUnsignedInteger( |
|
|
x = 0; | x = 0; |
const char* p = stringValue; | const char* p = stringValue; |
| |
if (!*p) |
if (!p || !*p) |
return false; | 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; | 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; |
| |
// If the next thing is a zero, then it must be the last: |
// 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 (*p == '0') |
// If we found a non-hexadecimal digit, report an error |
|
if (*p) |
|
return false; |
|
|
|
return true; |
|
} |
|
else |
|
{ |
|
// A decimal string that starts with '0' must be exactly "0". |
return p[1] == '\0'; | return p[1] == '\0'; |
|
} |
|
} |
| |
// Expect a positive decimal digit: | // 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; | 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) | if (*p) |
return false; | return false; |
| |
const char* last = p; |
|
|
|
while (first != last) |
|
x = 10 * x + (*first++ - '0'); |
|
|
|
return true; | return true; |
} | } |
| |
|
|
// | // |
// stringToValue() | // 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. |
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
|
|
{ | { |
// ATTN-B: accepting only UTF-8 for now! (affects string and char16): | // 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) | switch (type) |
{ | { |
case CIMType::BOOLEAN: | case CIMType::BOOLEAN: |
|
|
| |
switch (type) | 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)); | case CIMType::UINT64: return CIMValue(Uint64(x)); |
default: break; | default: break; |
} | } |
|
|
| |
switch (type) | 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)); | case CIMType::SINT64: return CIMValue(Sint64(x)); |
default: break; | default: break; |
} | } |
|
|
Real64 x; | Real64 x; |
| |
if (!stringToReal(valueString, x)) | if (!stringToReal(valueString, x)) |
throw XmlSemanticError(lineNumber, "Bad real value"); |
throw XmlSemanticError(lineNumber, "Bad real number value"); |
| |
return CIMValue(Real32(x)); | return CIMValue(Real32(x)); |
} | } |
|
|
Real64 x; | Real64 x; |
| |
if (!stringToReal(valueString, x)) | if (!stringToReal(valueString, x)) |
throw XmlSemanticError(lineNumber, "Bad real value"); |
throw XmlSemanticError(lineNumber, "Bad real number value"); |
| |
return CIMValue(x); | return CIMValue(x); |
} | } |
|
|
// | // |
// <!ELEMENT VALUE (#PCDATA)> | // <!ELEMENT VALUE (#PCDATA)> |
// | // |
|
// Return: false if no value element. |
|
// |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
Boolean XmlReader::getValueElement( | Boolean XmlReader::getValueElement( |
|
|
CIMType type, | CIMType type, |
CIMValue& value) | CIMValue& value) |
{ | { |
// Get VALUE start tag: |
// Get VALUE start tag: Return false if no VALUE start Tag |
| |
XmlEntry entry; | XmlEntry entry; |
if (!testStartTagOrEmptyTag(parser, entry, "VALUE")) | if (!testStartTagOrEmptyTag(parser, entry, "VALUE")) |
|
|
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- |
// | // |
// getPropertyValue | // 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.ARRAY (VALUE*)> |
// | // |
// <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME| | // <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME| |
|
// <!ELEMENT VALUE.ARRAY (VALUE*)> |
|
// |
|
// <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME| |
// INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)> | // INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)> |
// | // |
|
// <!ELEMENT VALUE.REFARRAY (VALUE.REFERENCE*)> |
|
// |
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- |
Boolean XmlReader::getPropertyValue( | Boolean XmlReader::getPropertyValue( |
XmlParser& parser, | XmlParser& parser, |
CIMValue& cimValue) | 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)) | if (XmlReader::getValueElement(parser, type, cimValue)) |
{ | { |
//cout << "DEBUG xmlReader::getPropertyValue " << __LINE__ |
|
// << " CimValue = " << cimValue.toString << endl; |
|
return true; | return true; |
} | } |
| |
//Test for Element.array value |
// Test for VALUE.ARRAY element |
if(XmlReader::getValueArrayElement(parser, type, cimValue)) | if(XmlReader::getValueArrayElement(parser, type, cimValue)) |
|
{ |
return true; | return true; |
|
} |
| |
// Test for Value.reference type |
// Test for VALUE.REFERENCE element |
CIMReference reference; | CIMReference reference; |
if(XmlReader::getValueReferenceElement(parser, reference)) | if(XmlReader::getValueReferenceElement(parser, reference)) |
{ | { |
|
|
return true; | return true; |
} | } |
| |
|
// Test for VALUE.REFARRAY element |
|
if (XmlReader::getValueReferenceArrayElement(parser, cimValue)) |
|
{ |
|
return true; |
|
} |
|
|
return false; | return false; |
} | } |
| |
|
|
// | // |
// <!ELEMENT VALUE.ARRAY (VALUE*)> | // <!ELEMENT VALUE.ARRAY (VALUE*)> |
// | // |
|
// Return: Boolean. Returns false if there is no VALUE.ARRAY start element |
|
// |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
Boolean XmlReader::getValueArrayElement( | Boolean XmlReader::getValueArrayElement( |
|
|
CIMType type, | CIMType type, |
CIMValue& value) | CIMValue& value) |
{ | { |
|
// Clears any values from the Array. Assumes this is array CIMValue |
value.clear(); | value.clear(); |
| |
// Get VALUE.ARRAY open tag: | // Get VALUE.ARRAY open tag: |
| |
XmlEntry entry; | XmlEntry entry; |
|
Array<const char*> stringArray; |
| |
|
// If no VALUE.ARRAY start tag, return false |
if (!testStartTagOrEmptyTag(parser, entry, "VALUE.ARRAY")) | if (!testStartTagOrEmptyTag(parser, entry, "VALUE.ARRAY")) |
return false; | return false; |
| |
|
//ATTN: P1 KS KSTESTNULL - Need to relook at this one. |
if (entry.type == XmlEntry::EMPTY_TAG) | if (entry.type == XmlEntry::EMPTY_TAG) |
return true; | return true; |
| |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
|
{ |
// For each VALUE element: | // For each VALUE element: |
| |
Array<const char*> stringArray; |
|
|
|
while (testStartTagOrEmptyTag(parser, entry, "VALUE")) | while (testStartTagOrEmptyTag(parser, entry, "VALUE")) |
{ | { |
if (entry.type == XmlEntry::EMPTY_TAG) | if (entry.type == XmlEntry::EMPTY_TAG) |
|
|
} | } |
| |
expectEndTag(parser, "VALUE.ARRAY"); | expectEndTag(parser, "VALUE.ARRAY"); |
|
} |
| |
value = stringArrayToValue(parser.getLine(), stringArray, type); | value = stringArrayToValue(parser.getLine(), stringArray, type); |
return true; | return true; |
|
|
Boolean translatable = getCimBooleanAttribute( | Boolean translatable = getCimBooleanAttribute( |
lineNumber, entry, tagName, "TRANSLATABLE", false, false); | 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) | if (overridable) |
flavor |= CIMFlavor::OVERRIDABLE; | flavor |= CIMFlavor::OVERRIDABLE; |
|
else |
|
flavor |= CIMFlavor::DISABLEOVERRIDE; |
| |
if (toSubClass) | if (toSubClass) |
flavor |= CIMFlavor::TOSUBCLASS; | flavor |= CIMFlavor::TOSUBCLASS; |
|
else |
|
flavor |= CIMFlavor::RESTRICTED; |
| |
if (toInstance) | if (toInstance) |
flavor |= CIMFlavor::TOINSTANCE; | flavor |= CIMFlavor::TOINSTANCE; |
|
|
// | // |
// getQualifierElement() | // getQualifierElement() |
// | // |
// <!ELEMENT QUALIFIER (VALUE|VALUE.ARRAY)> |
// <!ELEMENT QUALIFIER (VALUE|VALUE.ARRAY)?> |
// <!ATTLIST QUALIFIER | // <!ATTLIST QUALIFIER |
// %CIMName; | // %CIMName; |
// %CIMType; #REQUIRED | // %CIMType; #REQUIRED |
|
|
if (!getValueElement(parser, type, value) && | if (!getValueElement(parser, type, value) && |
!getValueArrayElement(parser, type, value)) | !getValueArrayElement(parser, type, value)) |
{ | { |
throw XmlSemanticError(parser.getLine(), |
value.setNullValue(type, false); |
"Expected VALUE or VALUE.ARRAY element"); |
|
} | } |
| |
// Expect </QUALIFIER>: | // Expect </QUALIFIER>: |
|
|
| |
CIMType type = getCimTypeAttribute(parser.getLine(), entry, "PROPERTY"); | 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; | CIMValue value; |
value.setNullValue(type, false); | value.setNullValue(type, false); |
|
|
| |
getQualifierElements(parser, property); | getQualifierElements(parser, property); |
| |
// Get value: |
// Get value: Insert value if getValueElement exists (returns True) |
| |
if (getValueElement(parser, type, value)) | if (getValueElement(parser, type, value)) |
property.setValue(value); | property.setValue(value); |
|
|
| |
// Create property: | // 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; | CIMValue nullValue; |
nullValue.setNullValue(type, true, arraySize); | nullValue.setNullValue(type, true, arraySize); |
property = CIMProperty( | property = CIMProperty( |
|
|
| |
// Get value: | // 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; | CIMValue value; |
| |
if (getValueArrayElement(parser, type, value)) | if (getValueArrayElement(parser, type, value)) |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
|
// 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() | // getPropertyReferenceElement() |
// | // |
// <!ELEMENT PROPERTY.REFERENCE (QUALIFIER*,(VALUE.REFERENCE)?)> | // <!ELEMENT PROPERTY.REFERENCE (QUALIFIER*,(VALUE.REFERENCE)?)> |
|
|
| |
// Create property: | // Create property: |
| |
CIMValue value; |
CIMValue value = CIMValue(CIMType::REFERENCE, false, 0); |
value.set(CIMReference()); |
// value.set(CIMReference()); |
property = CIMProperty( | property = CIMProperty( |
name, value, 0, referenceClass, classOrigin, propagated); | name, value, 0, referenceClass, classOrigin, propagated); |
| |
|
|
Boolean XmlReader::getMessageStartTag( | Boolean XmlReader::getMessageStartTag( |
XmlParser& parser, | XmlParser& parser, |
String& id, | String& id, |
const char*& protocolVersion) |
String& protocolVersion) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
| |
Boolean XmlReader::getErrorElement( | Boolean XmlReader::getErrorElement( |
XmlParser& parser, | XmlParser& parser, |
CIMStatusCode& code, |
CIMException& cimException, |
const char*& description, |
|
Boolean required) | Boolean required) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
|
|
throw XmlValidationError( | throw XmlValidationError( |
parser.getLine(), "missing ERROR.CODE attribute"); | parser.getLine(), "missing ERROR.CODE attribute"); |
| |
code = CIMStatusCode(tmpCode); |
|
|
|
// Get ERROR.DESCRIPTION: | // Get ERROR.DESCRIPTION: |
| |
description = ""; |
String tmpDescription; |
entry.getAttributeValue("DESCRIPTION", description); |
|
|
entry.getAttributeValue("DESCRIPTION", tmpDescription); |
| |
if (!empty) | if (!empty) |
expectEndTag(parser, "ERROR"); | expectEndTag(parser, "ERROR"); |
| |
|
cimException = PEGASUS_CIM_EXCEPTION(CIMStatusCode(tmpCode), tmpDescription); |
return true; | 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))> | // <!ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH,CLASS)|(INSTANCEPATH,INSTANCE))> |
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
Boolean XmlReader::getObjectWithPath( |
Boolean XmlReader::getValueObjectWithPathElement( |
XmlParser& parser, | XmlParser& parser, |
CIMObjectWithPath& objectWithPath) | CIMObjectWithPath& objectWithPath) |
{ | { |
|
|
else if (!XmlReader::getClassPathElement(parser, reference)) | else if (!XmlReader::getClassPathElement(parser, reference)) |
{ | { |
throw XmlValidationError(parser.getLine(), | throw XmlValidationError(parser.getLine(), |
"Expected INSTANCE element"); |
"Expected INSTANCEPATH or CLASSPATH element"); |
} | } |
| |
if (isInstance) | if (isInstance) |
|
|
if (!XmlReader::getInstanceElement(parser, cimInstance)) | if (!XmlReader::getInstanceElement(parser, cimInstance)) |
{ | { |
throw XmlValidationError(parser.getLine(), | throw XmlValidationError(parser.getLine(), |
"Expected INSTANCEPATH or CLASSPATH element"); |
"Expected INSTANCE element"); |
} | } |
objectWithPath.set(reference, CIMObject(cimInstance)); | objectWithPath.set(reference, CIMObject(cimInstance)); |
} | } |
|
|
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
// getValueObjectWithLocalPathElement() |
|
// |
|
// <!ELEMENT VALUE.OBJECTWITHLOCALPATH |
|
// ((LOCALCLASSPATH,CLASS)|(LOCALINSTANCEPATH,INSTANCE))> |
|
// |
|
//------------------------------------------------------------------------------ |
|
|
|
Boolean XmlReader::getValueObjectWithLocalPathElement( |
|
XmlParser& parser, |
|
CIMObjectWithPath& objectWithPath) |
|
{ |
|
XmlEntry entry; |
|
|
|
if (!testStartTag(parser, entry, "VALUE.OBJECTWITHLOCALPATH")) |
|
return false; |
|
|
|
CIMReference 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.set(reference, CIMObject(cimInstance)); |
|
} |
|
else |
|
{ |
|
CIMClass cimClass; |
|
|
|
if (!XmlReader::getClassElement(parser, cimClass)) |
|
{ |
|
throw XmlValidationError(parser.getLine(), |
|
"Expected CLASS element"); |
|
} |
|
objectWithPath.set(reference, CIMObject(cimClass)); |
|
} |
|
|
|
expectEndTag(parser, "VALUE.OBJECTWITHLOCALPATH"); |
|
|
|
return true; |
|
} |
|
|
|
//------------------------------------------------------------------------------ |
|
// getObjectArray() |
|
// |
|
// <object> |
|
// (VALUE.OBJECT|VALUE.OBJECTWITHLOCALPATH|VALUE.OBJECTWITHPATH) |
|
// |
|
//------------------------------------------------------------------------------ |
|
|
|
void XmlReader::getObjectArray( |
|
XmlParser& parser, |
|
Array<CIMObjectWithPath>& objectArray) |
|
{ |
|
CIMObject object; |
|
CIMObjectWithPath objectWithPath; |
|
|
|
objectArray.clear(); |
|
|
|
if (getValueObjectElement(parser, object)) |
|
{ |
|
objectArray.append(CIMObjectWithPath(CIMReference(), object)); |
|
while (getValueObjectElement(parser, object)) |
|
objectArray.append(CIMObjectWithPath(CIMReference(), 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) | // <objectName>: (CLASSNAME|INSTANCENAME) |
// | // |
|
|
value.set(reference); | value.set(reference); |
type = CIMType::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 | // If type==reference but no VALUE.REFERENCE found, use null value |
} | } |
| |
|
|
expectEndTag(parser, "PARAMVALUE"); | expectEndTag(parser, "PARAMVALUE"); |
} | } |
| |
paramValue = CIMParamValue(CIMParameter(name, type), value); |
paramValue = CIMParamValue(name, value, Boolean(type!=CIMType::NONE)); |
| |
return true; | return true; |
} | } |