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

Return to CIMObjectPath.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/CIMObjectPath.cpp between version 1.7 and 1.46

version 1.7, 2002/07/30 16:14:53

version 1.46, 2005/02/28 21:12:22

Line 1

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

//%2005////////////////////////////////////////////////////////////////////////

// The Open Group, Tivoli Systems

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// IBM Corp.; EMC Corporation, The Open Group.

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

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

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

Line 24

Line 30

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

// Modified By: Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)

// Carol Ann Krug Graves, Hewlett-Packard Company

// (carolann_graves@hp.com)

// Dave Sudlik, IBM (dsudlik@us.ibm.com)

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

#include <Pegasus/Common/Config.h>

#include <cctype>

#include <cstring>

#include <iostream>

#include "HashTable.h"

#include "CIMObjectPath.h"

#include "Indentor.h"

Line 37

Line 47

#include "Destroyer.h"

#include "XmlWriter.h"

#include "XmlReader.h"

#include "Array.h"

#include "ArrayInternal.h"

#include "CIMOMPort.h"

PEGASUS_NAMESPACE_BEGIN

#define PEGASUS_ARRAY_T KeyBinding

#define PEGASUS_ARRAY_T CIMKeyBinding

# include "ArrayImpl.h"

#undef PEGASUS_ARRAY_T

Line 74

Line 83

{

switch (str[i])

{

case '\n':

case '\\':

result += "\\n";

result.append("\\\\");

break;

case '\r':

result += "\\r";

break;

case '\t':

result += "\\t";

break;

case '"':

result += "\\\"";

result.append("\\\"");

break;

default:

result += str[i];

result.append(str[i]);

}

return result;

}

static void _BubbleSort(Array<KeyBinding>& x)

static void _BubbleSort(Array<CIMKeyBinding>& x)

{

Uint32 n = x.size();

// If the key is a reference, the keys in the reference must also be

// sorted

for (Uint32 k = 0; k < n ; k++)

if (x[k].getType () == CIMKeyBinding::REFERENCE)

{

CIMObjectPath tmp (x[k].getValue ());

Array <CIMKeyBinding> keyBindings = tmp.getKeyBindings ();

_BubbleSort (keyBindings);

tmp.setKeyBindings (keyBindings);

x[k].setValue (tmp.toString ());

}

if (n < 2)

return;

Line 109

Line 124

{

for (Uint32 j = 0; j < n - 1; j++)

{

if (String::compareNoCase(x[j].getName(), x[j+1].getName()) > 0)

if (String::compareNoCase(x[j].getName().getString(),

x[j+1].getName().getString()) > 0)

{

KeyBinding t = x[j];

CIMKeyBinding t = x[j];

x[j] = x[j+1];

x[j+1] = t;

}

Line 121

Line 137

////////////////////////////////////////////////////////////////////////////////

// KeyBinding

// CIMKeyBinding

////////////////////////////////////////////////////////////////////////////////

class KeyBindingRep

class CIMKeyBindingRep

{

public:

KeyBindingRep()

CIMKeyBindingRep()

{

}

KeyBindingRep(const KeyBindingRep& x)

CIMKeyBindingRep(const CIMKeyBindingRep& x)

: _name(x._name), _value(x._value), _type(x._type)

{

}

KeyBindingRep(

CIMKeyBindingRep(

const CIMName& name,

const String& value,

KeyBinding::Type type)

CIMKeyBinding::Type type)

: _name(name), _value(value), _type(type)

{

}

~KeyBindingRep()

~CIMKeyBindingRep()

{

}

KeyBindingRep& operator=(const KeyBindingRep& x)

CIMKeyBindingRep& operator=(const CIMKeyBindingRep& x)

{

if (&x != this)

{

Line 162

Line 178

CIMName _name;

String _value;

KeyBinding::Type _type;

CIMKeyBinding::Type _type;

};

KeyBinding::KeyBinding()

CIMKeyBinding::CIMKeyBinding()

{

_rep = new KeyBindingRep();

_rep = new CIMKeyBindingRep();

}

KeyBinding::KeyBinding(const KeyBinding& x)

CIMKeyBinding::CIMKeyBinding(const CIMKeyBinding& x)

{

_rep = new KeyBindingRep(*x._rep);

_rep = new CIMKeyBindingRep(*x._rep);

}

KeyBinding::KeyBinding(const CIMName& name, const String& value, Type type)

CIMKeyBinding::CIMKeyBinding(const CIMName& name, const String& value, Type type)

{

_rep = new KeyBindingRep(name, value, type);

_rep = new CIMKeyBindingRep(name, value, type);

}

KeyBinding::~KeyBinding()

CIMKeyBinding::CIMKeyBinding(const CIMName& name, const CIMValue& value)

{

if (value.isArray())

{

throw TypeMismatchException();

}

String kbValue = value.toString();

Type kbType;

switch (value.getType())

{

case CIMTYPE_BOOLEAN:

kbType = BOOLEAN;

break;

case CIMTYPE_CHAR16:

case CIMTYPE_STRING:

case CIMTYPE_DATETIME:

kbType = STRING;

break;

case CIMTYPE_REFERENCE:

kbType = REFERENCE;

break;

// case CIMTYPE_REAL32:

// case CIMTYPE_REAL64:

case CIMTYPE_OBJECT:

// From PEP 194: EmbeddedObjects cannot be keys.

throw TypeMismatchException();

break;

default:

kbType = NUMERIC;

break;

}

_rep = new CIMKeyBindingRep(name, kbValue, kbType);

}

CIMKeyBinding::~CIMKeyBinding()

{

delete _rep;

}

KeyBinding& KeyBinding::operator=(const KeyBinding& x)

CIMKeyBinding& CIMKeyBinding::operator=(const CIMKeyBinding& x)

{

*_rep = *x._rep;

return *this;

}

const CIMName& KeyBinding::getName() const

const CIMName& CIMKeyBinding::getName() const

{

return _rep->_name;

}

void KeyBinding::setName(const CIMName& name)

void CIMKeyBinding::setName(const CIMName& name)

{

_rep->_name = name;

}

const String& KeyBinding::getValue() const

const String& CIMKeyBinding::getValue() const

{

return _rep->_value;

}

void KeyBinding::setValue(const String& value)

void CIMKeyBinding::setValue(const String& value)

{

_rep->_value = value;

}

KeyBinding::Type KeyBinding::getType() const

CIMKeyBinding::Type CIMKeyBinding::getType() const

{

return _rep->_type;

}

void KeyBinding::setType(KeyBinding::Type type)

void CIMKeyBinding::setType(CIMKeyBinding::Type type)

{

_rep->_type = type;

}

const char* KeyBinding::typeToString(KeyBinding::Type type)

Boolean CIMKeyBinding::equal(CIMValue value)

{

switch (type)

if (value.isArray())

{

case KeyBinding::BOOLEAN:

return false;

return "boolean";

}

case KeyBinding::STRING:

CIMValue kbValue;

return "string";

case KeyBinding::NUMERIC:

try

return "numeric";

{

switch (value.getType())

{

case CIMTYPE_CHAR16:

if (getType() != STRING) return false;

kbValue.set(getValue()[0]);

break;

case CIMTYPE_DATETIME:

if (getType() != STRING) return false;

kbValue.set(CIMDateTime(getValue()));

break;

case CIMTYPE_STRING:

if (getType() != STRING) return false;

kbValue.set(getValue());

break;

case CIMTYPE_REFERENCE:

if (getType() != REFERENCE) return false;

kbValue.set(CIMObjectPath(getValue()));

break;

case CIMTYPE_BOOLEAN:

if (getType() != BOOLEAN) return false;

kbValue = XmlReader::stringToValue(0, getValue().getCString(),

value.getType());

break;

// case CIMTYPE_REAL32:

// case CIMTYPE_REAL64:

case CIMTYPE_OBJECT:

// From PEP 194: EmbeddedObjects cannot be keys.

return false;

break;

default: // Numerics

if (getType() != NUMERIC) return false;

kbValue = XmlReader::stringToValue(0, getValue().getCString(),

value.getType());

break;

}

catch (Exception&)

{

return false;

}

case KeyBinding::REFERENCE:

return value.equal(kbValue);

default:

PEGASUS_ASSERT(false);

}

return "unknown";

Boolean operator==(const CIMKeyBinding& x, const CIMKeyBinding& y)

{

// Check that the names and types match

if (!(x.getName().equal(y.getName())) ||

!(x.getType() == y.getType()))

{

return false;

}

Boolean operator==(const KeyBinding& x, const KeyBinding& y)

switch (x.getType())

{

return

case CIMKeyBinding::REFERENCE:

x.getName().equal(y.getName()) &&

try

String::equal(x.getValue(), y.getValue()) &&

{

x.getType() == y.getType();

// References should be compared as CIMObjectPaths

return (CIMObjectPath(x.getValue()) == CIMObjectPath(y.getValue()));

}

catch (Exception&)

{

// If CIMObjectPath parsing fails, just compare strings

return (String::equal(x.getValue(), y.getValue()));

}

break;

case CIMKeyBinding::BOOLEAN:

// Case-insensitive comparison is sufficient for booleans

return (String::equalNoCase(x.getValue(), y.getValue()));

break;

case CIMKeyBinding::NUMERIC:

// Note: This comparison assumes XML syntax for integers

// First try comparing as unsigned integers

{

Uint64 xValue;

Uint64 yValue;

if (XmlReader::stringToUnsignedInteger(

x.getValue().getCString(), xValue) &&

XmlReader::stringToUnsignedInteger(

y.getValue().getCString(), yValue))

{

return (xValue == yValue);

}

// Next try comparing as signed integers

{

Sint64 xValue;

Sint64 yValue;

if (XmlReader::stringToSignedInteger(

x.getValue().getCString(), xValue) &&

XmlReader::stringToSignedInteger(

y.getValue().getCString(), yValue))

{

return (xValue == yValue);

}

// Note: Keys may not be real values, so don't try comparing as reals

// We couldn't parse the numbers, so just compare the strings

return (String::equal(x.getValue(), y.getValue()));

break;

default: // CIMKeyBinding::STRING

return (String::equal(x.getValue(), y.getValue()));

break;

}

PEGASUS_UNREACHABLE(return false;)

}

Line 275

Line 419

const String& host,

const CIMNamespaceName& nameSpace,

const CIMName& className,

const Array<KeyBinding>& keyBindings)

const Array<CIMKeyBinding>& keyBindings)

: _host(host), _nameSpace(nameSpace),

_className(className), _keyBindings(keyBindings)

{

Line 297

Line 441

return *this;

}

static Boolean isValidHostname(const String& hostname)

{

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

// Validate the hostname. The hostname value may or may not be a

// fully-qualified domain name (e.g., xyz.company.com) or may be an

// IP address. A port number may follow the hostname.

// Hostnames must match one of the following regular expressions:

// ^([A-Za-z0-9][A-Za-z0-9-]*)(\.[A-Za-z][A-Za-z0-9-]*)*(:[0-9]*)?$

// ^([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*)(:[0-9]*)?$

// Note for Bug#1462. Be careful here, from RFC 1123:

// - The syntax of a legal Internet host name was specified in

// RFC-952 [DNS:4]. One aspect of host name syntax is hereby

// changed: the restriction on the first character is relaxed to

// allow either a letter or a digit.

// - If a dotted-decimal number can be entered without identifying

// delimiters, then a full syntactic check must be made, because

// a segment of a host domain name is now allowed to begin with a

// digit and could legally be entirely numeric (see Section 6.1.2.4).

// However, a valid host name can never have the dotted-decimal form

// #.#.#.#, since at least the highest-level component label will be

// alphabetic.

// The algorithm below has been updated accordingly.

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

Uint32 i = 0;

Boolean isValid = false;

if (isdigit(hostname[0]))

{

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

// Attempt to validate an IP address, but keep in mind that it

// might be a host name, since the leading character can now be

// a digit.

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

isValid = true;

for (Uint32 octet=1; octet<=4; octet++)

{

Uint32 octetValue = 0;

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

// If a non-digit is encountered in the input parameter,

// then break from here and attempt to validate as host name.

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

if (!isdigit(hostname[i]))

{

isValid = false;

break;

}

while (isdigit(hostname[i])) // skip over digits

{

octetValue = octetValue*10 + (hostname[i] - '0');

i++;

}

if (octetValue > 255)

{

isValid = false;

break;

}

// Check for invalid character in IP address

if ((octet != 4) && (hostname[i++] != '.'))

{

isValid = false;

break;

}

// Check for the case where it's a valid host name that happens

// to have 4 (or more) leading all-numeric host segments.

if ((octet == 4) && (hostname[i] != ':') && hostname[i] != char(0))

{

isValid = false;

break;

}

if (!isValid) // if it is not a valid IP address

{

i = 0; // reset index for host name check

// Validate a host name

isValid = true;

Boolean expectHostSegment = true;

Boolean hostSegmentIsNumeric;

while (expectHostSegment == true)

{

expectHostSegment = false;

hostSegmentIsNumeric = true; // assume all-numeric host segment

if (!isalnum(hostname[i++]))

{

return false;

}

while (isalnum(hostname[i]) || (hostname[i] == '-'))

{

// If a non-digit is encountered, set "all-numeric"

// flag to false

if (isalpha(hostname[i]) || (hostname[i] == '-')) {

hostSegmentIsNumeric = false;

}

i++;

}

if (hostname[i] == '.')

{

i++;

expectHostSegment = true;

}

// If the last Host Segment is all numeric, then return false.

// RFC 1123 says "highest-level component label will be alphabetic".

if (hostSegmentIsNumeric) {

return false;

}

if (!isValid) // if not a valid IP address or host name

{

return false;

}

// Check for a port number:

if (hostname[i] == ':')

{

if (!isdigit(hostname[++i]))

{

return false;

}

while (isdigit(hostname[++i]));

}

return (hostname[i] == char(0));

}

// Contains port as well (e.g., myhost:1234).

Line 304

Line 590

CIMNamespaceName _nameSpace;

CIMName _className;

Array<KeyBinding> _keyBindings;

Array<CIMKeyBinding> _keyBindings;

};

Line 327

Line 613

_rep = new CIMObjectPathRep(*tmpRef._rep);

}

CIMObjectPath::CIMObjectPath(const char* objectName)

{

// Test the objectName out to see if we get an exception

CIMObjectPath tmpRef;

tmpRef.set(objectName);

_rep = new CIMObjectPathRep(*tmpRef._rep);

}

CIMObjectPath::CIMObjectPath(

const String& host,

const CIMNamespaceName& nameSpace,

const CIMName& className,

const Array<KeyBinding>& keyBindings)

const Array<CIMKeyBinding>& keyBindings)

{

// Test the objectName out to see if we get an exception

CIMObjectPath tmpRef;

Line 372

Line 649

const String& host,

const CIMNamespaceName& nameSpace,

const CIMName& className,

const Array<KeyBinding>& keyBindings) throw(IllformedObjectName, IllegalName)

const Array<CIMKeyBinding>& keyBindings)

{

setHost(host);

setNameSpace(nameSpace);

Line 380

Line 657

setKeyBindings(keyBindings);

}

Boolean CIMObjectPath::_parseHostElement(

Boolean _parseHostElement(

const String& objectName,

char*& p,

String& host) throw(IllformedObjectName)

String& host)

{

// See if there is a host name (true if it begins with "//"):

// Host is of the from <hostname>-<port> and begins with "//"

// Host is of the form <hostname>:<port> and begins with "//"

// and ends with "/":

if (p[0] != '/' || p[1] != '/')

Line 396

Line 673

p += 2;

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

char* slash = strchr(p, '/');

// Validate the hostname. Hostnames must match the following

if (!slash)

// regular expression: "[A-Za-z][A-Za-z0-9-]*"

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

char* q = p;

if (!isalpha(*q))

throw IllformedObjectName(objectName);

q++;

while (isalnum(*q) || *q == '-')

q++;

// We now expect a port (or default the port).

if (*q == ':')

{

q++;

// Check for a port number:

if (!isdigit(*q))

throw IllformedObjectName(objectName);

while (isdigit(*q))

q++;

// Finally, assign the host name:

host.assign(p, q - p);

}

else

{

host.assign(p, q - p);

throw MalformedObjectNameException(objectName);

// Assign the default port number:

host.append(":");

host.append(PEGASUS_CIMOM_DEFAULT_PORT_STRING);

}

// Check for slash terminating the entire sequence:

String hostname = String(p, (Uint32)(slash - p));

if (!CIMObjectPathRep::isValidHostname(hostname))

if (*q != '/')

{

host.clear();

throw MalformedObjectNameException(objectName);

throw IllformedObjectName(objectName);

}

host = hostname;

p = ++q;

// Do not step past the '/'; it will be consumed by the namespace parser

p = slash;

return true;

}

Boolean CIMObjectPath::_parseNamespaceElement(

Boolean _parseNamespaceElement(

const String& objectName,

char*& p,

CIMNamespaceName& nameSpace)

Line 465

Line 706

return false;

}

// A ':' as part of a keybinding value should not be interpreted as

// a namespace delimiter. Since keybinding pairs follow the first '.'

// in the object path string, the ':' delimiter only counts if it

// appears before the '.'.

char* dot = strchr(p, '.');

if (dot && (dot < colon))

{

return false;

}

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

// Validate the namespace path. Namespaces must match the following

// regular expression: "[A-Za-z_]+(/[A-Za-z_]+)*"

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

String namespaceName = String(p, colon - p);

String namespaceName = String(p, (Uint32)(colon - p));

if (!CIMNamespaceName::legal(namespaceName))

{

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

}

nameSpace = namespaceName;

Line 482

Line 734

}

/**

ATTN: RK - Association classes have keys whose types are

ATTN-RK: The DMTF specification for the string form of an

references. These reference values must be treated specially

object path makes it impossible for a parser to distinguish

in the XML encoding, using the VALUE.REFERENCE tag structure.

between a key values of String type and Reference type.

Pegasus had been passing reference values simply as String

Given the ambiguity, this implementation takes a guess at the

values. For example, EnumerateInstanceNames returned

type of a quoted key value. If the value can be parsed into

KEYVALUEs of string type rather than VALUE.REFERENCEs.

a CIMObjectPath with at least one key binding, the type is

set to REFERENCE. Otherwise, the type is set to STRING.

I've modified the XmlReader::getKeyBindingElement() and

Note: This algorithm appears to be in line with what the Sun

XmlWriter::appendInstanceNameElement() methods to read and write

WBEM Services implementation does.

the XML in the proper format. However, making that change

required that a CIMObjectPath object be able to distinguish

To be totally correct, it would be necessary to retrieve the

between a key of String type and a key of reference type.

class definition and look up the types of the key properties

to determine how to interpret the key values. This is clearly

I've modified the String format of CIMObjectPaths slightly to

too inefficient for internal transformations between

allow efficient processing of references whose keys are also

CIMObjectPaths and String values.

of reference type. The "official" form uses the same

encoding for key values of String type and of reference type,

and so it would be necessary to retrieve the class definition

and look up the types of the key properties to determine how

to treat the key values. This is clearly too inefficient for

internal transformations between CIMObjectPaths and String

values.

The workaround is to encode a 'R' at the beginning of the

value for a key of reference type (before the opening '"').

This allows the parser to know a priori whether the key is of

String or reference type.

In this example:

MyClass.Key1="StringValue",Key2=R"RefClass.KeyA="StringA",KeyB=10"

Property Key1 of class MyClass is of String type, and so it

gets the usual encoding. Key2 is a reference property, so

the extra 'R' is inserted before its encoded value. Note

that this algorithm is recursive, such that RefClass could

include KeyC of reference type, which would also get encoded

with the 'R' notation.

The toString() method inserts the 'R' to provide symmetry. A

new KeyBinding type (REFERENCE) has been defined to denote

keys in a CIMObjectPath that are of reference type. This

KeyBinding type must be used appropriately for

CIMObjectPath::toString() to behave correctly.

A result of this change is that instances names in the

instance repository will include this extra 'R' character.

Note that for user-facing uses of the String encoding of

instance names (such as might appear in MOF for static

association instances or in the CGI client), this solution

is non-standard and therefore unacceptable. It is likely

that these points will need to process the more expensive

operation of retrieving the class definition to determine

the key property types.

void CIMObjectPath::_parseKeyBindingPairs(

void _parseKeyBindingPairs(

const String& objectName,

char*& p,

Array<KeyBinding>& keyBindings) throw(IllformedObjectName)

Array<CIMKeyBinding>& keyBindings)

{

// Get the key-value pairs:

Line 552

Line 765

char* equalsign = strchr(p, '=');

if (!equalsign)

{

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

}

*equalsign = 0;

CIMName keyString(p);

if (!CIMName::legal(keyString))

if (!CIMName::legal(p))

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

CIMName keyName (p);

// Get the value part:

String valueString;

p = equalsign + 1;

KeyBinding::Type type;

CIMKeyBinding::Type type;

if (*p == 'R')

if (*p == '"')

{

p++;

// Could be CIMKeyBinding::STRING or CIMKeyBinding::REFERENCE

type = KeyBinding::REFERENCE;

if (*p++ != '"')

p++;

throw IllformedObjectName(objectName);

while (*p && *p != '"')

{

// ATTN: need to handle special characters here:

if (*p == '\\')

{

*p++;

if ((*p != '\\') && (*p != '"'))

{

throw MalformedObjectNameException(objectName);

}

valueString.append(*p++);

}

if (*p++ != '"')

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

}

else if (*p == '"')

{

p++;

type = KeyBinding::STRING;

Guess at the type of this quoted key value. If the value

can be parsed into a CIMObjectPath with at least one key

binding, the type is assumed to be a REFERENCE. Otherwise,

the type is set to STRING. (See method header for details.)

type = CIMKeyBinding::STRING;

while (*p && *p != '"')

try

{

// ATTN: need to handle special characters here:

CIMObjectPath testForPath(valueString);

if (testForPath.getKeyBindings().size() > 0)

if (*p == '\\')

{

*p++;

// We've found a reference value!

type = CIMKeyBinding::REFERENCE;

valueString.append(*p++);

}

catch (const Exception &)

{

// Not a reference value; leave type as STRING

}

if (*p++ != '"')

throw IllformedObjectName(objectName);

}

else if (toupper(*p) == 'T' || toupper(*p) == 'F')

{

type = KeyBinding::BOOLEAN;

type = CIMKeyBinding::BOOLEAN;

char* r = p;

Uint32 n = 0;

Line 624

Line 843

if (!(((strncmp(p, "TRUE", n) == 0) && n == 4) ||

((strncmp(p, "FALSE", n) == 0) && n == 5)))

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

valueString.assign(p, n);

Line 632

Line 851

}

else

{

type = KeyBinding::NUMERIC;

type = CIMKeyBinding::NUMERIC;

char* r = p;

Uint32 n = 0;

Line 653

Line 872

Sint64 x;

if (!XmlReader::stringToSignedInteger(p, x))

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

valueString.assign(p, n);

Line 665

Line 884

p = p + n;

}

keyBindings.append(KeyBinding(keyString, valueString, type));

keyBindings.append(CIMKeyBinding(keyName.getString (), valueString,

type));

if (*p)

{

if (*p++ != ',')

{

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

}

Line 679

Line 899

_BubbleSort(keyBindings);

}

void CIMObjectPath::set(const String& objectName) throw(IllformedObjectName)

void CIMObjectPath::set(const String& objectName)

{

clear();

Line 692

Line 912

// Convert to a C String first:

char* p = objectName.allocateCString();

CString pCString = objectName.getCString();

ArrayDestroyer<char> destroyer(p);

char* p = const_cast<char*>((const char*) pCString);

Boolean gotHost;

Boolean gotNamespace;

Line 702

Line 922

if (gotHost && !gotNamespace)

{

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

}

// Extract the class name:

Line 713

Line 933

{

if (!CIMName::legal(p))

{

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

}

// ATTN: remove this later: a reference should only be able to hold

// an instance name.

_rep->_className = p;

_rep->_className = CIMName (p);

return;

}

String className = String(p, dot - p);

String className = String(p, (Uint32)(dot - p));

if (!CIMName::legal(className))

{

throw IllformedObjectName(objectName);

throw MalformedObjectNameException(objectName);

}

_rep->_className = className;

Line 743

Line 963

return *this;

}

CIMObjectPath& CIMObjectPath::operator=(const char* objectName)

{

set(objectName);

return *this;

}

const String& CIMObjectPath::getHost() const

{

return _rep->_host;

Line 756

Line 970

void CIMObjectPath::setHost(const String& host)

{

if ((host != String::EMPTY) && !CIMObjectPathRep::isValidHostname(host))

{

throw MalformedObjectNameException(host);

}

_rep->_host = host;

}

Line 779

Line 998

_rep->_className = className;

}

const Array<KeyBinding>& CIMObjectPath::getKeyBindings() const

const Array<CIMKeyBinding>& CIMObjectPath::getKeyBindings() const

{

return _rep->_keyBindings;

}

void CIMObjectPath::setKeyBindings(const Array<KeyBinding>& keyBindings)

void CIMObjectPath::setKeyBindings(const Array<CIMKeyBinding>& keyBindings)

{

_rep->_keyBindings = keyBindings;

_BubbleSort(_rep->_keyBindings);

}

String CIMObjectPath::toString(Boolean includeHost) const

String CIMObjectPath::toString() const

{

String objectName;

// Get the host:

if (_rep->_host.size() && includeHost)

if (_rep->_host.size())

{

objectName = "//";

objectName += _rep->_host;

objectName.append(_rep->_host);

objectName += "/";

objectName.append("/");

}

// Get the namespace (if we have a host name, we must write namespace):

if (!_rep->_nameSpace.isNull() || _rep->_host.size())

{

objectName += _rep->_nameSpace;

objectName.append(_rep->_nameSpace.getString ());

objectName += ":";

objectName.append(":");

}

// Get the class name:

objectName.append(getClassName());

objectName.append(getClassName().getString ());

if (isInstanceName())

// ATTN-CAKG-P2-20020726: The following condition does not correctly

// distinguish instanceNames from classNames in every case

// The instanceName of a singleton instance of a keyless class has no

// key bindings

if (_rep->_keyBindings.size () != 0)

{

objectName.append('.');

// Append each key-value pair:

const Array<KeyBinding>& keyBindings = getKeyBindings();

const Array<CIMKeyBinding>& keyBindings = getKeyBindings();

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

{

objectName.append(keyBindings[i].getName());

objectName.append(keyBindings[i].getName().getString ());

objectName.append('=');

const String& value = _escapeSpecialCharacters(

keyBindings[i].getValue());

KeyBinding::Type type = keyBindings[i].getType();

CIMKeyBinding::Type type = keyBindings[i].getType();

if (type == KeyBinding::REFERENCE)

objectName.append('R');

if (type == KeyBinding::STRING || type == KeyBinding::REFERENCE)

if (type == CIMKeyBinding::STRING || type == CIMKeyBinding::REFERENCE)

objectName.append('"');

objectName.append(value);

if (type == KeyBinding::STRING || type == KeyBinding::REFERENCE)

if (type == CIMKeyBinding::STRING || type == CIMKeyBinding::REFERENCE)

objectName.append('"');

if (i + 1 != n)

Line 852

Line 1074

return objectName;

}

String CIMObjectPath::toStringCanonical(Boolean includeHost) const

String CIMObjectPath::_toStringCanonical() const

{

CIMObjectPath ref = *this;

// ATTN-RK-P2-20020510: Need to make hostname and namespace lower case?

// Normalize hostname by changing to lower case

ref._rep->_host.toLower(); // ICU_TODO:

// Normalize namespace by changing to lower case

if (!ref._rep->_nameSpace.isNull())

{

String nameSpaceLower = ref._rep->_nameSpace.getString();

nameSpaceLower.toLower(); // ICU_TODO:

ref._rep->_nameSpace = nameSpaceLower;

}

String classNameLower = ref._rep->_className;

// Normalize class name by changing to lower case

classNameLower.toLower();

if (!ref._rep->_className.isNull())

{

String classNameLower = ref._rep->_className.getString();

classNameLower.toLower(); // ICU_TODO:

ref._rep->_className = classNameLower;

}

for (Uint32 i = 0, n = ref._rep->_keyBindings.size(); i < n; i++)

{

String keyBindingNameLower = ref._rep->_keyBindings[i]._rep->_name;

// Normalize key binding name by changing to lower case

keyBindingNameLower.toLower();

if (!ref._rep->_keyBindings[i]._rep->_name.isNull())

{

String keyBindingNameLower =

ref._rep->_keyBindings[i]._rep->_name.getString();

keyBindingNameLower.toLower(); // ICU_TODO:

ref._rep->_keyBindings[i]._rep->_name = keyBindingNameLower;

}

return ref.toString(includeHost);

// Normalize the key value

switch (ref._rep->_keyBindings[i]._rep->_type)

{

case CIMKeyBinding::REFERENCE:

try

{

// Convert reference to CIMObjectPath and recurse

ref._rep->_keyBindings[i]._rep->_value =

CIMObjectPath(ref._rep->_keyBindings[i]._rep->_value).

_toStringCanonical();

}

catch (Exception&)

CIMObjectPath CIMObjectPath::clone() const

{

return CIMObjectPath(*this);

// Leave value unchanged if the CIMObjectPath parsing fails

}

break;

case CIMKeyBinding::BOOLEAN:

// Normalize the boolean string by changing to lower case

ref._rep->_keyBindings[i]._rep->_value.toLower(); // ICU_TODO:

break;

case CIMKeyBinding::NUMERIC:

// Normalize the numeric string by converting to integer and back

Uint64 uValue;

Sint64 sValue;

// First try converting to unsigned integer

if (XmlReader::stringToUnsignedInteger(

ref._rep->_keyBindings[i]._rep->_value.getCString(),

uValue))

{

char buffer[32]; // Should need 21 chars max

sprintf(buffer, "%" PEGASUS_64BIT_CONVERSION_WIDTH "u", uValue);

ref._rep->_keyBindings[i]._rep->_value = String(buffer);

}

// Next try converting to signed integer

else if (XmlReader::stringToSignedInteger(

ref._rep->_keyBindings[i]._rep->_value.getCString(),

sValue))

{

char buffer[32]; // Should need 21 chars max

sprintf(buffer, "%" PEGASUS_64BIT_CONVERSION_WIDTH "d", sValue);

ref._rep->_keyBindings[i]._rep->_value = String(buffer);

}

// Leave value unchanged if it cannot be converted to an integer

break;

default: // CIMKeyBinding::STRING

// No normalization required for STRING

break;

}

// Note: key bindings are sorted when set in the CIMObjectPath

return ref.toString();

}

Boolean CIMObjectPath::identical(const CIMObjectPath& x) const

{

return

String::equal(_rep->_host, x._rep->_host) &&

String::equalNoCase(_rep->_host, x._rep->_host) &&

_rep->_nameSpace.equal(x._rep->_nameSpace) &&

_rep->_className.equal(x._rep->_className) &&

_rep->_keyBindings == x._rep->_keyBindings;

Line 888

Line 1174

Uint32 CIMObjectPath::makeHashCode() const

{

return HashFunc<String>::hash(toStringCanonical());

return HashFunc<String>::hash(_toStringCanonical());

}

Boolean CIMObjectPath::isInstanceName() const

{

return _rep->_keyBindings.size() != 0;

}

KeyBindingArray CIMObjectPath::getKeyBindingArray()

{

return KeyBindingArray();

}

Boolean operator==(const CIMObjectPath& x, const CIMObjectPath& y)

{

return x.identical(y);

Line 912

Line 1187

return !operator==(x, y);

}

PEGASUS_STD(ostream)& operator<<(

PEGASUS_STD(ostream)& os,

const CIMObjectPath& x)

{

return os << x.toString();

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.7
changed lines
	Added in v.1.46

No CVS admin address has been configured