version 1.29, 2002/02/22 02:48:01
|
version 1.105, 2004/10/17 20:39:18
|
|
|
//%///////////////////////////////////////////////////////////////////////////// |
//%2004//////////////////////////////////////////////////////////////////////// |
// | // |
// Copyright (c) 2000, 2001 BMC Software, Hewlett-Packard Company, IBM, |
// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development |
// The Open Group, Tivoli Systems |
// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. |
|
// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; |
|
// IBM Corp.; EMC Corporation, The Open Group. |
|
// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; |
|
// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. |
// | // |
// Permission is hereby granted, free of charge, to any person obtaining a copy | // Permission is hereby granted, free of charge, to any person obtaining a copy |
// of this software and associated documentation files (the "Software"), to | // of this software and associated documentation files (the "Software"), to |
|
|
// 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 <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" |
|
|
#include "CIMClass.h" | #include "CIMClass.h" |
#include "CIMInstance.h" | #include "CIMInstance.h" |
#include "CIMObject.h" | #include "CIMObject.h" |
#include "CIMNamedInstance.h" |
|
#include "CIMParamValue.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> |
|
|
|
#define PEGASUS_SINT64_MIN (PEGASUS_SINT64_LITERAL(0x8000000000000000)) |
|
#define PEGASUS_UINT64_MAX PEGASUS_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF) |
| |
PEGASUS_USING_STD; | PEGASUS_USING_STD; |
PEGASUS_NAMESPACE_BEGIN | PEGASUS_NAMESPACE_BEGIN |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// 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(), |
|
|
// l10n |
|
|
|
// throw XmlValidationError(parser.getLine(), |
|
// "Expected <?xml ... ?> style declaration"); |
|
|
|
MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_XML_STYLE", |
"Expected <?xml ... ?> style declaration"); | "Expected <?xml ... ?> style declaration"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
|
} |
|
|
|
if (!entry.getAttributeValue("version", xmlVersion)) { |
|
|
|
// 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)) |
|
{ |
|
// ATTN-RK-P3-20020403: Is there a default encoding? |
} | } |
} | } |
| |
|
|
entry.type != XmlEntry::START_TAG || | entry.type != XmlEntry::START_TAG || |
strcmp(entry.text, tagName) != 0) | 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); |
} | } |
} | } |
| |
|
|
entry.type != XmlEntry::END_TAG || | entry.type != XmlEntry::END_TAG || |
strcmp(entry.text, tagName) != 0) | 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); | tagName,entry.text); |
throw XmlValidationError(parser.getLine(), message); |
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
} | } |
| |
|
|
entry.type != XmlEntry::EMPTY_TAG) || | entry.type != XmlEntry::EMPTY_TAG) || |
strcmp(entry.text, tagName) != 0) | 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); |
} | } |
} | } |
| |
|
|
(entry.type != XmlEntry::CONTENT && | (entry.type != XmlEntry::CONTENT && |
entry.type != XmlEntry::CDATA)) | 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"); | "Expected content of CDATA"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
return true; | return true; |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// testEndTag>() |
// testEndTag() |
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
|
// 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() | // testContentOrCData() |
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// 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)) { |
|
|
|
// l10n |
|
|
|
// throw XmlValidationError( |
|
// parser.getLine(), "missing CIM.CIMVERSION attribute"); |
| |
if (!entry.getAttributeValue("CIMVERSION", cimVersion)) |
MessageLoaderParms mlParms("Common.XmlReader.MISSING_CIMVERSION_ATTRIBUTE", |
throw XmlValidationError( |
"missing CIM.CIMVERSION attribute"); |
parser.getLine(), "missing CIM.CIMVERSION attribute"); |
|
| |
if (strcmp(cimVersion, "2.0") != 0) |
throw XmlValidationError(parser.getLine(), mlParms); |
throw XmlValidationError(parser.getLine(), |
} |
"CIM.CIMVERSION attribute must be \"2.0\""); |
|
|
if (!entry.getAttributeValue("DTDVERSION", dtdVersion)){ |
| |
const char* dtdVersion; |
// l10n |
| |
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) |
MessageLoaderParms mlParms("Common.XmlReader.MISSING_DTDVERSION_ATTRIBUTE", |
throw XmlValidationError(parser.getLine(), |
"missing CIM.DTDVERSION attribute"); |
"CIM.DTDVERSION attribute must be \"2.0\""); |
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
String XmlReader::getCimNameAttribute( |
CIMName XmlReader::getCimNameAttribute( |
Uint32 lineNumber, | Uint32 lineNumber, |
const XmlEntry& entry, | const XmlEntry& entry, |
const char* elementName, | const char* elementName, |
|
|
| |
if (!entry.getAttributeValue("NAME", name)) | 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]; | 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) | if (acceptNull && name.size() == 0) |
return name; |
return CIMName (); |
| |
if (!CIMName::legal(name)) | 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]; | 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 CIMName (name); |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
| |
if (!entry.getAttributeValue("CLASSNAME", name)) | 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]; | 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)) | 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]; | 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; | return name; |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
String XmlReader::getClassOriginAttribute( |
CIMName XmlReader::getClassOriginAttribute( |
Uint32 lineNumber, | Uint32 lineNumber, |
const XmlEntry& entry, | const XmlEntry& entry, |
const char* tagName) | const char* tagName) |
|
|
String name; | String name; |
| |
if (!entry.getAttributeValue("CLASSORIGIN", name)) | if (!entry.getAttributeValue("CLASSORIGIN", name)) |
return String(); |
return CIMName(); |
| |
if (!CIMName::legal(name)) | 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]; | 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; | return name; |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
String XmlReader::getReferenceClassAttribute( |
CIMName XmlReader::getReferenceClassAttribute( |
Uint32 lineNumber, | Uint32 lineNumber, |
const XmlEntry& entry, | const XmlEntry& entry, |
const char* elementName) | const char* elementName) |
|
|
String name; | String name; |
| |
if (!entry.getAttributeValue("REFERENCECLASS", name)) | if (!entry.getAttributeValue("REFERENCECLASS", name)) |
return String(); |
return CIMName(); |
| |
if (!CIMName::legal(name)) | 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]; | 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; | return name; |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
String XmlReader::getSuperClassAttribute( |
CIMName XmlReader::getSuperClassAttribute( |
Uint32 lineNumber, | Uint32 lineNumber, |
const XmlEntry& entry, | const XmlEntry& entry, |
const char* tagName) | const char* tagName) |
|
|
String superClass; | String superClass; |
| |
if (!entry.getAttributeValue("SUPERCLASS", superClass)) | if (!entry.getAttributeValue("SUPERCLASS", superClass)) |
return String(); |
return CIMName(); |
| |
if (!CIMName::legal(superClass)) | 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]; | 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; | return superClass; |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
CIMType XmlReader::getCimTypeAttribute( |
Boolean XmlReader::getCimTypeAttribute( |
Uint32 lineNumber, | Uint32 lineNumber, |
const XmlEntry& entry, | const XmlEntry& entry, |
|
CIMType& cimType, // Output parameter |
const char* tagName, | const char* tagName, |
const char* attributeName, | const char* attributeName, |
Boolean required) | Boolean required) |
|
|
{ | { |
if (required) | if (required) |
{ | { |
|
|
|
// l10n |
|
|
|
// char message[MESSAGE_SIZE]; |
|
// sprintf(message, "missing %s.%s attribute", tagName, attributeName); |
|
// throw XmlValidationError(lineNumber, message); |
|
|
char message[MESSAGE_SIZE]; | 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 | else |
{ | { |
return CIMType::NONE; |
return false; |
} | } |
} | } |
| |
CIMType type = CIMType::NONE; |
CIMType type = CIMTYPE_BOOLEAN; |
|
Boolean unrecognizedType = false; |
| |
if (strcmp(typeName, "boolean") == 0) | if (strcmp(typeName, "boolean") == 0) |
type = CIMType::BOOLEAN; |
type = CIMTYPE_BOOLEAN; |
else if (strcmp(typeName, "string") == 0) | else if (strcmp(typeName, "string") == 0) |
type = CIMType::STRING; |
type = CIMTYPE_STRING; |
else if (strcmp(typeName, "char16") == 0) | else if (strcmp(typeName, "char16") == 0) |
type = CIMType::CHAR16; |
type = CIMTYPE_CHAR16; |
else if (strcmp(typeName, "uint8") == 0) | else if (strcmp(typeName, "uint8") == 0) |
type = CIMType::UINT8; |
type = CIMTYPE_UINT8; |
else if (strcmp(typeName, "sint8") == 0) | else if (strcmp(typeName, "sint8") == 0) |
type = CIMType::SINT8; |
type = CIMTYPE_SINT8; |
else if (strcmp(typeName, "uint16") == 0) | else if (strcmp(typeName, "uint16") == 0) |
type = CIMType::UINT16; |
type = CIMTYPE_UINT16; |
else if (strcmp(typeName, "sint16") == 0) | else if (strcmp(typeName, "sint16") == 0) |
type = CIMType::SINT16; |
type = CIMTYPE_SINT16; |
else if (strcmp(typeName, "uint32") == 0) | else if (strcmp(typeName, "uint32") == 0) |
type = CIMType::UINT32; |
type = CIMTYPE_UINT32; |
else if (strcmp(typeName, "sint32") == 0) | else if (strcmp(typeName, "sint32") == 0) |
type = CIMType::SINT32; |
type = CIMTYPE_SINT32; |
else if (strcmp(typeName, "uint64") == 0) | else if (strcmp(typeName, "uint64") == 0) |
type = CIMType::UINT64; |
type = CIMTYPE_UINT64; |
else if (strcmp(typeName, "sint64") == 0) | else if (strcmp(typeName, "sint64") == 0) |
type = CIMType::SINT64; |
type = CIMTYPE_SINT64; |
else if (strcmp(typeName, "datetime") == 0) | else if (strcmp(typeName, "datetime") == 0) |
type = CIMType::DATETIME; |
type = CIMTYPE_DATETIME; |
else if (strcmp(typeName, "real32") == 0) | else if (strcmp(typeName, "real32") == 0) |
type = CIMType::REAL32; |
type = CIMTYPE_REAL32; |
else if (strcmp(typeName, "real64") == 0) | else if (strcmp(typeName, "real64") == 0) |
type = CIMType::REAL64; |
type = CIMTYPE_REAL64; |
else if (strcmp(typeName, "reference") == 0) | else if (strcmp(typeName, "reference") == 0) |
type = CIMType::REFERENCE; |
type = CIMTYPE_REFERENCE; |
|
else unrecognizedType = true; |
| |
if ((type == CIMType::NONE) || |
if (unrecognizedType || |
((type == CIMType::REFERENCE) && |
((type == CIMTYPE_REFERENCE) && |
(strcmp(attributeName, "PARAMTYPE") != 0))) | (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); |
} | } |
| |
return type; |
cimType = type; |
|
return true; |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
if (!required) | if (!required) |
return defaultValue; | return defaultValue; |
| |
|
// l10n |
|
|
|
// char buffer[62]; |
|
// sprintf(buffer, "missing required %s.%s attribute", |
|
// attributeName, tagName); |
|
|
|
// throw XmlValidationError(lineNumber, buffer); |
|
|
char buffer[62]; | 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) | if (strcmp(tmp, "true") == 0) |
|
|
else if (strcmp(tmp, "false") == 0) | else if (strcmp(tmp, "false") == 0) |
return false; | return false; |
| |
|
// l10n |
|
|
|
// char buffer[62]; |
|
// sprintf(buffer, "Invalid %s.%s attribute value", attributeName, tagName); |
|
// throw XmlSemanticError(lineNumber, buffer); |
|
|
char buffer[62]; | char buffer[62]; |
sprintf(buffer, "Bad %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; | return false; |
} | } |
| |
|
|
| |
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 _xmlReader_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; |
|
} |
|
|
|
// 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 | // 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_SINT64_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(_xmlReader_hexCharToNumeric(*p++)); |
|
if (PEGASUS_SINT64_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_SINT64_MIN) |
|
{ |
|
return false; |
|
} |
|
x = -x; |
|
} |
|
return true; |
|
} |
|
else |
|
{ |
|
// A decimal string that starts with '0' must be exactly "0". |
|
return p[1] == '\0'; |
|
} |
|
} |
| |
while (first != last) |
// Expect a positive decimal digit: |
x = 10 * x + (*first++ - '0'); |
|
| |
if (negative) |
// At least one decimal digit is required |
x = -x; |
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_SINT64_MIN/10) |
|
{ |
|
return false; |
|
} |
|
x = 10 * x; |
|
|
|
// Make sure we won't overflow when we add the next digit |
|
Sint64 newDigit = (*p++ - '0'); |
|
if (PEGASUS_SINT64_MIN - x > -newDigit) |
|
{ |
|
return false; |
|
} |
|
x = x - newDigit; |
|
} |
|
|
|
// If we found a non-decimal digit, report an error |
|
if (*p) |
|
return false; |
|
|
|
// Return the integer to positive, if necessary, checking for an |
|
// overflow error |
|
if (!negative) |
|
{ |
|
if (x == PEGASUS_SINT64_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; |
|
|
|
// Skip optional sign: |
|
|
|
if (*p == '-') |
|
return false; | return false; |
| |
if (*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 (!*p) |
return false; | return false; |
| |
p++; |
// Add on each digit, checking for overflow errors |
|
while (isxdigit(*p)) |
// Expect zero or more digits: |
{ |
|
// Make sure we won't overflow when we multiply by 16 |
|
if (x > PEGASUS_UINT64_MAX/16) |
|
{ |
|
return false; |
|
} |
|
x = x << 4; |
| |
while (isdigit(*p)) |
// We can't overflow when we add the next digit |
p++; |
Uint64 newDigit = Uint64(_xmlReader_hexCharToNumeric(*p++)); |
|
if (PEGASUS_UINT64_MAX - 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 true; |
|
} |
|
else |
|
{ |
|
// A decimal string that starts with '0' must be exactly "0". |
|
return p[1] == '\0'; |
|
} |
|
} |
|
|
|
// Expect a positive decimal digit: |
|
|
|
// 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_UINT64_MAX/10) |
|
{ |
|
return false; |
|
} |
|
x = 10 * x; |
|
|
|
// Make sure we won't overflow when we add the next digit |
|
Uint64 newDigit = (*p++ - '0'); |
|
if (PEGASUS_UINT64_MAX - x < newDigit) |
|
{ |
|
return false; |
|
} |
|
x = x + newDigit; |
|
} |
| |
while (first != last) |
// If we found a non-decimal digit, report an error |
x = 10 * x + (*first++ - '0'); |
if (*p) |
|
return false; |
| |
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: |
{ | { |
if (CompareNoCase(valueString, "TRUE") == 0) |
if (System::strcasecmp(valueString, "TRUE") == 0) |
return CIMValue(true); | return CIMValue(true); |
else if (CompareNoCase(valueString, "FALSE") == 0) |
else if (System::strcasecmp(valueString, "FALSE") == 0) |
return CIMValue(false); | return CIMValue(false); |
else |
else { |
throw XmlSemanticError( |
|
lineNumber, "Bad 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: |
case CIMTYPE_STRING: |
{ | { |
return CIMValue(valueString); |
return CIMValue(String(valueString)); |
} | } |
| |
case CIMType::CHAR16: |
case CIMTYPE_CHAR16: |
|
{ |
|
|
|
// 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) |
{ | { |
if (strlen(valueString) != 1) |
// l10n |
throw XmlSemanticError(lineNumber, "Bad char16 value"); |
|
|
// throw XmlSemanticError(lineNumber, "Invalid char16 value"); |
|
|
|
MessageLoaderParms mlParms("Common.XmlReader.INVALID_CHAR16_VALUE", |
|
"Invalid char16 value"); |
| |
return CIMValue(Char16(valueString[0])); |
throw XmlSemanticError(lineNumber, mlParms); |
} | } |
| |
case CIMType::UINT8: |
return CIMValue(tmp[0]); |
case CIMType::UINT16: |
} |
case CIMType::UINT32: |
|
case CIMType::UINT64: |
case CIMTYPE_UINT8: |
|
case CIMTYPE_UINT16: |
|
case CIMTYPE_UINT32: |
|
case CIMTYPE_UINT64: |
{ | { |
Uint64 x; | Uint64 x; |
| |
if (!stringToUnsignedInteger(valueString, x)) | if (!stringToUnsignedInteger(valueString, x)) |
{ | { |
throw XmlSemanticError( |
|
lineNumber, "Bad 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) | switch (type) |
{ | { |
case CIMType::UINT8: return CIMValue(Uint8(x)); |
case CIMTYPE_UINT8: |
case CIMType::UINT16: return CIMValue(Uint16(x)); |
{ |
case CIMType::UINT32: return CIMValue(Uint32(x)); |
if (x >= (Uint64(1)<<8)) |
case CIMType::UINT64: return CIMValue(Uint64(x)); |
{ |
|
|
|
// 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)); |
|
} |
|
case CIMTYPE_UINT16: |
|
{ |
|
if (x >= (Uint64(1)<<16)) |
|
{ |
|
|
|
// 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)); |
|
} |
|
case CIMTYPE_UINT32: |
|
{ |
|
if (x >= (Uint64(1)<<32)) |
|
{ |
|
|
|
// 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)); |
|
} |
|
case CIMTYPE_UINT64: return CIMValue(Uint64(x)); |
default: break; | default: break; |
} | } |
} | } |
| |
case CIMType::SINT8: |
case CIMTYPE_SINT8: |
case CIMType::SINT16: |
case CIMTYPE_SINT16: |
case CIMType::SINT32: |
case CIMTYPE_SINT32: |
case CIMType::SINT64: |
case CIMTYPE_SINT64: |
{ | { |
Sint64 x; | Sint64 x; |
| |
if (!stringToSignedInteger(valueString, x)) | if (!stringToSignedInteger(valueString, x)) |
{ | { |
throw XmlSemanticError( |
|
lineNumber, "Bad 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) | switch (type) |
{ | { |
case CIMType::SINT8: return CIMValue(Sint8(x)); |
case CIMTYPE_SINT8: |
case CIMType::SINT16: return CIMValue(Sint16(x)); |
{ |
case CIMType::SINT32: return CIMValue(Sint32(x)); |
if( (x >= (Sint64(1)<<7)) || (x < (-(Sint64(1)<<7))) ) |
case CIMType::SINT64: return CIMValue(Sint64(x)); |
{ |
|
|
|
// 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)); |
|
} |
|
case CIMTYPE_SINT16: |
|
{ |
|
if( (x >= (Sint64(1)<<15)) || (x < (-(Sint64(1)<<15))) ) |
|
{ |
|
|
|
// 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)); |
|
} |
|
case CIMTYPE_SINT32: |
|
{ |
|
if( (x >= (Sint64(1)<<31)) || (x < (-(Sint64(1)<<31))) ) |
|
{ |
|
|
|
// 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)); |
|
} |
|
case CIMTYPE_SINT64: return CIMValue(Sint64(x)); |
default: break; | default: break; |
} | } |
} | } |
| |
case CIMType::DATETIME: |
case CIMTYPE_DATETIME: |
{ | { |
CIMDateTime tmp; | CIMDateTime tmp; |
| |
try | 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); | tmp.set(valueString); |
} | } |
catch (BadDateTimeFormat&) |
catch (InvalidDateTimeFormatException&) |
{ | { |
throw XmlSemanticError(lineNumber, "Bad 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); | return CIMValue(tmp); |
} | } |
| |
case CIMType::REAL32: |
case CIMTYPE_REAL32: |
{ | { |
Real64 x; | Real64 x; |
| |
if (!stringToReal(valueString, x)) |
if (!stringToReal(valueString, x)) { |
throw XmlSemanticError(lineNumber, "Bad real 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)); | return CIMValue(Real32(x)); |
} | } |
| |
case CIMType::REAL64: |
case CIMTYPE_REAL64: |
{ | { |
Real64 x; | Real64 x; |
| |
if (!stringToReal(valueString, x)) |
if (!stringToReal(valueString, x)) { |
throw XmlSemanticError(lineNumber, "Bad real 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); | return CIMValue(x); |
} | } |
| |
|
|
break; | break; |
} | } |
| |
throw XmlSemanticError(lineNumber, "malformed XML"); |
// l10n |
|
|
|
// throw XmlSemanticError(lineNumber, "malformed XML"); |
|
|
|
MessageLoaderParms mlParms("Common.XmlReader.MALFORMED_XML", |
|
"malformed XML"); |
|
|
|
throw XmlSemanticError(lineNumber, mlParms); |
|
|
return false; | 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() | // getValueElement() |
// | // |
// <!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")) |
|
|
| |
expectEndTag(parser, "VALUE"); | 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); | value = stringToValue(parser.getLine(), valueString,type); |
| |
return true; | return true; |
|
|
| |
if (!testStartTagOrEmptyTag(parser, entry, "VALUE")) | 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; | return false; |
} | } |
| |
|
|
expectEndTag(parser, "VALUE"); | expectEndTag(parser, "VALUE"); |
} | } |
| |
str = valueString; |
str = String(valueString); |
return true; | return true; |
} | } |
| |
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- |
// | // |
// 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.ARRAY (VALUE*)> |
// <!ELEMENT VALUE> |
|
// | // |
|
// <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME| |
// <!ELEMENT VALUE.ARRAY (VALUE*)> | // <!ELEMENT VALUE.ARRAY (VALUE*)> |
// | // |
// <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME| | // <!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; |
CIMObjectPath reference; |
if(XmlReader::getValueReferenceElement(parser, reference)) | if(XmlReader::getValueReferenceElement(parser, reference)) |
{ | { |
cimValue.set(reference); | cimValue.set(reference); |
return true; | return true; |
} | } |
| |
|
// Test for VALUE.REFARRAY element |
|
if (XmlReader::getValueReferenceArrayElement(parser, cimValue)) |
|
{ |
|
return true; |
|
} |
|
|
return false; | return false; |
} | } |
| |
|
|
{ | { |
switch (type) | switch (type) |
{ | { |
case CIMType::BOOLEAN: |
case CIMTYPE_BOOLEAN: |
return StringArrayToValueAux(lineNumber, array, type, (Boolean*)0); | return StringArrayToValueAux(lineNumber, array, type, (Boolean*)0); |
| |
case CIMType::STRING: |
case CIMTYPE_STRING: |
return StringArrayToValueAux(lineNumber, array, type, (String*)0); | return StringArrayToValueAux(lineNumber, array, type, (String*)0); |
| |
case CIMType::CHAR16: |
case CIMTYPE_CHAR16: |
return StringArrayToValueAux(lineNumber, array, type, (Char16*)0); | return StringArrayToValueAux(lineNumber, array, type, (Char16*)0); |
| |
case CIMType::UINT8: |
case CIMTYPE_UINT8: |
return StringArrayToValueAux(lineNumber, array, type, (Uint8*)0); | return StringArrayToValueAux(lineNumber, array, type, (Uint8*)0); |
| |
case CIMType::UINT16: |
case CIMTYPE_UINT16: |
return StringArrayToValueAux(lineNumber, array, type, (Uint16*)0); | return StringArrayToValueAux(lineNumber, array, type, (Uint16*)0); |
| |
case CIMType::UINT32: |
case CIMTYPE_UINT32: |
return StringArrayToValueAux(lineNumber, array, type, (Uint32*)0); | return StringArrayToValueAux(lineNumber, array, type, (Uint32*)0); |
| |
case CIMType::UINT64: |
case CIMTYPE_UINT64: |
return StringArrayToValueAux(lineNumber, array, type, (Uint64*)0); | return StringArrayToValueAux(lineNumber, array, type, (Uint64*)0); |
| |
case CIMType::SINT8: |
case CIMTYPE_SINT8: |
return StringArrayToValueAux(lineNumber, array, type, (Sint8*)0); | return StringArrayToValueAux(lineNumber, array, type, (Sint8*)0); |
| |
case CIMType::SINT16: |
case CIMTYPE_SINT16: |
return StringArrayToValueAux(lineNumber, array, type, (Sint16*)0); | return StringArrayToValueAux(lineNumber, array, type, (Sint16*)0); |
| |
case CIMType::SINT32: |
case CIMTYPE_SINT32: |
return StringArrayToValueAux(lineNumber, array, type, (Sint32*)0); | return StringArrayToValueAux(lineNumber, array, type, (Sint32*)0); |
| |
case CIMType::SINT64: |
case CIMTYPE_SINT64: |
return StringArrayToValueAux(lineNumber, array, type, (Sint64*)0); | return StringArrayToValueAux(lineNumber, array, type, (Sint64*)0); |
| |
case CIMType::DATETIME: |
case CIMTYPE_DATETIME: |
return StringArrayToValueAux(lineNumber, array, type, (CIMDateTime*)0); | return StringArrayToValueAux(lineNumber, array, type, (CIMDateTime*)0); |
| |
case CIMType::REAL32: |
case CIMTYPE_REAL32: |
return StringArrayToValueAux(lineNumber, array, type, (Real32*)0); | return StringArrayToValueAux(lineNumber, array, type, (Real32*)0); |
| |
case CIMType::REAL64: |
case CIMTYPE_REAL64: |
return StringArrayToValueAux(lineNumber, array, type, (Real64*)0); | return StringArrayToValueAux(lineNumber, array, type, (Real64*)0); |
| |
default: | default: |
|
|
// | // |
// <!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; |
| |
if (entry.type == XmlEntry::EMPTY_TAG) |
if (entry.type != XmlEntry::EMPTY_TAG) |
return true; |
{ |
|
|
// 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; |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
Uint32 XmlReader::getFlavor( |
CIMFlavor XmlReader::getFlavor( |
XmlEntry& entry, | XmlEntry& entry, |
Uint32 lineNumber, | Uint32 lineNumber, |
const char* tagName) | const char* tagName) |
|
|
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. |
|
CIMFlavor flavor = CIMFlavor (CIMFlavor::NONE); |
| |
if (overridable) | if (overridable) |
flavor |= CIMFlavor::OVERRIDABLE; |
flavor.addFlavor (CIMFlavor::OVERRIDABLE); |
|
else |
|
flavor.addFlavor (CIMFlavor::DISABLEOVERRIDE); |
| |
if (toSubClass) | if (toSubClass) |
flavor |= CIMFlavor::TOSUBCLASS; |
flavor.addFlavor (CIMFlavor::TOSUBCLASS); |
|
else |
|
flavor.addFlavor (CIMFlavor::RESTRICTED); |
| |
if (toInstance) | if (toInstance) |
flavor |= CIMFlavor::TOINSTANCE; |
flavor.addFlavor (CIMFlavor::TOINSTANCE); |
| |
if (translatable) | if (translatable) |
flavor |= CIMFlavor::TRANSLATABLE; |
flavor.addFlavor (CIMFlavor::TRANSLATABLE); |
| |
return flavor; | return flavor; |
} | } |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
Uint32 XmlReader::getOptionalScope(XmlParser& parser) |
CIMScope XmlReader::getOptionalScope(XmlParser& parser) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
|
CIMScope scope; |
| |
if (!parser.next(entry)) | if (!parser.next(entry)) |
return false; |
return scope; // No SCOPE element found; return the empty scope |
| |
Boolean isEmptyTag = entry.type == XmlEntry::EMPTY_TAG; | Boolean isEmptyTag = entry.type == XmlEntry::EMPTY_TAG; |
| |
|
|
entry.type != XmlEntry::START_TAG) || | entry.type != XmlEntry::START_TAG) || |
strcmp(entry.text, "SCOPE") != 0) | strcmp(entry.text, "SCOPE") != 0) |
{ | { |
|
// No SCOPE element found; return the empty scope |
parser.putBack(entry); | parser.putBack(entry); |
return 0; |
return scope; |
} | } |
| |
Uint32 line = parser.getLine(); | Uint32 line = parser.getLine(); |
Uint32 scope = 0; |
|
| |
if (getCimBooleanAttribute(line, entry, "SCOPE", "CLASS", false, false)) | if (getCimBooleanAttribute(line, entry, "SCOPE", "CLASS", false, false)) |
scope |= CIMScope::CLASS; |
scope.addScope (CIMScope::CLASS); |
| |
if (getCimBooleanAttribute( | if (getCimBooleanAttribute( |
line, entry, "SCOPE", "ASSOCIATION", false, false)) | line, entry, "SCOPE", "ASSOCIATION", false, false)) |
scope |= CIMScope::ASSOCIATION; |
scope.addScope (CIMScope::ASSOCIATION); |
| |
if (getCimBooleanAttribute( | if (getCimBooleanAttribute( |
line, entry, "SCOPE", "REFERENCE", false, false)) | line, entry, "SCOPE", "REFERENCE", false, false)) |
scope |= CIMScope::REFERENCE; |
scope.addScope (CIMScope::REFERENCE); |
| |
if (getCimBooleanAttribute(line, entry, "SCOPE", "PROPERTY", false, false)) | if (getCimBooleanAttribute(line, entry, "SCOPE", "PROPERTY", false, false)) |
scope |= CIMScope::PROPERTY; |
scope.addScope (CIMScope::PROPERTY); |
| |
if (getCimBooleanAttribute(line, entry, "SCOPE", "METHOD", false, false)) | if (getCimBooleanAttribute(line, entry, "SCOPE", "METHOD", false, false)) |
scope |= CIMScope::METHOD; |
scope.addScope (CIMScope::METHOD); |
| |
if (getCimBooleanAttribute(line, entry, "SCOPE", "PARAMETER", false, false)) | if (getCimBooleanAttribute(line, entry, "SCOPE", "PARAMETER", false, false)) |
scope |= CIMScope::PARAMETER; |
scope.addScope (CIMScope::PARAMETER); |
| |
if (getCimBooleanAttribute(line, entry, "SCOPE", "INDICATION",false, false)) | if (getCimBooleanAttribute(line, entry, "SCOPE", "INDICATION",false, false)) |
scope |= CIMScope::INDICATION; |
scope.addScope (CIMScope::INDICATION); |
| |
if (!isEmptyTag) | if (!isEmptyTag) |
expectEndTag(parser, "SCOPE"); | expectEndTag(parser, "SCOPE"); |
|
|
// | // |
// getQualifierElement() | // getQualifierElement() |
// | // |
// <!ELEMENT QUALIFIER (VALUE|VALUE.ARRAY)> |
// <!ELEMENT QUALIFIER (VALUE|VALUE.ARRAY)?> |
// <!ATTLIST QUALIFIER | // <!ATTLIST QUALIFIER |
// %CIMName; | // %CIMName; |
// %CIMType; #REQUIRED | // %CIMType; #REQUIRED |
|
|
// Get QUALIFIER element: | // Get QUALIFIER element: |
| |
XmlEntry entry; | XmlEntry entry; |
if (!testStartTag(parser, entry, "QUALIFIER")) |
if (!testStartTagOrEmptyTag(parser, entry, "QUALIFIER")) |
return false; | return false; |
| |
|
Boolean empty = entry.type == XmlEntry::EMPTY_TAG; |
|
|
// Get QUALIFIER.NAME attribute: | // Get QUALIFIER.NAME attribute: |
| |
String name = getCimNameAttribute(parser.getLine(), entry, "QUALIFIER"); |
CIMName name = getCimNameAttribute(parser.getLine(), entry, "QUALIFIER"); |
| |
// Get QUALIFIER.TYPE attribute: | // Get QUALIFIER.TYPE attribute: |
| |
CIMType type = getCimTypeAttribute(parser.getLine(), entry, "QUALIFIER"); |
CIMType type; |
|
getCimTypeAttribute(parser.getLine(), entry, type, "QUALIFIER"); |
| |
// Get QUALIFIER.PROPAGATED | // Get QUALIFIER.PROPAGATED |
| |
|
|
| |
// Get flavor oriented attributes: | // Get flavor oriented attributes: |
| |
Uint32 flavor = getFlavor(entry, parser.getLine(), "QUALIFIER"); |
CIMFlavor flavor = getFlavor(entry, parser.getLine(), "QUALIFIER"); |
| |
// Get VALUE or VALUE.ARRAY element: | // Get VALUE or VALUE.ARRAY element: |
| |
CIMValue value; | CIMValue value; |
| |
|
if (empty) |
|
{ |
|
value.setNullValue(type, false); |
|
} |
|
else |
|
{ |
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>: |
| |
expectEndTag(parser, "QUALIFIER"); | expectEndTag(parser, "QUALIFIER"); |
|
} |
| |
// Build qualifier: | // Build qualifier: |
| |
|
|
{ | { |
container.addQualifier(qualifier); | container.addQualifier(qualifier); |
} | } |
catch (AlreadyExists&) |
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); |
} | } |
} | } |
} | } |
|
|
| |
// Get PROPERTY.NAME attribute: | // Get PROPERTY.NAME attribute: |
| |
String name = getCimNameAttribute(parser.getLine(), entry, "PROPERTY"); |
CIMName name = getCimNameAttribute(parser.getLine(), entry, "PROPERTY"); |
| |
// Get PROPERTY.CLASSORIGIN attribute: | // Get PROPERTY.CLASSORIGIN attribute: |
| |
String classOrigin = |
CIMName classOrigin = |
getClassOriginAttribute(parser.getLine(), entry, "PROPERTY"); | getClassOriginAttribute(parser.getLine(), entry, "PROPERTY"); |
| |
// Get PROPERTY.PROPAGATED | // Get PROPERTY.PROPAGATED |
|
|
| |
// Get PROPERTY.TYPE attribute: | // Get PROPERTY.TYPE attribute: |
| |
CIMType type = getCimTypeAttribute(parser.getLine(), entry, "PROPERTY"); |
CIMType type; |
|
getCimTypeAttribute(parser.getLine(), entry, type, "PROPERTY"); |
| |
// Create property: |
// Create property: Sets type and !isarray |
| |
CIMValue value; |
CIMValue value(type, false); |
value.setNullValue(type, false); |
property = CIMProperty(name, value, 0, CIMName(), classOrigin, propagated); |
property = CIMProperty( |
|
name, value, 0, String(), classOrigin, propagated); |
|
| |
if (!empty) | if (!empty) |
{ | { |
|
|
| |
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); |
|
|
| |
if (!stringToUnsignedInteger(tmp, arraySize) || arraySize == 0) | 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]; | 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); | value = Uint32(arraySize); |
|
|
| |
// Get PROPERTY.NAME attribute: | // Get PROPERTY.NAME attribute: |
| |
String name = |
CIMName name = |
getCimNameAttribute(parser.getLine(), entry, "PROPERTY.ARRAY"); | getCimNameAttribute(parser.getLine(), entry, "PROPERTY.ARRAY"); |
| |
// Get PROPERTY.TYPE attribute: | // Get PROPERTY.TYPE attribute: |
| |
CIMType type = getCimTypeAttribute(parser.getLine(), entry, "PROPERTY.ARRAY"); |
CIMType type; |
|
getCimTypeAttribute(parser.getLine(), entry, type, "PROPERTY.ARRAY"); |
| |
// Get PROPERTY.ARRAYSIZE attribute: | // Get PROPERTY.ARRAYSIZE attribute: |
| |
|
|
| |
// Get PROPERTY.CLASSORIGIN attribute: | // Get PROPERTY.CLASSORIGIN attribute: |
| |
String classOrigin |
CIMName classOrigin |
= getClassOriginAttribute(parser.getLine(), entry, "PROPERTY.ARRAY"); | = getClassOriginAttribute(parser.getLine(), entry, "PROPERTY.ARRAY"); |
| |
// Get PROPERTY.ARRAY.PROPAGATED | // Get PROPERTY.ARRAY.PROPAGATED |
|
|
| |
// Create property: | // Create property: |
| |
CIMValue nullValue; |
CIMValue value(type, true, arraySize); |
nullValue.setNullValue(type, true, arraySize); |
|
property = CIMProperty( | property = CIMProperty( |
name, nullValue, arraySize, String(), classOrigin, propagated); |
name, value, arraySize, CIMName(), classOrigin, propagated); |
| |
if (!empty) | if (!empty) |
{ | { |
|
|
| |
// Get value: | // Get value: |
| |
CIMValue value; |
|
|
|
if (getValueArrayElement(parser, type, value)) | if (getValueArrayElement(parser, type, value)) |
{ | { |
if (arraySize && arraySize != value.getArraySize()) | 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"); | "ARRAYSIZE attribute and value-array size are different"); |
|
|
|
throw XmlSemanticError(parser.getLine(), mlParms); |
} | } |
| |
property.setValue(value); | property.setValue(value); |
|
|
| |
if (!testStartTag(parser, entry, "HOST")) | if (!testStartTag(parser, entry, "HOST")) |
return false; | 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) | 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"); | "expected content of HOST element"); |
} |
|
| |
host = entry.text; |
throw XmlValidationError(parser.getLine(), mlParms); |
| |
|
} |
|
|
|
host = String(entry.text); |
|
#endif |
expectEndTag(parser, "HOST"); | expectEndTag(parser, "HOST"); |
return true; | return true; |
} | } |
|
|
| |
Boolean XmlReader::getNameSpaceElement( | Boolean XmlReader::getNameSpaceElement( |
XmlParser& parser, | XmlParser& parser, |
String& nameSpaceComponent) |
CIMName& nameSpaceComponent) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
if (!testStartTag(parser, entry, "LOCALNAMESPACEPATH")) | if (!testStartTag(parser, entry, "LOCALNAMESPACEPATH")) |
return false; | return false; |
| |
String nameSpaceComponent; |
CIMName nameSpaceComponent; |
| |
while (getNameSpaceElement(parser, nameSpaceComponent)) | while (getNameSpaceElement(parser, nameSpaceComponent)) |
{ | { |
if (nameSpace.size()) | if (nameSpace.size()) |
nameSpace += '/'; |
nameSpace.append('/'); |
| |
nameSpace += nameSpaceComponent; |
nameSpace.append(nameSpaceComponent.getString()); |
} | } |
| |
if (!nameSpace.size()) | 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"); | expectEndTag(parser, "LOCALNAMESPACEPATH"); |
|
|
if (!testStartTag(parser, entry, "NAMESPACEPATH")) | if (!testStartTag(parser, entry, "NAMESPACEPATH")) |
return false; | 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)) | 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"); | "expected LOCALNAMESPACEPATH element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
| |
expectEndTag(parser, "NAMESPACEPATH"); | expectEndTag(parser, "NAMESPACEPATH"); |
|
|
| |
Boolean XmlReader::getClassNameElement( | Boolean XmlReader::getClassNameElement( |
XmlParser& parser, | XmlParser& parser, |
String& className, |
CIMName& className, |
Boolean required) | Boolean required) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
|
|
{ | { |
if (required) | if (required) |
{ | { |
throw XmlValidationError(parser.getLine(), |
|
|
// l10n |
|
|
|
// throw XmlValidationError(parser.getLine(), |
|
// "expected CLASSNAME element"); |
|
|
|
MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_CLASSNAME_ELEMENT", |
"expected CLASSNAME element"); | "expected CLASSNAME element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
else | else |
return false; | return false; |
} | } |
|
|
Boolean empty = entry.type == XmlEntry::EMPTY_TAG; | Boolean empty = entry.type == XmlEntry::EMPTY_TAG; |
| |
className = getCimNameAttribute( | className = getCimNameAttribute( |
parser.getLine(), entry, "CLASSNAME", true); |
parser.getLine(), entry, "CLASSNAME", false); |
| |
if (!empty) | if (!empty) |
expectEndTag(parser, "CLASSNAME"); | expectEndTag(parser, "CLASSNAME"); |
|
|
// | // |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
| |
KeyBinding::Type XmlReader::getValueTypeAttribute( |
CIMKeyBinding::Type XmlReader::getValueTypeAttribute( |
Uint32 lineNumber, | Uint32 lineNumber, |
const XmlEntry& entry, | const XmlEntry& entry, |
const char* elementName) | const char* elementName) |
|
|
String tmp; | String tmp; |
| |
if (!entry.getAttributeValue("VALUETYPE", tmp)) | if (!entry.getAttributeValue("VALUETYPE", tmp)) |
return KeyBinding::STRING; |
return CIMKeyBinding::STRING; |
| |
if (String::equal(tmp, "string")) | if (String::equal(tmp, "string")) |
return KeyBinding::STRING; |
return CIMKeyBinding::STRING; |
else if (String::equal(tmp, "boolean")) | else if (String::equal(tmp, "boolean")) |
return KeyBinding::BOOLEAN; |
return CIMKeyBinding::BOOLEAN; |
else if (String::equal(tmp, "numeric")) | 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]; | char buffer[MESSAGE_SIZE]; |
|
sprintf(buffer, "%s.VALUETYPE", elementName); |
|
|
|
MessageLoaderParms mlParms("Common.XmlReader.ILLEGAL_VALUE_FOR_CIMVALUE_ATTRIBUTE", |
|
"Illegal value for $0 attribute; CIMValue must be one of \"string\", \"boolean\", or \"numeric\"", buffer); |
| |
sprintf(buffer, |
throw XmlSemanticError(lineNumber, mlParms); |
"Illegal value for %s.VALUETYPE attribute; " |
|
"CIMValue must be one of \"string\", \"boolean\", or \"numeric\"", |
|
elementName); |
|
| |
throw XmlSemanticError(lineNumber, buffer); |
return CIMKeyBinding::BOOLEAN; |
return KeyBinding::BOOLEAN; |
|
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
| |
Boolean XmlReader::getKeyValueElement( | Boolean XmlReader::getKeyValueElement( |
XmlParser& parser, | XmlParser& parser, |
KeyBinding::Type& type, |
CIMKeyBinding::Type& type, |
String& value) | String& value) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
|
|
throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine()); | throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine()); |
| |
if (entry.type == XmlEntry::CONTENT) | if (entry.type == XmlEntry::CONTENT) |
value = entry.text; |
value = String(entry.text); |
else | else |
parser.putBack(entry); | parser.putBack(entry); |
| |
|
|
| |
Boolean XmlReader::getKeyBindingElement( | Boolean XmlReader::getKeyBindingElement( |
XmlParser& parser, | XmlParser& parser, |
String& name, |
CIMName& name, |
String& value, | String& value, |
KeyBinding::Type& type) |
CIMKeyBinding::Type& type) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
| |
if (!getKeyValueElement(parser, type, value)) | if (!getKeyValueElement(parser, type, value)) |
{ | { |
CIMReference reference; |
CIMObjectPath reference; |
| |
if (!getValueReferenceElement(parser, reference)) | 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"); | "Expected KEYVALUE or VALUE.REFERENCE element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
| |
type = KeyBinding::REFERENCE; |
type = CIMKeyBinding::REFERENCE; |
value = reference.toString(); | value = reference.toString(); |
} | } |
| |
|
|
Boolean XmlReader::getInstanceNameElement( | Boolean XmlReader::getInstanceNameElement( |
XmlParser& parser, | XmlParser& parser, |
String& className, | String& className, |
Array<KeyBinding>& keyBindings) |
Array<CIMKeyBinding>& keyBindings) |
{ | { |
className.clear(); | className.clear(); |
keyBindings.clear(); | keyBindings.clear(); |
|
|
return true; | return true; |
} | } |
| |
String name; |
CIMName name; |
KeyBinding::Type type; |
CIMKeyBinding::Type type; |
String value; | String value; |
CIMReference reference; |
CIMObjectPath reference; |
| |
if (getKeyValueElement(parser, type, value)) | if (getKeyValueElement(parser, type, value)) |
{ | { |
// Use empty key name because none was specified | // 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)) | else if (getValueReferenceElement(parser, reference)) |
{ | { |
// Use empty key name because none was specified | // Use empty key name because none was specified |
type = KeyBinding::REFERENCE; |
type = CIMKeyBinding::REFERENCE; |
value = reference.toString(); | value = reference.toString(); |
keyBindings.append(KeyBinding(name, value, type)); |
keyBindings.append(CIMKeyBinding(name, value, type)); |
} | } |
else | else |
{ | { |
while (getKeyBindingElement(parser, name, value, type)) | while (getKeyBindingElement(parser, name, value, type)) |
keyBindings.append(KeyBinding(name, value, type)); |
keyBindings.append(CIMKeyBinding(name, value, type)); |
} | } |
| |
expectEndTag(parser, "INSTANCENAME"); | expectEndTag(parser, "INSTANCENAME"); |
|
|
| |
Boolean XmlReader::getInstanceNameElement( | Boolean XmlReader::getInstanceNameElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& instanceName) |
CIMObjectPath& instanceName) |
{ | { |
String className; | String className; |
Array<KeyBinding> keyBindings; |
Array<CIMKeyBinding> keyBindings; |
| |
if (!XmlReader::getInstanceNameElement(parser, className, keyBindings)) | if (!XmlReader::getInstanceNameElement(parser, className, keyBindings)) |
return false; | return false; |
| |
instanceName.set(String(), String(), className, keyBindings); |
instanceName.set(String(), CIMNamespaceName(), className, keyBindings); |
return true; | return true; |
} | } |
| |
|
|
| |
Boolean XmlReader::getInstancePathElement( | Boolean XmlReader::getInstancePathElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& reference) |
CIMObjectPath& reference) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
| |
if (!getNameSpacePathElement(parser, host, nameSpace)) | 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"); | "expected NAMESPACEPATH element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
String className; | String className; |
Array<KeyBinding> keyBindings; |
Array<CIMKeyBinding> keyBindings; |
| |
if (!getInstanceNameElement(parser, className, 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"); | "expected INSTANCENAME element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
reference.set(host, nameSpace, className, keyBindings); | reference.set(host, nameSpace, className, keyBindings); |
|
|
| |
Boolean XmlReader::getLocalInstancePathElement( | Boolean XmlReader::getLocalInstancePathElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& reference) |
CIMObjectPath& reference) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
| |
if (!getLocalNameSpacePathElement(parser, nameSpace)) | 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"); | "expected LOCALNAMESPACEPATH element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
String className; | String className; |
Array<KeyBinding> keyBindings; |
Array<CIMKeyBinding> keyBindings; |
| |
if (!getInstanceNameElement(parser, className, 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"); | "expected INSTANCENAME element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
reference.set(String(), nameSpace, className, keyBindings); | reference.set(String(), nameSpace, className, keyBindings); |
|
|
| |
Boolean XmlReader::getClassPathElement( | Boolean XmlReader::getClassPathElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& reference) |
CIMObjectPath& reference) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
| |
if (!getNameSpacePathElement(parser, host, nameSpace)) | 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"); | "expected NAMESPACEPATH element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
String className; |
CIMName className; |
| |
if (!getClassNameElement(parser, 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"); | "expected CLASSNAME element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
reference.set(host, nameSpace, className); | reference.set(host, nameSpace, className); |
|
|
| |
Boolean XmlReader::getLocalClassPathElement( | Boolean XmlReader::getLocalClassPathElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& reference) |
CIMObjectPath& reference) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
| |
if (!getLocalNameSpacePathElement(parser, nameSpace)) | 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"); | "expected LOCALNAMESPACEPATH element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
String className; |
CIMName className; |
| |
if (!getClassNameElement(parser, 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"); | "expected CLASSNAME element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
|
} | } |
| |
reference.set(String(), nameSpace, className); | reference.set(String(), nameSpace, className); |
|
|
| |
Boolean XmlReader::getValueReferenceElement( | Boolean XmlReader::getValueReferenceElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& reference) |
CIMObjectPath& reference) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
if (entry.type != XmlEntry::START_TAG && | if (entry.type != XmlEntry::START_TAG && |
entry.type != XmlEntry::EMPTY_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) | if (strcmp(entry.text, "CLASSPATH") == 0) |
|
|
else if (strcmp(entry.text, "CLASSNAME") == 0) | else if (strcmp(entry.text, "CLASSNAME") == 0) |
{ | { |
parser.putBack(entry); | parser.putBack(entry); |
String className; |
CIMName className; |
getClassNameElement(parser, className); | getClassNameElement(parser, className); |
reference.set(String(), String(), className); |
reference.set(String(), CIMNamespaceName(), className); |
} | } |
else if (strcmp(entry.text, "INSTANCEPATH") == 0) | else if (strcmp(entry.text, "INSTANCEPATH") == 0) |
{ | { |
|
|
{ | { |
parser.putBack(entry); | parser.putBack(entry); |
String className; | String className; |
Array<KeyBinding> keyBindings; |
Array<CIMKeyBinding> keyBindings; |
getInstanceNameElement(parser, className, keyBindings); | getInstanceNameElement(parser, className, keyBindings); |
reference.set(String(), String(), className, keyBindings); |
reference.set(String(), CIMNamespaceName(), className, keyBindings); |
} | } |
| |
expectEndTag(parser, "VALUE.REFERENCE"); | expectEndTag(parser, "VALUE.REFERENCE"); |
|
|
CIMValue& value) | CIMValue& value) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
|
Array<CIMObjectPath> referenceArray; |
|
CIMObjectPath reference; |
| |
value.clear(); | value.clear(); |
| |
|
|
if (!testStartTagOrEmptyTag(parser, entry, "VALUE.REFARRAY")) | if (!testStartTagOrEmptyTag(parser, entry, "VALUE.REFARRAY")) |
return false; | return false; |
| |
if (entry.type == XmlEntry::EMPTY_TAG) |
if (entry.type != XmlEntry::EMPTY_TAG) |
// ATTN-RK-P3-20020220: Should the type and array size get set in |
{ |
// the value even though it is null? (See also getValueArrayElement.) |
|
return true; |
|
|
|
// For each VALUE.REFERENCE element: | // For each VALUE.REFERENCE element: |
| |
Array<CIMReference> referenceArray; |
|
CIMReference reference; |
|
|
|
while (getValueReferenceElement(parser, reference)) | while (getValueReferenceElement(parser, reference)) |
{ | { |
referenceArray.append(reference); | referenceArray.append(reference); |
} | } |
| |
expectEndTag(parser, "VALUE.REFARRAY"); | expectEndTag(parser, "VALUE.REFARRAY"); |
|
} |
| |
value.set(referenceArray); | value.set(referenceArray); |
return true; | return true; |
|
|
| |
// Get PROPERTY.NAME attribute: | // Get PROPERTY.NAME attribute: |
| |
String name = getCimNameAttribute( |
CIMName name = getCimNameAttribute( |
parser.getLine(), entry, "PROPERTY.REFERENCE"); | parser.getLine(), entry, "PROPERTY.REFERENCE"); |
| |
// Get PROPERTY.REFERENCECLASS attribute: | // Get PROPERTY.REFERENCECLASS attribute: |
| |
String referenceClass = getReferenceClassAttribute( |
CIMName referenceClass = getReferenceClassAttribute( |
parser.getLine(), entry, "PROPERTY.REFERENCE"); | parser.getLine(), entry, "PROPERTY.REFERENCE"); |
| |
// Get PROPERTY.CLASSORIGIN attribute: | // Get PROPERTY.CLASSORIGIN attribute: |
| |
String classOrigin = |
CIMName classOrigin = |
getClassOriginAttribute(parser.getLine(), entry, "PROPERTY.REFERENCE"); | getClassOriginAttribute(parser.getLine(), entry, "PROPERTY.REFERENCE"); |
| |
// Get PROPERTY.PROPAGATED | // Get PROPERTY.PROPAGATED |
|
|
| |
// Create property: | // Create property: |
| |
CIMValue value; |
CIMValue value = CIMValue(CIMTYPE_REFERENCE, false, 0); |
value.set(CIMReference()); |
// value.set(CIMObjectPath()); |
property = CIMProperty( | property = CIMProperty( |
name, value, 0, referenceClass, classOrigin, propagated); | name, value, 0, referenceClass, classOrigin, propagated); |
| |
|
|
{ | { |
getQualifierElements(parser, property); | getQualifierElements(parser, property); |
| |
CIMReference reference; |
CIMObjectPath reference; |
| |
if (getValueReferenceElement(parser, reference)) | if (getValueReferenceElement(parser, reference)) |
property.setValue(reference); | property.setValue(reference); |
|
|
{ | { |
container.addProperty(property); | container.addProperty(property); |
} | } |
catch (AlreadyExists&) |
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); |
} | } |
} | } |
} | } |
|
|
| |
// Get PARAMETER.NAME attribute: | // Get PARAMETER.NAME attribute: |
| |
String name = getCimNameAttribute(parser.getLine(), entry, "PARAMETER"); |
CIMName name = getCimNameAttribute(parser.getLine(), entry, "PARAMETER"); |
| |
// Get PARAMETER.TYPE attribute: | // Get PARAMETER.TYPE attribute: |
| |
CIMType type = getCimTypeAttribute(parser.getLine(), entry, "PARAMETER"); |
CIMType type; |
|
getCimTypeAttribute(parser.getLine(), entry, type, "PARAMETER"); |
| |
// Create parameter: | // Create parameter: |
| |
|
|
| |
// Get PARAMETER.ARRAY.NAME attribute: | // Get PARAMETER.ARRAY.NAME attribute: |
| |
String name = getCimNameAttribute( |
CIMName name = getCimNameAttribute( |
parser.getLine(), entry, "PARAMETER.ARRAY"); | parser.getLine(), entry, "PARAMETER.ARRAY"); |
| |
// Get PARAMETER.ARRAY.TYPE attribute: | // Get PARAMETER.ARRAY.TYPE attribute: |
| |
CIMType type = getCimTypeAttribute(parser.getLine(), entry, "PARAMETER.ARRAY"); |
CIMType type; |
|
getCimTypeAttribute(parser.getLine(), entry, type, "PARAMETER.ARRAY"); |
| |
// Get PARAMETER.ARRAYSIZE attribute: | // Get PARAMETER.ARRAYSIZE attribute: |
| |
|
|
| |
// Get PARAMETER.NAME attribute: | // Get PARAMETER.NAME attribute: |
| |
String name = getCimNameAttribute( |
CIMName name = getCimNameAttribute( |
parser.getLine(), entry, "PARAMETER.REFERENCE"); | parser.getLine(), entry, "PARAMETER.REFERENCE"); |
| |
// Get PARAMETER.REFERENCECLASS attribute: | // Get PARAMETER.REFERENCECLASS attribute: |
| |
String referenceClass = getReferenceClassAttribute( |
CIMName referenceClass = getReferenceClassAttribute( |
parser.getLine(), entry, "PARAMETER.REFERENCE"); | parser.getLine(), entry, "PARAMETER.REFERENCE"); |
| |
// Create parameter: | // Create parameter: |
| |
parameter = CIMParameter(name, CIMType::REFERENCE, false, 0, referenceClass); |
parameter = CIMParameter(name, CIMTYPE_REFERENCE, false, 0, referenceClass); |
| |
if (!empty) | if (!empty) |
{ | { |
|
|
| |
// Get PARAMETER.NAME attribute: | // Get PARAMETER.NAME attribute: |
| |
String name = getCimNameAttribute( |
CIMName name = getCimNameAttribute( |
parser.getLine(), entry, "PARAMETER.REFARRAY"); | parser.getLine(), entry, "PARAMETER.REFARRAY"); |
| |
// Get PARAMETER.REFERENCECLASS attribute: | // Get PARAMETER.REFERENCECLASS attribute: |
| |
String referenceClass = getReferenceClassAttribute( |
CIMName referenceClass = getReferenceClassAttribute( |
parser.getLine(), entry, "PARAMETER.REFARRAY"); | parser.getLine(), entry, "PARAMETER.REFARRAY"); |
| |
// Get PARAMETER.ARRAYSIZE attribute: | // Get PARAMETER.ARRAYSIZE attribute: |
|
|
| |
// Create parameter: | // Create parameter: |
| |
parameter = CIMParameter(name, CIMType::REFERENCE, true, arraySize, |
parameter = CIMParameter(name, CIMTYPE_REFERENCE, true, arraySize, |
referenceClass); | referenceClass); |
| |
if (!empty) | if (!empty) |
|
|
{ | { |
container.addParameter(parameter); | container.addParameter(parameter); |
} | } |
catch (AlreadyExists&) |
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); |
} | } |
} | } |
} | } |
|
|
| |
// Get NAME attribute: | // Get NAME attribute: |
| |
String name = getCimNameAttribute( |
CIMName name = getCimNameAttribute( |
parser.getLine(), entry, "QUALIFIER.DECLARATION"); | parser.getLine(), entry, "QUALIFIER.DECLARATION"); |
| |
// Get TYPE attribute: | // Get TYPE attribute: |
| |
CIMType type = getCimTypeAttribute( |
CIMType type; |
parser.getLine(), entry, "QUALIFIER.DECLARATION"); |
getCimTypeAttribute(parser.getLine(), entry, type, "QUALIFIER.DECLARATION"); |
| |
// Get ISARRAY attribute: | // Get ISARRAY attribute: |
| |
|
|
| |
// Get flavor oriented attributes: | // Get flavor oriented attributes: |
| |
Uint32 flavor = getFlavor(entry,parser.getLine(), "QUALIFIER.DECLARATION"); |
CIMFlavor flavor = getFlavor (entry, parser.getLine (), |
|
"QUALIFIER.DECLARATION"); |
| |
// No need to look for interior elements if empty tag: | // No need to look for interior elements if empty tag: |
| |
Uint32 scope = CIMScope::NONE; |
CIMScope scope = CIMScope (); |
CIMValue value; | CIMValue value; |
|
Boolean gotValue = false; |
| |
if (!empty) | if (!empty) |
{ | { |
|
|
{ | { |
if (!isArray) | 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()) | 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; |
} | } |
else if (getValueElement(parser, type, value)) | else if (getValueElement(parser, type, value)) |
{ | { |
if (isArray) | 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"); | "ISARRAY attribute used but VALUE element encountered"); |
|
|
|
throw XmlSemanticError(parser.getLine(), mlParms); |
} | } |
|
|
|
gotValue = true; |
} | } |
| |
// Now get the closing tag: | // Now get the closing tag: |
|
|
expectEndTag(parser, "QUALIFIER.DECLARATION"); | expectEndTag(parser, "QUALIFIER.DECLARATION"); |
} | } |
| |
if (value.getType() == CIMType::NONE) |
if (!gotValue) |
{ | { |
if (isArray) | if (isArray) |
value.setNullValue(type, true, arraySize); | value.setNullValue(type, true, arraySize); |
|
|
| |
Boolean empty = entry.type == XmlEntry::EMPTY_TAG; | 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, "PROPERTY"); |
CIMType type; |
|
getCimTypeAttribute(parser.getLine(), entry, type, "PROPERTY"); |
| |
String classOrigin = |
CIMName classOrigin = |
getClassOriginAttribute(parser.getLine(), entry, "PROPERTY"); | getClassOriginAttribute(parser.getLine(), entry, "PROPERTY"); |
| |
Boolean propagated = getCimBooleanAttribute( | Boolean propagated = getCimBooleanAttribute( |
|
|
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "CLASS")) |
if (!testStartTagOrEmptyTag(parser, entry, "CLASS")) |
return false; | return false; |
| |
String name = getCimNameAttribute(parser.getLine(), entry, "CLASS"); |
CIMName name = getCimNameAttribute(parser.getLine(), entry, "CLASS"); |
| |
String superClass = getSuperClassAttribute(parser.getLine(), entry,"CLASS"); |
CIMName superClass = getSuperClassAttribute(parser.getLine(), entry,"CLASS"); |
| |
cimClass = CIMClass(name, superClass); | cimClass = CIMClass(name, superClass); |
| |
|
if(entry.type != XmlEntry::EMPTY_TAG) |
|
{ |
|
|
// Get QUALIFIER elements: | // Get QUALIFIER elements: |
| |
getQualifierElements(parser, cimClass); | getQualifierElements(parser, cimClass); |
|
|
// Get CLASS end tag: | // Get CLASS end tag: |
| |
expectEndTag(parser, "CLASS"); | expectEndTag(parser, "CLASS"); |
|
} |
| |
return true; | return true; |
} | } |
|
|
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "INSTANCE")) |
if (!testStartTagOrEmptyTag(parser, entry, "INSTANCE")) |
return false; | return false; |
| |
|
Boolean empty = entry.type == XmlEntry::EMPTY_TAG; |
|
|
String className = getClassNameAttribute( | String className = getClassNameAttribute( |
parser.getLine(), entry, "INSTANCE"); | parser.getLine(), entry, "INSTANCE"); |
| |
cimInstance = CIMInstance(className); | cimInstance = CIMInstance(className); |
| |
|
if (!empty) |
|
{ |
// Get QUALIFIER elements: | // Get QUALIFIER elements: |
|
|
getQualifierElements(parser, cimInstance); | getQualifierElements(parser, cimInstance); |
| |
// Get PROPERTY elements: | // Get PROPERTY elements: |
|
|
GetPropertyElements(parser, cimInstance); | GetPropertyElements(parser, cimInstance); |
| |
// Get INSTANCE end tag: | // Get INSTANCE end tag: |
|
|
expectEndTag(parser, "INSTANCE"); | expectEndTag(parser, "INSTANCE"); |
|
} |
| |
return true; | return true; |
} | } |
|
|
| |
Boolean XmlReader::getNamedInstanceElement( | Boolean XmlReader::getNamedInstanceElement( |
XmlParser& parser, | XmlParser& parser, |
CIMNamedInstance& namedInstance) |
CIMInstance& namedInstance) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "VALUE.NAMEDINSTANCE")) | if (!testStartTag(parser, entry, "VALUE.NAMEDINSTANCE")) |
return false; | return false; |
| |
CIMReference instanceName; |
CIMObjectPath instanceName; |
| |
// Get INSTANCENAME elements: | // Get INSTANCENAME elements: |
| |
if (!getInstanceNameElement(parser, instanceName)) | 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"); | "expected INSTANCENAME element"); |
} |
|
| |
CIMInstance instance; |
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
| |
// Get INSTANCE elements: | // Get INSTANCE elements: |
| |
if (!getInstanceElement(parser, instance)) |
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"); | "expected INSTANCE element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
| |
// Get VALUE.NAMEDINSTANCE end tag: | // Get VALUE.NAMEDINSTANCE end tag: |
| |
expectEndTag(parser, "VALUE.NAMEDINSTANCE"); | expectEndTag(parser, "VALUE.NAMEDINSTANCE"); |
| |
namedInstance.set(instanceName, instance); |
namedInstance.setPath (instanceName); |
| |
return true; | return true; |
} | } |
|
|
{ | { |
if (!getClassElement(parser, x)) | 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"); | "expected CLASS element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
} | } |
| |
|
|
{ | { |
if (!getInstanceElement(parser, x)) | 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"); | "expected INSTANCE element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
} | } |
| |
|
|
{ | { |
if (!getQualifierDeclElement(parser, x)) | 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"); | "expected QUALIFIER.DECLARATION element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
} | } |
| |
|
|
Boolean XmlReader::getMessageStartTag( | Boolean XmlReader::getMessageStartTag( |
XmlParser& parser, | XmlParser& parser, |
String& id, | String& id, |
const char*& protocolVersion) |
String& protocolVersion) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
| |
// Get MESSAGE.ID: | // Get MESSAGE.ID: |
| |
if (!entry.getAttributeValue("ID", id)) |
if (!entry.getAttributeValue("ID", id)) { |
throw XmlValidationError(parser.getLine(), |
|
"Bad or missing MESSAGE.ID attribute"); |
// 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: | // Get MESSAGE.PROTOCOLVERSION: |
| |
if (!entry.getAttributeValue("PROTOCOLVERSION", protocolVersion)) |
if (!entry.getAttributeValue("PROTOCOLVERSION", protocolVersion)) { |
throw XmlValidationError(parser.getLine(), |
|
"Bad or missing MESSAGE.PROTOCOLVERSION attribute"); |
// 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; | return true; |
} | } |
|
|
| |
// Get IMETHODCALL.NAME attribute: | // 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"); | "Missing IMETHODCALL.NAME attribute"); |
| |
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
|
|
|
|
return true; | return true; |
} | } |
| |
|
|
| |
Boolean XmlReader::getIMethodResponseStartTag( | Boolean XmlReader::getIMethodResponseStartTag( |
XmlParser& parser, | XmlParser& parser, |
const char*& name) |
const char*& name, |
|
Boolean& isEmptyTag) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "IMETHODRESPONSE")) |
if (!testStartTagOrEmptyTag(parser, entry, "IMETHODRESPONSE")) |
return false; | return false; |
| |
|
isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG); |
|
|
// Get IMETHODRESPONSE.NAME attribute: | // 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"); | "Missing IMETHODRESPONSE.NAME attribute"); |
| |
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
|
|
|
|
return true; | return true; |
} | } |
| |
|
|
| |
Boolean XmlReader::getIParamValueTag( | Boolean XmlReader::getIParamValueTag( |
XmlParser& parser, | XmlParser& parser, |
const char*& name) |
const char*& name, |
|
Boolean& isEmptyTag) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "IPARAMVALUE")) |
if (!testStartTagOrEmptyTag(parser, entry, "IPARAMVALUE")) |
return false; | return false; |
| |
|
isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG); |
|
|
// Get IPARAMVALUE.NAME attribute: | // 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"); | "Missing IPARAMVALUE.NAME attribute"); |
| |
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
|
|
return true; | 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() | // getBooleanValueElement() |
// | // |
// Get an elements like: "<VALUE>FALSE</VALUE>" | // Get an elements like: "<VALUE>FALSE</VALUE>" |
|
|
{ | { |
if (required) | if (required) |
{ | { |
throw XmlValidationError(parser.getLine(), |
|
|
// l10n |
|
|
|
// throw XmlValidationError(parser.getLine(), |
|
// "Expected VALUE element"); |
|
|
|
MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_VALUE_ELEMENT", |
"Expected VALUE element"); | "Expected VALUE element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
return false; | return false; |
} | } |
| |
expectContentOrCData(parser, entry); | expectContentOrCData(parser, entry); |
| |
if (CompareNoCase(entry.text, "TRUE") == 0) |
if (System::strcasecmp(entry.text, "TRUE") == 0) |
result = true; | result = true; |
else if (CompareNoCase(entry.text, "FALSE") == 0) |
else if (System::strcasecmp(entry.text, "FALSE") == 0) |
result = false; | result = false; |
else |
else { |
throw XmlSemanticError(parser.getLine(), |
|
"Bad value for VALUE element: must be \"TRUE\" or \"FALSE\""); |
// 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"); | expectEndTag(parser, "VALUE"); |
| |
|
|
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// getErrorElement() |
// DMTF CR Pending |
// | // |
// <!ELEMENT ERROR EMPTY> |
// <!ELEMENT ERROR (INSTANCE*)> |
// <!ATTLIST ERROR | // <!ATTLIST ERROR |
// CODE CDATA #REQUIRED | // CODE CDATA #REQUIRED |
// DESCRIPTION CDATA #IMPLIED> | // DESCRIPTION CDATA #IMPLIED> |
|
|
| |
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; |
| |
if (!testStartTagOrEmptyTag(parser, entry, "ERROR")) | 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; | return false; |
} | } |
| |
|
|
| |
Uint32 tmpCode; | Uint32 tmpCode; |
| |
if (!entry.getAttributeValue("CODE", tmpCode)) |
if (!entry.getAttributeValue("CODE", tmpCode)) { |
throw XmlValidationError( |
|
parser.getLine(), "missing ERROR.CODE attribute"); |
|
|
// l10n |
| |
code = CIMStatusCode(tmpCode); |
// 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: | // Get ERROR.DESCRIPTION: |
| |
description = ""; |
String tmpDescription; |
entry.getAttributeValue("DESCRIPTION", description); |
|
|
entry.getAttributeValue("DESCRIPTION", tmpDescription); |
| |
if (!empty) | if (!empty) |
|
{ |
|
while (testStartTagOrEmptyTag(parser, entry)) |
|
{ |
|
skipElement(parser, entry); |
|
} |
|
|
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 |
|
{ |
|
|
|
// 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"); |
|
|
|
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) |
CIMObject& objectWithPath) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "VALUE.OBJECTWITHPATH")) | if (!testStartTag(parser, entry, "VALUE.OBJECTWITHPATH")) |
return false; | return false; |
| |
CIMReference reference; |
CIMObjectPath reference; |
Boolean isInstance = false; | Boolean isInstance = false; |
| |
if (XmlReader::getInstancePathElement(parser, reference)) | if (XmlReader::getInstancePathElement(parser, reference)) |
isInstance = true; | isInstance = true; |
else if (!XmlReader::getClassPathElement(parser, reference)) | else if (!XmlReader::getClassPathElement(parser, reference)) |
{ | { |
throw XmlValidationError(parser.getLine(), |
|
"Expected INSTANCE element"); |
// 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) | if (isInstance) |
|
|
| |
if (!XmlReader::getInstanceElement(parser, cimInstance)) | if (!XmlReader::getInstanceElement(parser, cimInstance)) |
{ | { |
throw XmlValidationError(parser.getLine(), |
|
"Expected INSTANCEPATH or CLASSPATH element"); |
// l10n |
|
|
|
// throw XmlValidationError(parser.getLine(), |
|
// "Expected INSTANCE element"); |
|
|
|
MessageLoaderParms mlParms("Common.XmlReader.EXPECTED_INSTANCE_ELEMENT", |
|
"Expected INSTANCE element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
objectWithPath.set(reference, CIMObject(cimInstance)); |
objectWithPath = CIMObject (cimInstance); |
|
objectWithPath.setPath (reference); |
} | } |
else | else |
{ | { |
|
|
| |
if (!XmlReader::getClassElement(parser, cimClass)) | 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"); | "Expected CLASS element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
objectWithPath.set(reference, CIMObject(cimClass)); |
objectWithPath = CIMObject (cimClass); |
|
objectWithPath.setPath (reference); |
} | } |
| |
expectEndTag(parser, "VALUE.OBJECTWITHPATH"); | expectEndTag(parser, "VALUE.OBJECTWITHPATH"); |
|
|
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
// getValueObjectWithLocalPathElement() |
|
// |
|
// <!ELEMENT VALUE.OBJECTWITHLOCALPATH |
|
// ((LOCALCLASSPATH,CLASS)|(LOCALINSTANCEPATH,INSTANCE))> |
|
// |
|
//------------------------------------------------------------------------------ |
|
|
|
Boolean XmlReader::getValueObjectWithLocalPathElement( |
|
XmlParser& parser, |
|
CIMObject& objectWithPath) |
|
{ |
|
XmlEntry entry; |
|
|
|
if (!testStartTag(parser, entry, "VALUE.OBJECTWITHLOCALPATH")) |
|
return false; |
|
|
|
CIMObjectPath reference; |
|
Boolean isInstance = false; |
|
|
|
if (XmlReader::getLocalInstancePathElement(parser, reference)) |
|
isInstance = true; |
|
else if (!XmlReader::getLocalClassPathElement(parser, reference)) |
|
{ |
|
|
|
// 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) |
|
{ |
|
CIMInstance cimInstance; |
|
|
|
if (!XmlReader::getInstanceElement(parser, cimInstance)) |
|
{ |
|
|
|
// 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); |
|
} |
|
else |
|
{ |
|
CIMClass cimClass; |
|
|
|
if (!XmlReader::getClassElement(parser, cimClass)) |
|
{ |
|
|
|
// 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); |
|
} |
|
|
|
expectEndTag(parser, "VALUE.OBJECTWITHLOCALPATH"); |
|
|
|
return true; |
|
} |
|
|
|
//------------------------------------------------------------------------------ |
|
// getObjectArray() |
|
// |
|
// <object> |
|
// (VALUE.OBJECT|VALUE.OBJECTWITHLOCALPATH|VALUE.OBJECTWITHPATH) |
|
// |
|
//------------------------------------------------------------------------------ |
|
|
|
void XmlReader::getObjectArray( |
|
XmlParser& parser, |
|
Array<CIMObject>& objectArray) |
|
{ |
|
CIMObject object; |
|
CIMObject objectWithPath; |
|
|
|
objectArray.clear(); |
|
|
|
if (getValueObjectElement(parser, object)) |
|
{ |
|
objectArray.append(object); |
|
while (getValueObjectElement(parser, object)) |
|
objectArray.append(object); |
|
} |
|
else if (getValueObjectWithPathElement(parser, objectWithPath)) |
|
{ |
|
objectArray.append(objectWithPath); |
|
while (getValueObjectWithPathElement(parser, objectWithPath)) |
|
objectArray.append(objectWithPath); |
|
} |
|
else if (getValueObjectWithLocalPathElement(parser, objectWithPath)) |
|
{ |
|
objectArray.append(objectWithPath); |
|
while (getValueObjectWithLocalPathElement(parser, objectWithPath)) |
|
objectArray.append(objectWithPath); |
|
} |
|
} |
|
|
|
//------------------------------------------------------------------------------ |
// | // |
// <objectName>: (CLASSNAME|INSTANCENAME) | // <objectName>: (CLASSNAME|INSTANCENAME) |
// | // |
|
|
| |
Boolean XmlReader::getObjectNameElement( | Boolean XmlReader::getObjectNameElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& objectName) |
CIMObjectPath& objectName) |
{ | { |
String className; |
CIMName className; |
| |
if (getClassNameElement(parser, className, false)) | if (getClassNameElement(parser, className, false)) |
{ | { |
objectName.set(String(), String(), className); |
objectName.set(String(), CIMNamespaceName(), className); |
return true; | return true; |
} | } |
else if (getInstanceNameElement(parser, objectName)) | else if (getInstanceNameElement(parser, objectName)) |
return true; | return true; |
else | 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; | return false; |
|
|
| |
Boolean XmlReader::getObjectPathElement( | Boolean XmlReader::getObjectPathElement( |
XmlParser& parser, | XmlParser& parser, |
CIMReference& objectPath) |
CIMObjectPath& objectPath) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
|
|
} | } |
else | 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"); | "expected INSTANCEPATH or CLASSPATH element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
| |
PEGASUS_UNREACHABLE ( return false; ) | PEGASUS_UNREACHABLE ( return false; ) |
|
|
| |
// Get EXPMETHODCALL.NAME attribute: | // 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"); | "Missing EXPMETHODCALL.NAME attribute"); |
| |
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
|
|
return true; | return true; |
} | } |
| |
|
|
| |
Boolean XmlReader::getEMethodResponseStartTag( | Boolean XmlReader::getEMethodResponseStartTag( |
XmlParser& parser, | XmlParser& parser, |
const char*& name) |
const char*& name, |
|
Boolean& isEmptyTag) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "EXPMETHODRESPONSE")) |
if (!testStartTagOrEmptyTag(parser, entry, "EXPMETHODRESPONSE")) |
return false; | return false; |
| |
|
isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG); |
|
|
// Get EXPMETHODRESPONSE.NAME attribute: | // 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"); | "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; | return true; |
} | } |
| |
|
|
| |
// Get METHODCALL.NAME attribute: | // 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"); | "Missing METHODCALL.NAME attribute"); |
| |
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
|
|
|
|
return true; | return true; |
} | } |
| |
|
|
| |
Boolean XmlReader::getMethodResponseStartTag( | Boolean XmlReader::getMethodResponseStartTag( |
XmlParser& parser, | XmlParser& parser, |
const char*& name) |
const char*& name, |
|
Boolean& isEmptyTag) |
{ | { |
XmlEntry entry; | XmlEntry entry; |
| |
if (!testStartTag(parser, entry, "METHODRESPONSE")) |
if (!testStartTagOrEmptyTag(parser, entry, "METHODRESPONSE")) |
return false; | return false; |
| |
|
isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG); |
|
|
// Get METHODRESPONSE.NAME attribute: | // 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"); | "Missing METHODRESPONSE.NAME attribute"); |
| |
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
|
|
return true; | return true; |
} | } |
| |
|
|
{ | { |
XmlEntry entry; | XmlEntry entry; |
const char* name; | const char* name; |
CIMType type; |
CIMType type=CIMTYPE_BOOLEAN; |
CIMValue value; | CIMValue value; |
| |
if (!testStartTagOrEmptyTag(parser, entry, "PARAMVALUE")) | if (!testStartTagOrEmptyTag(parser, entry, "PARAMVALUE")) |
|
|
| |
// Get PARAMVALUE.NAME attribute: | // 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"); | "Missing PARAMVALUE.NAME attribute"); |
| |
|
throw XmlValidationError(parser.getLine(), mlParms); |
|
} |
|
|
|
|
// Get PARAMVALUE.PARAMTYPE attribute: | // Get PARAMVALUE.PARAMTYPE attribute: |
| |
type = getCimTypeAttribute(parser.getLine(), entry, "PARAMVALUE", |
Boolean gotType = getCimTypeAttribute(parser.getLine(), entry, type, |
"PARAMTYPE", false); |
"PARAMVALUE", "PARAMTYPE", false); |
| |
if (!empty) | if (!empty) |
{ | { |
// Parse VALUE.REFERENCE and VALUE.REFARRAY type | // Parse VALUE.REFERENCE and VALUE.REFARRAY type |
if ( (type == CIMType::REFERENCE) || (type == CIMType::NONE) ) |
if ( (type == CIMTYPE_REFERENCE) || !gotType ) |
{ | { |
CIMReference reference; |
CIMObjectPath reference; |
if (XmlReader::getValueReferenceElement(parser, reference)) | if (XmlReader::getValueReferenceElement(parser, reference)) |
{ | { |
value.set(reference); | value.set(reference); |
type = CIMType::REFERENCE; |
type = CIMTYPE_REFERENCE; |
|
gotType = true; |
} | } |
else if (XmlReader::getValueReferenceArrayElement(parser, value)) | else if (XmlReader::getValueReferenceArrayElement(parser, value)) |
{ | { |
type = CIMType::REFERENCE; |
type = CIMTYPE_REFERENCE; |
|
gotType = true; |
} | } |
// If type==reference but no VALUE.REFERENCE found, use null value | // If type==reference but no VALUE.REFERENCE found, use null value |
} | } |
| |
// Parse non-reference value | // Parse non-reference value |
if ( type != CIMType::REFERENCE ) |
if ( type != CIMTYPE_REFERENCE ) |
|
{ |
|
CIMType effectiveType; |
|
if (!gotType) |
{ | { |
// If we don't know what type the value is, read it as a String | // If we don't know what type the value is, read it as a String |
CIMType effectiveType = type; |
effectiveType = CIMTYPE_STRING; |
if ( effectiveType == CIMType::NONE) |
} |
|
else |
{ | { |
effectiveType = CIMType::STRING; |
effectiveType = type; |
} | } |
| |
if ( !XmlReader::getValueArrayElement(parser, effectiveType, value) && | if ( !XmlReader::getValueArrayElement(parser, effectiveType, value) && |
|
|
expectEndTag(parser, "PARAMVALUE"); | expectEndTag(parser, "PARAMVALUE"); |
} | } |
| |
// ATTN-RK-P2-20020221: Any other properties to set in CIMParameter? |
paramValue = CIMParamValue(name, value, gotType); |
// (referenceClassName) |
|
paramValue = CIMParamValue(CIMParameter(name, type, value.isArray(), value.getArraySize()), value); |
|
| |
return true; | return true; |
} | } |
|
|
// Get RETURNVALUE.PARAMTYPE attribute: | // Get RETURNVALUE.PARAMTYPE attribute: |
// NOTE: Array type return values are not allowed (2/20/02) | // NOTE: Array type return values are not allowed (2/20/02) |
| |
type = getCimTypeAttribute(parser.getLine(), entry, "RETURNVALUE", |
Boolean gotType = getCimTypeAttribute(parser.getLine(), entry, type, |
"PARAMTYPE", false); |
"RETURNVALUE", "PARAMTYPE", false); |
| |
// Parse VALUE.REFERENCE type | // Parse VALUE.REFERENCE type |
if ( (type == CIMType::REFERENCE) || (type == CIMType::NONE) ) |
if ( (type == CIMTYPE_REFERENCE) || !gotType ) |
{ | { |
CIMReference reference; |
CIMObjectPath reference; |
if (XmlReader::getValueReferenceElement(parser, reference)) | if (XmlReader::getValueReferenceElement(parser, reference)) |
{ | { |
returnValue.set(reference); | returnValue.set(reference); |
type = CIMType::REFERENCE; |
type = CIMTYPE_REFERENCE; |
|
gotType = true; |
} | } |
else if (type == CIMType::REFERENCE) |
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"); | "expected VALUE.REFERENCE element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
} | } |
| |
// Parse non-reference return value | // Parse non-reference return value |
if ( type != CIMType::REFERENCE ) |
if ( type != CIMTYPE_REFERENCE ) |
{ | { |
// If we don't know what type the value is, read it as a String |
if (!gotType) |
if ( type == CIMType::NONE) |
|
{ | { |
type = CIMType::STRING; |
// If we don't know what type the value is, read it as a String |
|
type = CIMTYPE_STRING; |
} | } |
| |
if ( !XmlReader::getValueElement(parser, type, returnValue) ) | 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"); | "expected VALUE element"); |
|
|
|
throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
} | } |
| |
|
|
} | } |
| |
PEGASUS_NAMESPACE_END | PEGASUS_NAMESPACE_END |
|
|