pegasus/src/Pegasus/Common/XmlReader.cpp - diff

Return to XmlReader.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlReader.cpp between version 1.3 and 1.20

version 1.3, 2001/02/19 01:47:16

version 1.20, 2001/07/03 18:25:45

Line 1

//BEGIN_LICENSE

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

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

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

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

// to deal in the Software without restriction, including without limitation

// deal in the Software without restriction, including without limitation the

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// and/or sell copies of the Software, and to permit persons to whom the

// sell copies of the Software, and to permit persons to whom the Software is

// Software is furnished to do so, subject to the following conditions:

// furnished to do so, subject to the following conditions:

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

//==============================================================================

// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

// DEALINGS IN THE SOFTWARE.

//END_LICENSE

// Author: Mike Brasher (mbrasher@bmc.com)

//BEGIN_HISTORY

// Author:

// Modified By:

// $Log$

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

// Revision 1.3 2001/02/19 01:47:16 mike

// Renamed names of the form CIMConst to ConstCIM.

// Revision 1.2 2001/02/16 02:06:07 mike

// Renamed many classes and headers.

// Revision 1.1.1.1 2001/01/14 19:53:32 mike

// Pegasus import

//END_HISTORY

#include <cassert>

#include <cctype>

Line 46

Line 36

#include "CIMQualifierDecl.h"

#include "CIMClass.h"

#include "CIMInstance.h"

#include "CIMObject.h"

PEGASUS_NAMESPACE_BEGIN

Line 106

Line 97

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

{

char message[MESSAGE_SIZE];

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

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

tagName,entry.text);

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

}

Line 336

Line 328

throw XmlValidationError(lineNumber, buffer);

}

if (acceptNull && name.getLength() == 0)

if (acceptNull && name.size() == 0)

return name;

if (!CIMName::legal(name))

Line 781

Line 773

{

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

if (strlen(valueString)==0)

{

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)

{

case CIMType::BOOLEAN:

{

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

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

return CIMValue(true);

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

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

return CIMValue(false);

else

throw XmlSemanticError(

Line 913

Line 925

// Get VALUE start tag:

XmlEntry entry;

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

return false;

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

// Get VALUE content:

const char* valueString = "";

if (!empty)

Line 932

Line 941

}

value = stringToValue(parser.getLine(), valueString,type);

return true;

}

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

// getStringValueElement()

// <!ELEMENT VALUE (#PCDATA)>

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

Boolean XmlReader::getStringValueElement(

XmlParser& parser,

String& str,

Boolean required)

{

XmlEntry entry;

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

{

if (required)

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

return false;

}

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

const char* valueString = "";

if (!empty)

{

if (testContentOrCData(parser, entry))

valueString = entry.text;

expectEndTag(parser, "VALUE");

}

str = valueString;

return true;

}

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

// getPropertyValue

// Use: Decode property value from getPropertyResponse

// Expect (ERROR|IRETURNVALUE).!ELEMENT VALUE (#PCDATA)>

// PropertyValue:

// <!ELEMENT VALUE>

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

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

// INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)>

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

Boolean XmlReader::getPropertyValue(

XmlParser& parser,

CIMValue& cimValue)

{

//Test for Element value type

CIMType type = CIMType::STRING;

if (XmlReader::getValueElement(parser, type, cimValue))

{

//cout << "DEBUG xmlReader::getPropertyValue " << __LINE__

// << " CimValue = " << cimValue.toString << endl;

return true;

}

//Test for Element.array value

if(XmlReader::getValueArrayElement(parser, type, cimValue))

return true;

// Test for Value.reference type

// ATTN:This returns a different type (CIMReference)

// ATTN: Possibly change to simply return result after

// we figure out the type differences.

CIMReference reference;

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

return true;

return false;

}

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

// stringArrayToValue()

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

Line 950

Line 1043

{

Array<T> array;

for (Uint32 i = 0, n = stringArray.getSize(); i < n; i++)

for (Uint32 i = 0, n = stringArray.size(); i < n; i++)

{

CIMValue value = XmlReader::stringToValue(

lineNumber, stringArray[i], type);

Line 1539

Line 1632

while (getNameSpaceElement(parser, nameSpaceComponent))

{

if (nameSpace.getLength())

if (nameSpace.size())

nameSpace += '/';

nameSpace += nameSpaceComponent;

}

if (!nameSpace.getLength())

if (!nameSpace.size())

{

throw XmlValidationError(parser.getLine(),

"Expected one or more NAMESPACE elements within "

Line 1637

Line 1730

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

KeyBinding::CIMType XmlReader::getValueTypeAttribute(

KeyBinding::Type XmlReader::getValueTypeAttribute(

Uint32 lineNumber,

const XmlEntry& entry,

const char* elementName)

Line 1647

Line 1740

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

return KeyBinding::STRING;

if (tmp == "string")

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

return KeyBinding::STRING;

else if (tmp == "boolean")

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

return KeyBinding::BOOLEAN;

else if (tmp == "numeric")

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

return KeyBinding::NUMERIC;

char buffer[MESSAGE_SIZE];

Line 1679

Line 1772

Boolean XmlReader::getKeyValueElement(

XmlParser& parser,

KeyBinding::CIMType& type,

KeyBinding::Type& type,

String& value)

{

XmlEntry entry;

Line 1725

Line 1818

XmlParser& parser,

String& name,

String& value,

KeyBinding::CIMType& type)

KeyBinding::Type& type)

{

XmlEntry entry;

Line 1750

Line 1843

// %ClassName;>

// ATTN-B: VALUE.REFERENCE sub-element not accepted yet.

// ATTN-B: KEYVALUE sub-element nothandled yet.

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

Line 1774

Line 1866

if (!empty)

{

String name;

KeyBinding::CIMType type;

KeyBinding::Type type;

String value;

while (getKeyBindingElement(parser, name, value, type))

Line 1787

Line 1879

return true;

}

Boolean XmlReader::getInstanceNameElement(

XmlParser& parser,

CIMReference& instanceName)

{

String className;

Array<KeyBinding> keyBindings;

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

return false;

instanceName.set(String(), String(), className, keyBindings);

return true;

}

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

// getInstancePathElement()

Line 2515

Line 2621

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

// getObject()

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

void XmlReader::getObject(XmlParser& parser, CIMClass& x)

{

if (!getClassElement(parser, x))

{

throw XmlValidationError(parser.getLine(),

"expected CLASS element");

}

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

// getObject()

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

void XmlReader::getObject(XmlParser& parser, CIMInstance& x)

{

if (!getInstanceElement(parser, x))

{

throw XmlValidationError(parser.getLine(),

"expected INSTANCE element");

}

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

// getObject()

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

void XmlReader::getObject(XmlParser& parser, CIMQualifierDecl& x)

{

if (!getQualifierDeclElement(parser, x))

{

throw XmlValidationError(parser.getLine(),

"expected QUALIFIER.DECLARATION element");

}

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

// getMessageStartTag()

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

Boolean XmlReader::getMessageStartTag(

XmlParser& parser,

Uint32& id,

String& id,

const char*& protocolVersion)

{

XmlEntry entry;

Line 2539

Line 2690

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

throw XmlValidationError(parser.getLine(),

"Bad or missing MESSAGE.ID attribute");

"Bad or missing MESSAGE.PROTOCOLVERSION attribute");

return true;

}

Line 2669

Line 2820

Boolean XmlReader::getErrorElement(

XmlParser& parser,

CimException::Code& code,

CIMException::Code& code,

const char*& description,

Boolean required)

{

Line 2692

Line 2843

throw XmlValidationError(

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

code = CimException::Code(tmpCode);

code = CIMException::Code(tmpCode);

// Get ERROR.DESCRIPTION:

Line 2705

Line 2856

return true;

}

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

// getObjectWithPath()

// <!ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH,CLASS)|(INSTANCEPATH,INSTANCE))>

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

Boolean XmlReader::getObjectWithPath(

XmlParser& parser,

CIMObjectWithPath& objectWithPath)

{

XmlEntry entry;

if (!testStartTag(parser, entry, "VALUE.OBJECTWITHPATH"))

return false;

CIMReference reference;

Boolean isInstance = false;

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

isInstance = true;

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

{

throw XmlValidationError(parser.getLine(),

"Expected INSTANCE element");

}

if (isInstance)

{

CIMInstance cimInstance;

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

{

throw XmlValidationError(parser.getLine(),

"Expected INSTANCEPATH or CLASSPATH element");

}

objectWithPath.set(reference, CIMObject(cimInstance));

}

else

{

CIMClass cimClass;

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

{

throw XmlValidationError(parser.getLine(),

"Expected CLASS element");

}

objectWithPath.set(reference, CIMObject(cimClass));

}

expectEndTag(parser, "VALUE.OBJECTWITHPATH");

return true;

}

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

// <objectName>: (CLASSNAME|INSTANCENAME)

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

Boolean XmlReader::getObjectNameElement(

XmlParser& parser,

CIMReference& objectName)

{

String className;

CIMReference instanceName;

if (getClassNameElement(parser, className, false))

{

objectName.set(String(), String(), className);

return true;

}

else if (getInstanceNameElement(parser, objectName))

return true;

else

{

throw XmlValidationError(parser.getLine(),

"expected CLASSNAME or INSTANCENAME element");

}

return false;

}

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

// <!ELEMENT OBJECTPATH (INSTANCEPATH|CLASSPATH)>

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

Boolean XmlReader::getObjectPathElement(

XmlParser& parser,

CIMReference& objectPath)

{

if (getClassPathElement(parser, objectPath))

return true;

else if (getInstancePathElement(parser, objectPath))

return true;

else

{

throw XmlValidationError(parser.getLine(),

"expected INSTANCEPATH or CLASSPATH element");

}

return false;

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.3
changed lines
	Added in v.1.20

No CVS admin address has been configured