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

Return to XmlWriter.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/XmlWriter.cpp between version 1.169.4.1 and 1.169.4.5

version 1.169.4.1, 2011/01/15 21:26:53

version 1.169.4.5, 2013/06/03 22:35:14

Line 58

#include "StrLit.h"

#include "IDFactory.h"

#include "StringConversion.h"

PEGASUS_NAMESPACE_BEGIN

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

Line 154

Line 153

if (keyBindings[i].getType() == CIMKeyBinding::REFERENCE)

{

CIMObjectPath ref = keyBindings[i].getValue();

appendValueReferenceElement(out, ref, true);

// create an instancePath (i.e. isClassPath = false)

appendValueReferenceElement(out, ref, false, true);

}

else

{

Line 162

out << keyBindingTypeToString(keyBindings[i].getType());

out << STRLIT("\">");

// fixed the special character problem - Markus

// fixed the special characters

appendSpecial(out, keyBindings[i].getValue());

out << STRLIT("</KEYVALUE>\n");

Line 257

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

// appendValueReferenceElement does this correctly with isClassPath flag

// Called only but formatSimple

void XmlWriter::appendLocalObjectPathElement(

Buffer& out,

const CIMObjectPath& objectPath)

Line 266

Line 268

// distinguish instanceNames from classNames in every case

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

// key bindings

// See bBUG_3302.

if (objectPath.getKeyBindings ().size () != 0)

{

Line 357

Line 360

inline void _xmlWritter_appendValue(Buffer& out, const CIMObjectPath& x)

{

XmlWriter::appendValueReferenceElement(out, x, true);

// Emit Instance Path with value wrapper

XmlWriter::appendValueReferenceElement(out, x, false, true);

}

inline void _xmlWritter_appendValue(Buffer& out, const CIMObject& x)

Line 553

Line 557

break;

}

default:

PEGASUS_ASSERT(false);

PEGASUS_UNREACHABLE(PEGASUS_ASSERT(false);)

}

else if (value.getType() == CIMTYPE_REFERENCE)

Line 696

Line 700

break;

}

default:

PEGASUS_ASSERT(false);

PEGASUS_UNREACHABLE(PEGASUS_ASSERT(false);)

}

out << STRLIT("</VALUE>\n");

Line 723

Line 727

void XmlWriter::appendValueObjectWithPathElement(

Buffer& out,

const CIMObject& objectWithPath)

const CIMObject& objectWithPath,

Boolean includeQualifiers,

Boolean includeClassOrigin,

Boolean isClassObject,

const CIMPropertyList& propertyList)

{

out << STRLIT("<VALUE.OBJECTWITHPATH>\n");

appendValueReferenceElement(out, objectWithPath.getPath (), false);

appendValueReferenceElement(out, objectWithPath.getPath (),

appendObjectElement(out, objectWithPath);

isClassObject , false);

appendObjectElement(

out,

objectWithPath,

includeQualifiers,

includeClassOrigin,

propertyList);

out << STRLIT("</VALUE.OBJECTWITHPATH>\n");

}

Line 743

Line 758

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

void XmlWriter::appendValueReferenceElement(

// appends INSTANCEPATH | LOCALINSTANCEPATH | INSTANCENAME

void XmlWriter::appendValueInstancePathElement(

Buffer& out,

const CIMObjectPath& reference,

const CIMObjectPath& reference)

Boolean putValueWrapper)

{

if (putValueWrapper)

out << STRLIT("<VALUE.REFERENCE>\n");

// See if it is a class or instance reference (instance references have

// key-bindings; class references do not).

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

const Array<CIMKeyBinding>& kbs = reference.getKeyBindings();

if (kbs.size())

{

if (reference.getHost().size())

{

Line 777

Line 776

appendInstanceNameElement(out, reference);

}

else

// appends CLASSPATH | LOCALCLASSPATH | CLASSNAME

void XmlWriter::appendValueClassPathElement(

Buffer& out,

const CIMObjectPath& reference)

{

if (reference.getHost().size())

{

Line 793

Line 796

}

if (putValueWrapper)

// Builds either a classPath or InstancePath based on isClassPath

// parameter which was carried forward from, for example, the

// request. If wrapper true, wrap output with <VALUE.REFERENCE>

void XmlWriter::appendValueReferenceElement(

Buffer& out,

const CIMObjectPath& reference,

Boolean isClassPath,

Boolean addValueWrapper)

{

if (addValueWrapper)

{

out << STRLIT("<VALUE.REFERENCE>\n");

}

if (isClassPath)

{

appendValueClassPathElement(out,reference);

}

else

{

appendValueInstancePathElement(out,reference);

}

if (addValueWrapper)

{

out << STRLIT("</VALUE.REFERENCE>\n");

}

void XmlWriter::printValueReferenceElement(

const CIMObjectPath& reference,

Boolean isClassPath,

PEGASUS_STD(ostream)& os)

{

Buffer tmp;

appendValueReferenceElement(tmp, reference, true);

appendValueReferenceElement(tmp, reference, isClassPath, true);

indentedPrint(os, tmp.getData());

}

Line 816

Line 844

void XmlWriter::appendValueNamedInstanceElement(

Buffer& out,

const CIMInstance& namedInstance)

const CIMInstance& namedInstance,

Boolean includeQualifiers,

Boolean includeClassOrigin,

const CIMPropertyList& propertyList)

{

out << STRLIT("<VALUE.NAMEDINSTANCE>\n");

appendInstanceNameElement(out, namedInstance.getPath ());

appendInstanceElement(out, namedInstance);

appendInstanceElement(

out,

namedInstance,

includeQualifiers,

includeClassOrigin,

propertyList);

out << STRLIT("</VALUE.NAMEDINSTANCE>\n");

}

//EXP_PULL

//EXP_PULL_BEGIN

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

// appendValueInstanceWithPathElement()

Line 834

Line 870

// <!ELEMENT VALUE.INSTANCEWITHPATH (INSTANCEPATH,INSTANCE)>

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

// EXP_PULL_TBD checkout the INSTANCEPATH vs NAMEDINSTANCE

void XmlWriter::appendValueInstanceWithPathElement(

Buffer& out,

const CIMInstance& namedInstance)

const CIMInstance& namedInstance,

Boolean includeQualifiers,

Boolean includeClassOrigin,

const CIMPropertyList& propertyList)

{

out << STRLIT("<VALUE.INSTANCEWITHPATH>\n");

appendInstancePathElement(out, namedInstance.getPath ());

appendInstanceElement(out, namedInstance);

appendInstanceElement(

out,

namedInstance,

includeQualifiers,

includeClassOrigin,

propertyList);

out << STRLIT("</VALUE.INSTANCEWITHPATH>\n");

}

Line 923

Line 967

void XmlWriter::appendInstanceElement(

Buffer& out,

const CIMConstInstance& instance)

const CIMConstInstance& instance,

Boolean includeQualifiers,

Boolean includeClassOrigin,

const CIMPropertyList& propertyList)

{

CheckRep(instance._rep);

const CIMInstanceRep* rep = instance._rep;

Line 935

Line 982

<< STRLIT("\" >\n");

// Append Instance Qualifiers:

if(includeQualifiers)

{

for (Uint32 i = 0, n = rep->getQualifierCount(); i < n; i++)

XmlWriter::appendQualifierElement(out, rep->getQualifier(i));

}

// Append Properties:

if(propertyList.isNull())

{

for (Uint32 i = 0, n = rep->getPropertyCount(); i < n; i++)

XmlWriter::appendPropertyElement(out, rep->getProperty(i));

{

XmlWriter::appendPropertyElement(

out,

rep->getProperty(i),

includeQualifiers,includeClassOrigin);

}

else

{

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

{

CIMName name = propertyList[i];

Uint32 pos = rep->_properties.find(

propertyList[i],

propertyList.getCIMNameTag(i));

if(pos != PEG_NOT_FOUND)

{

PEG_TRACE((TRC_XML,Tracer::LEVEL4,

"XmlWriter::appendInstanceElement"

" Filtering the property name:%s for the className:%s"

"since it was not filtered by the provider.",

(const char *)name.getString().getCString(),

(const char *)instance.getClassName().

getString().getCString()));

XmlWriter::appendPropertyElement(

out,

rep->getProperty(pos),

includeQualifiers,includeClassOrigin);

}

// Instance closing element:

Line 968

Line 1048

void XmlWriter::appendObjectElement(

Buffer& out,

const CIMConstObject& object)

const CIMConstObject& object,

Boolean includeQualifiers,

Boolean includeClassOrigin,

const CIMPropertyList& propertyList)

{

if (object.isClass())

{

Line 978

Line 1061

else if (object.isInstance())

{

CIMConstInstance i(object);

appendInstanceElement(out, i);

appendInstanceElement(

out,

includeQualifiers,

includeClassOrigin,

propertyList);

}

// else PEGASUS_ASSERT(0);

}

Line 1013

Line 1101

void XmlWriter::appendPropertyElement(

Buffer& out,

const CIMConstProperty& property)

const CIMConstProperty& property,

Boolean includeQualifiers,

Boolean includeClassOrigin)

{

CheckRep(property._rep);

const CIMPropertyRep* rep = property._rep;

Line 1084

Line 1174

// Note that if the macro PEGASUS_SNIA_INTEROP_COMPATIBILITY is

// defined, then the EmbeddedInstance qualifier will be added

# ifdef PEGASUS_SNIA_INTEROP_COMPATIBILITY

if (rep->findQualifier(PEGASUS_QUALIFIERNAME_EMBEDDEDINSTANCE ==

if (rep->findQualifier(PEGASUS_QUALIFIERNAME_EMBEDDEDINSTANCE)

PEG_NOT_FOUND)

== PEG_NOT_FOUND)

{

// Note that addQualifiers() cannot be called on a const

// CIMQualifierRep. In this case we really do want to add

Line 1116

Line 1206

out.append('"');

}

if (!rep->getClassOrigin().isNull())

if(includeClassOrigin && !rep->getClassOrigin().isNull())

{

out << STRLIT(" CLASSORIGIN=\"") << rep->getClassOrigin();

out.append('"');

Line 1128

Line 1218

}

out << STRLIT(">\n");

if(includeQualifiers)

{

for (Uint32 i = 0, n = rep->getQualifierCount(); i < n; i++)

XmlWriter::appendQualifierElement(out, rep->getQualifier(i));

}

XmlWriter::appendValueElement(out, rep->getValue());

Line 1146

Line 1238

out << STRLIT(" REFERENCECLASS=\"") << rep->getReferenceClassName();

out.append('"');

}

if(includeClassOrigin && !rep->getClassOrigin().isNull())

if (!rep->getClassOrigin().isNull())

{

out << STRLIT(" CLASSORIGIN=\"") << rep->getClassOrigin();

out.append('"');

Line 1159

Line 1250

}

out << STRLIT(">\n");

if(includeQualifiers)

{

for (Uint32 i = 0, n = rep->getQualifierCount(); i < n; i++)

XmlWriter::appendQualifierElement(out, rep->getQualifier(i));

}

XmlWriter::appendValueElement(out, rep->getValue());

Line 1170

Line 1263

else

{

out << STRLIT("<PROPERTY NAME=\"") << rep->getName() << STRLIT("\" ");

if(includeClassOrigin && !rep->getClassOrigin().isNull())

if (!rep->getClassOrigin().isNull())

{

out << STRLIT(" CLASSORIGIN=\"") << rep->getClassOrigin();

out.append('"');

Line 1253

Line 1345

}

out << STRLIT(">\n");

if(includeQualifiers)

{

for (Uint32 i = 0, n = rep->getQualifierCount(); i < n; i++)

XmlWriter::appendQualifierElement(out, rep->getQualifier(i));

}

XmlWriter::appendValueElement(out, rep->getValue());

Line 1735

Line 1829

}

else

{

out << STRLIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");

out << STRLIT("Content-Type: application/xml; charset=utf-8\r\n");

}

if (binaryResponse)

Line 1762

Line 1856

// This should be removed when stable. This should only be turned off in

// a debugging/testing environment.

static const char *clientTransferEncodingOff =

//// static const char *clientTransferEncodingOff =

getenv("PEGASUS_HTTP_TRANSFER_ENCODING_REQUEST");

//// getenv("PEGASUS_HTTP_TRANSFER_ENCODING_REQUEST");

// EXP_PULL_TEMP DELETE

// KS_TODO - Remove this. Temp to insure no chunking during testing

Line 1853

Line 1947

}

else

{

out << STRLIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");

out << STRLIT("Content-Type: application/xml; charset=utf-8\r\n");

}

OUTPUT_CONTENTLENGTH(out, contentLength);

Line 2114

Line 2208

out << STRLIT("</IPARAMVALUE>\n");

}

//EXP_PULL_BEGIN

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

// _appendParamValueElementBegin()

Line 2138

Line 2233

{

out << STRLIT("</PARAMVALUE>\n");

}

//EXP_PULL_END

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

// _appendSimpleRspElementBegin()

Line 2390

Line 2487

out << STRLIT("</VALUE>\n");

_appendIReturnValueElementEnd(out);

}

void XmlWriter::appendUint32IParameter(

Buffer& out,

const char* name,

Uint32 val)

{

_appendIParamValueElementBegin(out, name);

out << STRLIT("<VALUE>");

append(out, val);

out << STRLIT("</VALUE>\n");

_appendIParamValueElementEnd(out);

}

// Can be used to generate either parameters with value,

// parameters with NULL (i.e. no value element) or

// no parameters output at all.

void XmlWriter::appendUint32IParameter(

void XmlWriter::appendUint32ArgIParameter(

Buffer& out,

const char* name,

const Uint32Arg& val,

Line 2455

Line 2563

_appendIParamValueElementEnd(out);

}

// EXP_PULL

// EXP_PULL_BEGIN

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

// appendStringIParameterIfNotEmpty()

Line 2550

Line 2658

_appendIParamValueElementEnd(out);

}

void XmlWriter::appendObjectNameIParameter(

Buffer& out,

const char* name,

const CIMObjectPath& objectName)

{

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

// has no key bindings

if (objectName.getKeyBindings ().size () == 0)

{

XmlWriter::appendClassNameIParameter(

out, name, objectName.getClassName());

}

else

{

XmlWriter::appendInstanceNameIParameter(

out, name, objectName);

}

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

// appendClassIParameter()

Line 2903

Line 2988

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

Formats a IMethod Response Message. Note that this function formats

Formats a IMethod Response Message. This function formats

messages for chunking based on the isFirst and isLast parameters.

If isFirst is set, it outputs headers and ResponseElement begin.

It always sends the body. If isLast is set, it sends the rtnParams

Line 2955

Line 3040

{

if (body.size() != 0 || isFirst == false)

_appendIReturnValueElementEnd(out);

// EXP_PULL

// If there are any parameters include them here.

// Insert any return parameters.

// Assumes that it is prebuilt with all components

if (rtnParams.size() != 0)

{

out << rtnParams;

}

// //EXP_PULL_END

_appendIMethodResponseElementEnd(out);

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

Line 3042

Line 3125

out << STRLIT("POST ") << requestUri << STRLIT(" HTTP/1.1\r\n");

}

out << STRLIT("HOST: ") << host << STRLIT("\r\n"

"Content-Type: application/xml; charset=\"utf-8\"\r\n");

"Content-Type: application/xml; charset=utf-8\r\n");

OUTPUT_CONTENTLENGTH(out, contentLength);

if (acceptLanguages.size() > 0)

Line 3106

Line 3189

char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };

out << STRLIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n"

"Content-Type: application/xml; charset=\"utf-8\"\r\n");

"Content-Type: application/xml; charset=utf-8\r\n");

OUTPUT_CONTENTLENGTH(out, contentLength);

if (contentLanguages.size() > 0)

Line 3403

Line 3486

case CIMKeyBinding::REFERENCE:

default:

PEGASUS_ASSERT(false);

PEGASUS_UNREACHABLE(PEGASUS_ASSERT(false);)

}

return STRLIT("unknown");

Legend:

Removed from v.1.169.4.1
changed lines
	Added in v.1.169.4.5

No CVS admin address has been configured