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.95 and 1.124.2.7

version 1.95, 2003/08/26 20:46:28

version 1.124.2.7, 2005/10/04 22:25:15

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 28

Line 34

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

// Carol Ann Krug Graves, Hewlett-Packard Company

// (carolann_graves@hp.com)

// Amit K Arora, IBM (amita@in.ibm.com) for PEP#101

// Brian G. Campbell, EMC (campbell_brian@emc.com) - PEP140/phase1

// Willis White (whiwill@us.ibm.com) PEP 127 and 128

// Brian G. Campbell, EMC (campbell_brian@emc.com) - PEP140/phase2

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

// David Dillard, VERITAS Software Corp.

// (david.dillard@veritas.com)

// Vijay Eli, vijayeli@in.ibm.com, fix for #2571

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

Line 35

Line 49

#include <cstdlib>

#include <cstdio>

#include "Constants.h"

#include "Destroyer.h"

#include "CIMClass.h"

#include "CIMClassRep.h"

#include "CIMInstance.h"

Line 61

Line 74

PEGASUS_NAMESPACE_BEGIN

Array<Sint8>& operator<<(Array<Sint8>& out, const char* x)

// This is a shortcut macro for outputing content length. This

// pads the output number to the max characters representing a Uint32 number

// so that it can be overwritten easily with a transfer encoding line later

// on in HTTPConnection if required. This is strictly for performance since

// messages can be very large. This overwriting shortcut allows us to NOT have

// to repackage a large message later.

#define OUTPUT_CONTENTLENGTH \

{ \

char contentLengthP[11]; \

sprintf(contentLengthP,"%.10u", contentLength); \

out << LIT("content-length: ") << contentLengthP << LIT("\r\n"); \

}

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

// SpecialChar and table.

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

struct SpecialChar

{

const char* str;

size_t size;

};

// Defines encodings of special characters. Just use a 7-bit ASCII character

// as an index into this array to retrieve its string encoding and encoding

// length in bytes.

static const SpecialChar _specialChars[] =

{

{ "", 4 },

{ "	", 4 },

{ "
", 5 },

{ "", 5 },

{ "", 5 },

{ "", 5 },

{ " ", 1 },

{ "!", 1 },

{ """, 6 },

{ "#", 1 },

{ "$", 1 },

{ "%", 1 },

{ "&", 5 },

{ "'", 6 },

{ "(", 1 },

{ ")", 1 },

{ "*", 1 },

{ "+", 1 },

{ ",", 1 },

{ "-", 1 },

{ ".", 1 },

{ "/", 1 },

{ "0", 1 },

{ "1", 1 },

{ "2", 1 },

{ "3", 1 },

{ "4", 1 },

{ "5", 1 },

{ "6", 1 },

{ "7", 1 },

{ "8", 1 },

{ "9", 1 },

{ ":", 1 },

{ ";", 1 },

{ "<", 4 },

{ "=", 1 },

{ ">", 4 },

{ "?", 1 },

{ "@", 1 },

{ "A", 1 },

{ "B", 1 },

{ "C", 1 },

{ "D", 1 },

{ "E", 1 },

{ "F", 1 },

{ "G", 1 },

{ "H", 1 },

{ "I", 1 },

{ "J", 1 },

{ "K", 1 },

{ "L", 1 },

{ "M", 1 },

{ "N", 1 },

{ "O", 1 },

{ "P", 1 },

{ "Q", 1 },

{ "R", 1 },

{ "S", 1 },

{ "T", 1 },

{ "U", 1 },

{ "V", 1 },

{ "W", 1 },

{ "X", 1 },

{ "Y", 1 },

{ "Z", 1 },

{ "[", 1 },

{ "\\", 1 },

{ "]", 1 },

{ "^", 1 },

{ "_", 1 },

{ "`", 1 },

{ "a", 1 },

{ "b", 1 },

{ "c", 1 },

{ "d", 1 },

{ "e", 1 },

{ "f", 1 },

{ "g", 1 },

{ "h", 1 },

{ "i", 1 },

{ "j", 1 },

{ "k", 1 },

{ "l", 1 },

{ "m", 1 },

{ "n", 1 },

{ "o", 1 },

{ "p", 1 },

{ "q", 1 },

{ "r", 1 },

{ "s", 1 },

{ "t", 1 },

{ "u", 1 },

{ "v", 1 },

{ "w", 1 },

{ "x", 1 },

{ "y", 1 },

{ "z", 1 },

{ "{", 1 },

{ "|", 1 },

{ "}", 1 },

{ "~", 1 },

{ "", 6 },

};

// If _isSpecialChar7[ch] is true, then ch is a special character, which must

// have a special encoding in XML. But only use 7-bit ASCII characters to

// index this array.

static const int _isSpecialChar7[] =

{

1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,0,0,

0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,

0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,

};

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

Buffer& operator<<(Buffer& out, const char* x)

{

XmlWriter::append(out, x);

return out;

}

Array<Sint8>& operator<<(Array<Sint8>& out, char x)

Buffer& operator<<(Buffer& out, char x)

{

XmlWriter::append(out, x);

return out;

}

Array<Sint8>& operator<<(Array<Sint8>& out, const Char16& x)

Buffer& operator<<(Buffer& out, const Char16& x)

{

XmlWriter::append(out, x);

return out;

}

Array<Sint8>& operator<<(Array<Sint8>& out, const String& x)

Buffer& operator<<(Buffer& out, const String& x)

{

XmlWriter::append(out, x);

return out;

}

Array<Sint8>& operator<<(Array<Sint8>& out, const Indentor& x)

Buffer& operator<<(Buffer& out, const Indentor& x)

{

XmlWriter::append(out, x);

return out;

}

Array<Sint8>& operator<<(Array<Sint8>& out, const Array<Sint8>& x)

Buffer& operator<<(Buffer& out, const Buffer& x)

{

out.appendArray(x);

out.append(x.getData(), x.size());

return out;

}

Array<Sint8>& operator<<(Array<Sint8>& out, Uint32 x)

Buffer& operator<<(Buffer& out, Uint32 x)

{

XmlWriter::append(out, x);

return out;

}

Array<Sint8>& operator<<(Array<Sint8>& out, const CIMName& name)

Buffer& operator<<(Buffer& out, const CIMName& name)

{

XmlWriter::append(out, name.getString ());

return out;

Line 111

Line 298

// l10n

Array<Sint8>& operator<<(Array<Sint8>& out, const AcceptLanguages& al)

Buffer& operator<<(Buffer& out, const AcceptLanguages& al)

{

XmlWriter::append(out, al.toString ());

return out;

}

// l10n

Array<Sint8>& operator<<(Array<Sint8>& out, const ContentLanguages& cl)

Buffer& operator<<(Buffer& out, const ContentLanguages& cl)

{

XmlWriter::append(out, cl.toString ());

return out;

Line 143

Line 330

return os;

}

inline void _appendChar(Array<Sint8>& out, const Char16& c)

inline void _xmlWritter_appendChar(Buffer& out, const Char16& c)

{

// We need to convert the Char16 to UTF8 then append the UTF8

// character into the array.

// NOTE: The UTF8 character could be several bytes long.

// WARNING: This function will put in replacement character for

// all characters that have surogate pairs.

Uint8 str[6];

char str[6];

memset(str,0x00,sizeof(str));

Uint8* charIN = (Uint8 *)&c;

Line 165

Line 352

&strtgt,

endtgt);

out.append((Sint8 *)str,trailingBytesForUTF8[Uint32(str[0])]+1);

out.append(str, UTF_8_COUNT_TRAIL_BYTES(str[0]) + 1);

}

inline void _appendSpecialChar(Array<Sint8>& out, const Char16& c)

inline void _xmlWritter_appendSpecialChar(Buffer& out, const Char16& c)

{

if ( ((c < Char16(0x20)) && (c >= Char16(0x00))) || (c == Char16(0x7f)) )

{

char charref[7];

sprintf(charref, "&#%u;", (Uint16)c);

out.append(charref, strlen(charref));

out.append(charref, static_cast<Uint32>(strlen(charref)));

}

else

{

Line 207

Line 394

// NOTE: The UTF8 character could be several bytes long.

// WARNING: This function will put in replacement character for

// all characters that have surogate pairs.

Uint8 str[6];

char str[6];

memset(str,0x00,sizeof(str));

Uint8* charIN = (Uint8 *)&c;

const char* charIN = reinterpret_cast<const char *>(&c);

const Uint16 *strsrc = (Uint16 *)charIN;

const Uint16 *strsrc = (const Uint16 *)charIN;

Uint16 *endsrc = (Uint16 *)&charIN[1];

const Uint16 *endsrc = (const Uint16 *)&charIN[1];

Uint8 *strtgt = (Uint8 *)str;

Uint8 *endtgt = (Uint8 *)&str[5];

Line 222

Line 409

&strtgt,

endtgt);

Uint32 number1 = trailingBytesForUTF8[Uint32(str[0])]+1;

Uint32 number1 = UTF_8_COUNT_TRAIL_BYTES(str[0]) + 1;

out.append((Sint8 *)str,number1);

out.append(str,number1);

}

inline void _appendSpecialChar(Array<Sint8>& out, char c)

inline void _appendSpecialChar7(Buffer& out, char c)

{

if ( ((c < Char16(0x20)) && (c >= Char16(0x00))) || (c == Char16(0x7f)) )

if (_isSpecialChar7[int(c)])

{

out.append(_specialChars[int(c)].str, _specialChars[int(c)].size);

char charref[7];

sprintf(charref, "&#%u;", (Uint8)c);

out.append(charref, strlen(charref));

}

else

{

out.append(c);

switch (c)

{

case '&':

out.append("&", 5);

break;

case '<':

out.append("<", 4);

break;

case '>':

out.append(">", 4);

break;

case '"':

out.append(""", 6);

break;

case '\'':

out.append("'", 6);

break;

default:

out.append(Sint8(c));

}

static inline void _appendSpecialChar(PEGASUS_STD(ostream)& os, char c)

inline void _xmlWritter_appendSpecialChar(PEGASUS_STD(ostream)& os, char c)

{

if ( (c < Char16(0x20)) || (c == Char16(0x7f)) )

if ( ((c < 0x20) && (c >= 0)) || (c == 0x7f) )

{

char charref[7];

sprintf(charref, "&#%u;", (Uint8)c);

sprintf(charref, "&#%u;", static_cast<Uint8>(c));

os << charref;

}

else

Line 307

Line 463

}

void _appendSurrogatePair(Array<Sint8>& out, Uint16 high, Uint16 low)

void _xmlWritter_appendSurrogatePair(Buffer& out, Uint16 high, Uint16 low)

{

Uint8 str[6];

char str[6];

Uint8 charIN[5];

memset(str,0x00,sizeof(str));

memcpy(&charIN,&high,2);

Line 325

Line 481

&strtgt,

endtgt);

Uint32 number1 = trailingBytesForUTF8[Uint32(str[0])]+1;

Uint32 number1 = UTF_8_COUNT_TRAIL_BYTES(str[0]) + 1;

out.append((Sint8 *)str,number1);

out.append(str,number1);

}

static inline void _appendSpecial(PEGASUS_STD(ostream)& os, const char* str)

inline void _xmlWritter_appendSpecial(PEGASUS_STD(ostream)& os, const char* str)

{

while (*str)

_appendSpecialChar(os, *str++);

_xmlWritter_appendSpecialChar(os, *str++);

}

void XmlWriter::append(Array<Sint8>& out, const Char16& x)

void XmlWriter::append(Buffer& out, const Char16& x)

{

_appendChar(out, x);

_xmlWritter_appendChar(out, x);

}

void XmlWriter::append(Array<Sint8>& out, Boolean x)

void XmlWriter::append(Buffer& out, Boolean x)

{

append(out, (x ? "TRUE" : "FALSE"));

}

void XmlWriter::append(Array<Sint8>& out, Uint32 x)

void XmlWriter::append(Buffer& out, Uint32 x)

{

char buffer[32];

sprintf(buffer, "%u", x);

append(out, buffer);

}

void XmlWriter::append(Array<Sint8>& out, Sint32 x)

void XmlWriter::append(Buffer& out, Sint32 x)

{

char buffer[32];

sprintf(buffer, "%d", x);

append(out, buffer);

}

void XmlWriter::append(Array<Sint8>& out, Uint64 x)

void XmlWriter::append(Buffer& out, Uint64 x)

{

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

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

append(out, buffer);

}

void XmlWriter::append(Array<Sint8>& out, Sint64 x)

void XmlWriter::append(Buffer& out, Sint64 x)

{

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

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

append(out, buffer);

}

void XmlWriter::append(Array<Sint8>& out, Real64 x)

void XmlWriter::append(Buffer& out, Real32 x)

{

char buffer[128];

// %e gives '[-]m.dddddde+/-xx', which seems compatible with CIM/XML spec

// %.7e gives '[-]m.ddddddde+/-xx', which seems compatible with the format

sprintf(buffer, "%e", x);

// given in the CIM/XML spec, and the precision required by the CIM 2.2 spec

// (4 byte IEEE floating point)

sprintf(buffer, "%.7e", x);

append(out, buffer);

}

void XmlWriter::append(Array<Sint8>& out, const char* str)

void XmlWriter::append(Buffer& out, Real64 x)

{

char buffer[128];

// %.16e gives '[-]m.dddddddddddddddde+/-xx', which seems compatible with the format

// given in the CIM/XML spec, and the precision required by the CIM 2.2 spec

// (8 byte IEEE floating point)

sprintf(buffer, "%.16e", x);

append(out, buffer);

}

void XmlWriter::append(Buffer& out, const char* str)

{

while (*str)

_appendChar(out, *str++);

XmlWriter::append(out, *str++);

}

void XmlWriter::append(Array<Sint8>& out, const String& str)

void XmlWriter::append(Buffer& out, const String& str)

{

for (Uint32 i = 0; i < str.size(); i++)

const Uint16* p = (const Uint16*)str.getChar16Data();

size_t n = str.size();

// Handle leading ASCII 7 characers in these next two loops (use unrolling).

while (n >= 8 && ((p[0]|p[1]|p[2]|p[3]|p[4]|p[5]|p[6]|p[7]) & 0xFF80) == 0)

{

Uint16 c = str[i];

out.append(p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);

p += 8;

n -= 8;

}

while (n >= 4 && ((p[0]|p[1]|p[2]|p[3]) & 0xFF80) == 0)

{

out.append(p[0], p[1], p[2], p[3]);

p += 4;

n -= 4;

}

while (n--)

{

Uint16 c = *p++;

// Special processing for UTF8 case:

if (c < 128)

{

out.append(c);

continue;

}

// Hanlde UTF8 case (if reached).

if(((c >= FIRST_HIGH_SURROGATE) && (c <= LAST_HIGH_SURROGATE)) ||

((c >= FIRST_LOW_SURROGATE) && (c <= LAST_LOW_SURROGATE)))

{

Char16 highSurrogate = str[i];

Char16 highSurrogate = p[-1];

Char16 lowSurrogate = str[++i];

Char16 lowSurrogate = p[0];

p++;

n--;

_appendSurrogatePair(out, Uint16(highSurrogate),Uint16(lowSurrogate));

_xmlWritter_appendSurrogatePair(

out, Uint16(highSurrogate),Uint16(lowSurrogate));

}

else

{

_appendChar(out, str[i]);

_xmlWritter_appendChar(out, c);

}

void XmlWriter::append(Array<Sint8>& out, const Indentor& x)

void XmlWriter::append(Buffer& out, const Indentor& x)

{

for (Uint32 i = 0; i < 4 * x.getLevel(); i++)

out.append(' ');

}

void XmlWriter::appendSpecial(Array<Sint8>& out, const Char16& x)

void XmlWriter::appendSpecial(Buffer& out, const Char16& x)

{

_appendSpecialChar(out, x);

_xmlWritter_appendSpecialChar(out, x);

}

void XmlWriter::appendSpecial(Array<Sint8>& out, char x)

void XmlWriter::appendSpecial(Buffer& out, char x)

{

_appendSpecialChar(out, x);

_appendSpecialChar7(out, x);

}

void XmlWriter::appendSpecial(Array<Sint8>& out, const char* str)

void XmlWriter::appendSpecial(Buffer& out, const char* str)

{

while (*str)

_appendSpecialChar(out, *str++);

_appendSpecialChar7(out, *str++);

}

void XmlWriter::appendSpecial(Array<Sint8>& out, const String& str)

void XmlWriter::appendSpecial(Buffer& out, const String& str)

{

for (Uint32 i = 0; i < str.size(); i++)

const Uint16* p = (const Uint16*)str.getChar16Data();

size_t n = str.size();

// Handle leading ASCII 7 characers in these next two loops (use unrolling).

while (n >= 8)

{

Uint16 c = str[i];

// The following condition is equivalent to this:

// (p[0] < 128 && p[1] < 128 && p[2] < 128 && p[3] < 128 &&

// p[4] < 128 && p[5] < 128 && p[6] < 128 && p[7] < 128)

if (((p[0]|p[1]|p[2]|p[3]|p[4]|p[5]|p[6]|p[7]) & 0xFF80) == 0)

{

// Note: "|" is faster than "||" and achieves the same effect

// since p[i] is either 0 or 1.

if (_isSpecialChar7[p[0]] | _isSpecialChar7[p[1]] |

_isSpecialChar7[p[2]] | _isSpecialChar7[p[3]] |

_isSpecialChar7[p[4]] | _isSpecialChar7[p[5]] |

_isSpecialChar7[p[6]] | _isSpecialChar7[p[7]])

{

// Rare case.

_appendSpecialChar7(out, p[0]);

_appendSpecialChar7(out, p[1]);

_appendSpecialChar7(out, p[2]);

_appendSpecialChar7(out, p[3]);

_appendSpecialChar7(out, p[4]);

_appendSpecialChar7(out, p[5]);

_appendSpecialChar7(out, p[6]);

_appendSpecialChar7(out, p[7]);

}

else

{

// Common case.

out.append(p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);

}

p += 8;

n -= 8;

}

else

break;

}

while (n >= 4)

{

// The following condition is equivalent to this:

// (p[0] < 128 && p[1] < 128 && p[2] < 128 && p[3] < 128)

if (((p[0]|p[1]|p[2]|p[3]) & 0xFF80) == 0)

{

if (_isSpecialChar7[p[0]] | _isSpecialChar7[p[1]] |

_isSpecialChar7[p[2]] | _isSpecialChar7[p[3]])

{

// Rare case:

_appendSpecialChar7(out, p[0]);

_appendSpecialChar7(out, p[1]);

_appendSpecialChar7(out, p[2]);

_appendSpecialChar7(out, p[3]);

}

else

{

// Common case:

out.append(p[0], p[1], p[2], p[3]);

}

p += 4;

n -= 4;

}

else

break;

}

// Process remaining characters. A UTF8 character must have been

// encountered or this would have never been reached.

while (n--)

{

Uint16 c = *p++;

// Special processing for UTF8 case:

if (c < 128)

{

_appendSpecialChar7(out, c);

continue;

}

// Hanlde UTF8 case (if reached).

if(((c >= FIRST_HIGH_SURROGATE) && (c <= LAST_HIGH_SURROGATE)) ||

((c >= FIRST_LOW_SURROGATE) && (c <= LAST_LOW_SURROGATE)))

{

Char16 highSurrogate = str[i];

Char16 highSurrogate = p[-1];

Char16 lowSurrogate = str[++i];

Char16 lowSurrogate = p[0];

p++;

n--;

_appendSurrogatePair(out, Uint16(highSurrogate),Uint16(lowSurrogate));

_xmlWritter_appendSurrogatePair(

out, Uint16(highSurrogate),Uint16(lowSurrogate));

}

else

{

_appendSpecialChar(out, str[i]);

_xmlWritter_appendSpecialChar(out, c);

}

// chuck start

// See http://www.ietf.org/rfc/rfc2396.txt section 2

// Reserved characters = ';' '/' '?' ':' '@' '&' '=' '+' '$' ','

// Excluded characters:

Line 461

Line 748

// Unwise = '{' '}' '|' '\\' '^' '[' ']' '`'

inline void _encodeURIChar(String& outString, Sint8 char8)

static const char _is_uri[128] =

{

1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,

1,1,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,

0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,

};

inline void _xmlWritter_encodeURIChar(String& outString, Sint8 char8)

{

Uint8 c = (Uint8)char8;

#ifndef PEGASUS_DO_NOT_IMPLEMENT_URI_ENCODING

if ( ((c <= 0x20) && (c >= 0x00)) || // Control characters + space char

if (c > 127 || _is_uri[int(c)])

( (c >= 0x22) && (c <= 0x26) ) || // '"' '#' '$' '%' '&'

(c == 0x2b) || // '+'

(c == 0x2c) || // ','

(c == 0x2f) || // '/'

( (c >= 0x3a) && (c <= 0x40) ) || // ':' ';' '<' '=' '>' '?' '@'

( (c >= 0x5b) && (c <= 0x5e) ) || // '[' '\\' ']' '^'

(c == 0x60) || // '`'

( (c >= 0x7b) && (c <= 0x7d) ) || // '{' '|' '}'

// (c == 0x7f) ) // Control character

(c >= 0x7f) ) // Control character or non US-ASCII (UTF-8)

{

char hexencoding[4];

int n = sprintf(hexencoding, "%%%X%X", c/16, c%16);

sprintf(hexencoding, "%%%X%X", c/16, c%16);

#ifdef PEGASUS_USE_STRING_EXTENSIONS

outString.append(hexencoding, n);

#else /* PEGASUS_USE_STRING_EXTENSIONS */

outString.append(hexencoding);

#endif /* PEGASUS_USE_STRING_EXTENSIONS */

}

else

#endif

Line 490

Line 778

}

String XmlWriter::encodeURICharacters(Array<Sint8> uriString)

String XmlWriter::encodeURICharacters(const Buffer& uriString)

{

String encodedString;

for (Uint32 i=0; i<uriString.size(); i++)

{

_encodeURIChar(encodedString, uriString[i]);

_xmlWritter_encodeURIChar(encodedString, uriString[i]);

}

return encodedString;

}

String XmlWriter::encodeURICharacters(String uriString)

String XmlWriter::encodeURICharacters(const String& uriString)

{

String encodedString;

/* i18n remove - did not handle surrogate pairs

for (Uint32 i=0; i<uriString.size(); i++)

{

_encodeURIChar(encodedString, uriString[i]);

_xmlWritter_encodeURIChar(encodedString, uriString[i]);

}

Line 517

Line 805

// 3.3.3, for the treatment of non US-ASCII (UTF-8) chars

// First, convert to UTF-8 (include handling of surrogate pairs)

Array<Sint8> utf8;

Buffer utf8;

for (Uint32 i = 0; i < uriString.size(); i++)

{

Uint16 c = uriString[i];

Line 528

Line 816

Char16 highSurrogate = uriString[i];

Char16 lowSurrogate = uriString[++i];

_appendSurrogatePair(utf8, Uint16(highSurrogate),Uint16(lowSurrogate));

_xmlWritter_appendSurrogatePair(utf8, Uint16(highSurrogate),Uint16(lowSurrogate));

}

else

{

_appendChar(utf8, uriString[i]);

_xmlWritter_appendChar(utf8, uriString[i]);

}

// Second, escape the non HTTP-safe chars

for (Uint32 i=0; i<utf8.size(); i++)

{

_encodeURIChar(encodedString, utf8[i]);

_xmlWritter_encodeURIChar(encodedString, utf8[i]);

}

return encodedString;

Line 554

Line 842

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

void XmlWriter::appendLocalNameSpacePathElement(

Array<Sint8>& out,

Buffer& out,

const CIMNamespaceName& nameSpace)

{

out << "<LOCALNAMESPACEPATH>\n";

out << LIT("<LOCALNAMESPACEPATH>\n");

char* nameSpaceCopy = strdup(nameSpace.getString().getCString());

char* nameSpaceCopy = strdup(nameSpace.getString().getCStringUTF8());

#if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \

defined(PEGASUS_OS_HPUX) || \

defined(PEGASUS_OS_LINUX)

Line 570

Line 859

for (const char* p = strtok(nameSpaceCopy, "/"); p; p = strtok(NULL, "/"))

#endif

{

out << "<NAMESPACE NAME=\"" << p << "\"/>\n";

out << LIT("<NAMESPACE NAME=\"") << p << LIT("\"/>\n");

}

delete nameSpaceCopy;

free(nameSpaceCopy);

out << "</LOCALNAMESPACEPATH>\n";

out << LIT("</LOCALNAMESPACEPATH>\n");

}

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

Line 586

Line 875

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

void XmlWriter::appendNameSpacePathElement(

Array<Sint8>& out,

Buffer& out,

const String& host,

const CIMNamespaceName& nameSpace)

{

out << "<NAMESPACEPATH>\n";

out << LIT("<NAMESPACEPATH>\n");

out << "<HOST>" << host << "</HOST>\n";

out << LIT("<HOST>") << host << LIT("</HOST>\n");

appendLocalNameSpacePathElement(out, nameSpace);

out << "</NAMESPACEPATH>\n";

out << LIT("</NAMESPACEPATH>\n");

}

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

Line 607

Line 896

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

void XmlWriter::appendClassNameElement(

Array<Sint8>& out,

Buffer& out,

const CIMName& className)

{

out << "<CLASSNAME NAME=\"" << className << "\"/>\n";

out << LIT("<CLASSNAME NAME=\"") << className << LIT("\"/>\n");

}

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

Line 624

Line 913

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

void XmlWriter::appendInstanceNameElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& instanceName)

{

out << "<INSTANCENAME CLASSNAME=\"" << instanceName.getClassName() << "\">\n";

out << LIT("<INSTANCENAME CLASSNAME=\"");

out << instanceName.getClassName() << LIT("\">\n");

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

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

{

out << "<KEYBINDING NAME=\"" << keyBindings[i].getName() << "\">\n";

out << LIT("<KEYBINDING NAME=\"");

out << keyBindings[i].getName() << LIT("\">\n");

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

{

Line 640

Line 931

appendValueReferenceElement(out, ref, true);

}

else {

out << "<KEYVALUE VALUETYPE=\"";

out << LIT("<KEYVALUE VALUETYPE=\"");

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

out << "\">";

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

// fixed the special character problem - Markus

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

out << "</KEYVALUE>\n";

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

}

out << "</KEYBINDING>\n";

out << LIT("</KEYBINDING>\n");

}

out << "</INSTANCENAME>\n";

out << LIT("</INSTANCENAME>\n");

}

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

Line 663

Line 954

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

void XmlWriter::appendClassPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& classPath)

{

out << "<CLASSPATH>\n";

out << LIT("<CLASSPATH>\n");

appendNameSpacePathElement(out,

classPath.getHost(),

classPath.getNameSpace());

appendClassNameElement(out, classPath.getClassName());

out << "</CLASSPATH>\n";

out << LIT("</CLASSPATH>\n");

}

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

Line 683

Line 974

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

void XmlWriter::appendInstancePathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& instancePath)

{

out << "<INSTANCEPATH>\n";

out << LIT("<INSTANCEPATH>\n");

appendNameSpacePathElement(out,

instancePath.getHost(),

instancePath.getNameSpace());

appendInstanceNameElement(out, instancePath);

out << "</INSTANCEPATH>\n";

out << LIT("</INSTANCEPATH>\n");

}

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

Line 703

Line 994

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

void XmlWriter::appendLocalClassPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& classPath)

{

out << "<LOCALCLASSPATH>\n";

out << LIT("<LOCALCLASSPATH>\n");

appendLocalNameSpacePathElement(out, classPath.getNameSpace());

appendClassNameElement(out, classPath.getClassName());

out << "</LOCALCLASSPATH>\n";

out << LIT("</LOCALCLASSPATH>\n");

}

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

Line 721

Line 1012

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

void XmlWriter::appendLocalInstancePathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& instancePath)

{

out << "<LOCALINSTANCEPATH>\n";

out << LIT("<LOCALINSTANCEPATH>\n");

appendLocalNameSpacePathElement(out, instancePath.getNameSpace());

appendInstanceNameElement(out, instancePath);

out << "</LOCALINSTANCEPATH>\n";

out << LIT("</LOCALINSTANCEPATH>\n");

}

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

Line 740

Line 1031

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

void XmlWriter::appendLocalObjectPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& objectPath)

{

Line 765

Line 1056

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

inline void _appendValue(Array<Sint8>& out, Boolean x)

inline void _xmlWritter_appendValue(Buffer& out, Boolean x)

{

XmlWriter::append(out, x);

}

inline void _appendValue(Array<Sint8>& out, Uint8 x)

inline void _xmlWritter_appendValue(Buffer& out, Uint8 x)

{

XmlWriter::append(out, Uint32(x));

}

inline void _appendValue(Array<Sint8>& out, Sint8 x)

inline void _xmlWritter_appendValue(Buffer& out, Sint8 x)

{

XmlWriter::append(out, Sint32(x));

}

inline void _appendValue(Array<Sint8>& out, Uint16 x)

inline void _xmlWritter_appendValue(Buffer& out, Uint16 x)

{

XmlWriter::append(out, Uint32(x));

}

inline void _appendValue(Array<Sint8>& out, Sint16 x)

inline void _xmlWritter_appendValue(Buffer& out, Sint16 x)

{

XmlWriter::append(out, Sint32(x));

}

inline void _appendValue(Array<Sint8>& out, Uint32 x)

inline void _xmlWritter_appendValue(Buffer& out, Uint32 x)

{

XmlWriter::append(out, x);

}

inline void _appendValue(Array<Sint8>& out, Sint32 x)

inline void _xmlWritter_appendValue(Buffer& out, Sint32 x)

{

XmlWriter::append(out, x);

}

inline void _appendValue(Array<Sint8>& out, Uint64 x)

inline void _xmlWritter_appendValue(Buffer& out, Uint64 x)

{

XmlWriter::append(out, x);

}

inline void _appendValue(Array<Sint8>& out, Sint64 x)

inline void _xmlWritter_appendValue(Buffer& out, Sint64 x)

{

XmlWriter::append(out, x);

}

inline void _appendValue(Array<Sint8>& out, Real32 x)

inline void _xmlWritter_appendValue(Buffer& out, Real32 x)

{

XmlWriter::append(out, Real64(x));

XmlWriter::append(out, x);

}

inline void _appendValue(Array<Sint8>& out, Real64 x)

inline void _xmlWritter_appendValue(Buffer& out, Real64 x)

{

XmlWriter::append(out, x);

}

inline void _appendValue(Array<Sint8>& out, const Char16& x)

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

{

XmlWriter::appendSpecial(out, x);

}

inline void _appendValue(Array<Sint8>& out, const String& x)

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

{

XmlWriter::appendSpecial(out, x);

}

inline void _appendValue(Array<Sint8>& out, const CIMDateTime& x)

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

{

out << x.toString(); //ATTN: append() method?

}

inline void _appendValue(Array<Sint8>& out, const CIMObjectPath& x)

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

{

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

}

void _appendValueArray(Array<Sint8>& out, const CIMObjectPath* p, Uint32 size)

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

{

String myStr = x.toString();

_xmlWritter_appendValue(out, myStr);

}

void _xmlWritter_appendValueArray(Buffer& out, const CIMObjectPath* p, Uint32 size)

{

out << "<VALUE.REFARRAY>\n";

out << LIT("<VALUE.REFARRAY>\n");

while (size--)

{

_appendValue(out, *p++);

_xmlWritter_appendValue(out, *p++);

}

out << "</VALUE.REFARRAY>\n";

out << LIT("</VALUE.REFARRAY>\n");

}

template<class T>

void _appendValueArray(Array<Sint8>& out, const T* p, Uint32 size)

void _xmlWritter_appendValueArray(Buffer& out, const T* p, Uint32 size)

{

out << "<VALUE.ARRAY>\n";

out << LIT("<VALUE.ARRAY>\n");

while (size--)

{

out << "<VALUE>";

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

_appendValue(out, *p++);

_xmlWritter_appendValue(out, *p++);

out << "</VALUE>\n";

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

}

out << "</VALUE.ARRAY>\n";

out << LIT("</VALUE.ARRAY>\n");

}

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

Line 879

Line 1176

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

void XmlWriter::appendValueElement(

Array<Sint8>& out,

Buffer& out,

const CIMValue& value)

{

if (value.isNull())

Line 894

Line 1191

{

Array<Boolean> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 902

Line 1199

{

Array<Uint8> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 910

Line 1207

{

Array<Sint8> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 918

Line 1215

{

Array<Uint16> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 926

Line 1223

{

Array<Sint16> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 934

Line 1231

{

Array<Uint32> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 942

Line 1239

{

Array<Sint32> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 950

Line 1247

{

Array<Uint64> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 958

Line 1255

{

Array<Sint64> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 966

Line 1263

{

Array<Real32> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 974

Line 1271

{

Array<Real64> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 982

Line 1279

{

Array<Char16> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 990

Line 1287

{

Array<String> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 998

Line 1295

{

Array<CIMDateTime> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 1006

Line 1303

{

Array<CIMObjectPath> a;

value.get(a);

_appendValueArray(out, a.getData(), a.size());

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

case CIMTYPE_OBJECT:

{

Array<CIMObject> a;

value.get(a);

_xmlWritter_appendValueArray(out, a.getData(), a.size());

break;

}

Line 1019

Line 1324

// Has to be separate because it uses VALUE.REFERENCE tag

CIMObjectPath v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

}

else

{

out << "<VALUE>";

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

switch (value.getType())

{

Line 1031

Line 1336

{

Boolean v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1039

Line 1344

{

Uint8 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1047

Line 1352

{

Sint8 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1055

Line 1360

{

Uint16 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1063

Line 1368

{

Sint16 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1071

Line 1376

{

Uint32 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1079

Line 1384

{

Sint32 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1087

Line 1392

{

Uint64 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1095

Line 1400

{

Sint64 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1103

Line 1408

{

Real32 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1111

Line 1416

{

Real64 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1119

Line 1424

{

Char16 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1127

Line 1432

{

String v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1135

Line 1440

{

CIMDateTime v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

case CIMTYPE_OBJECT:

{

CIMObject v;

value.get(v);

_xmlWritter_appendValue(out, v);

break;

}

Line 1143

Line 1456

PEGASUS_ASSERT(false);

}

out << "</VALUE>\n";

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

}

Line 1151

Line 1464

const CIMValue& value,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendValueElement(tmp, value);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1167

Line 1480

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

void XmlWriter::appendValueObjectWithPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObject& objectWithPath)

{

out << "<VALUE.OBJECTWITHPATH>\n";

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

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

appendObjectElement(out, objectWithPath);

out << "</VALUE.OBJECTWITHPATH>\n";

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

}

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

Line 1189

Line 1502

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

void XmlWriter::appendValueReferenceElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& reference,

Boolean putValueWrapper)

{

if (putValueWrapper)

out << "<VALUE.REFERENCE>\n";

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

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

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

Line 1239

Line 1552

}

if (putValueWrapper)

out << "</VALUE.REFERENCE>\n";

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

}

void XmlWriter::printValueReferenceElement(

const CIMObjectPath& reference,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendValueReferenceElement(tmp, reference, true);

tmp.append('\0');

indentedPrint(os, tmp.getData());

Line 1261

Line 1574

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

void XmlWriter::appendValueNamedInstanceElement(

Array<Sint8>& out,

Buffer& out,

const CIMInstance& namedInstance)

{

out << "<VALUE.NAMEDINSTANCE>\n";

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

appendInstanceNameElement(out, namedInstance.getPath ());

appendInstanceElement(out, namedInstance);

out << "</VALUE.NAMEDINSTANCE>\n";

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

}

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

Line 1285

Line 1598

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

void XmlWriter::appendClassElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstClass& cimclass)

{

cimclass._checkRep();

Line 1296

Line 1609

const CIMConstClass& cimclass,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendClassElement(tmp, cimclass);

tmp.append('\0');

indentedPrint(os, tmp.getData(), 4);

Line 1314

Line 1627

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

void XmlWriter::appendInstanceElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstInstance& instance)

{

instance._checkRep();

Line 1325

Line 1638

const CIMConstInstance& instance,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendInstanceElement(tmp, instance);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1340

Line 1653

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

void XmlWriter::appendObjectElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstObject& object)

{

if (object.isClass())

Line 1385

Line 1698

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

void XmlWriter::appendPropertyElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstProperty& property)

{

property._checkRep();

Line 1396

Line 1709

const CIMConstProperty& property,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendPropertyElement(tmp, property);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1417

Line 1730

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

void XmlWriter::appendMethodElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstMethod& method)

{

method._checkRep();

Line 1428

Line 1741

const CIMConstMethod& method,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendMethodElement(tmp, method);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1463

Line 1776

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

void XmlWriter::appendParameterElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstParameter& parameter)

{

parameter._checkRep();

Line 1474

Line 1787

const CIMConstParameter& parameter,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendParameterElement(tmp, parameter);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1491

Line 1804

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

void XmlWriter::appendParamValueElement(

Array<Sint8>& out,

Buffer& out,

const CIMParamValue& paramValue)

{

paramValue._checkRep();

Line 1502

Line 1815

const CIMParamValue& paramValue,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendParamValueElement(tmp, paramValue);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1522

Line 1835

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

void XmlWriter::appendQualifierElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstQualifier& qualifier)

{

qualifier._checkRep();

Line 1533

Line 1846

const CIMConstQualifier& qualifier,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendQualifierElement(tmp, qualifier);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1554

Line 1867

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

void XmlWriter::appendQualifierDeclElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstQualifierDecl& qualifierDecl)

{

qualifierDecl._checkRep();

Line 1565

Line 1878

const CIMConstQualifierDecl& qualifierDecl,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendQualifierDeclElement(tmp, qualifierDecl);

tmp.append('\0');

os << tmp.getData() << PEGASUS_STD(endl);

Line 1583

Line 1896

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

void XmlWriter::appendQualifierFlavorEntity(

Array<Sint8>& out,

Buffer& out,

const CIMFlavor & flavor)

{

if (!(flavor.hasFlavor (CIMFlavor::OVERRIDABLE)))

out << " OVERRIDABLE=\"false\"";

out << LIT(" OVERRIDABLE=\"false\"");

if (!(flavor.hasFlavor (CIMFlavor::TOSUBCLASS)))

out << " TOSUBCLASS=\"false\"";

out << LIT(" TOSUBCLASS=\"false\"");

if (flavor.hasFlavor (CIMFlavor::TOINSTANCE))

out << " TOINSTANCE=\"true\"";

out << LIT(" TOINSTANCE=\"true\"");

if (flavor.hasFlavor (CIMFlavor::TRANSLATABLE))

out << " TRANSLATABLE=\"true\"";

out << LIT(" TRANSLATABLE=\"true\"");

}

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

Line 1616

Line 1929

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

void XmlWriter::appendScopeElement(

Array<Sint8>& out,

Buffer& out,

const CIMScope & scope)

{

if (!(scope.equal (CIMScope ())))

{

out << "<SCOPE";

out << LIT("<SCOPE");

if (scope.hasScope (CIMScope::CLASS))

out << " CLASS=\"true\"";

out << LIT(" CLASS=\"true\"");

if (scope.hasScope (CIMScope::ASSOCIATION))

out << " ASSOCIATION=\"true\"";

out << LIT(" ASSOCIATION=\"true\"");

if (scope.hasScope (CIMScope::REFERENCE))

out << " REFERENCE=\"true\"";

out << LIT(" REFERENCE=\"true\"");

if (scope.hasScope (CIMScope::PROPERTY))

out << " PROPERTY=\"true\"";

out << LIT(" PROPERTY=\"true\"");

if (scope.hasScope (CIMScope::METHOD))

out << " METHOD=\"true\"";

out << LIT(" METHOD=\"true\"");

if (scope.hasScope (CIMScope::PARAMETER))

out << " PARAMETER=\"true\"";

out << LIT(" PARAMETER=\"true\"");

if (scope.hasScope (CIMScope::INDICATION))

out << " INDICATION=\"true\"";

out << LIT(" INDICATION=\"true\"");

out << "/>";

out << LIT("/>");

}

Line 1660

Line 1973

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

void XmlWriter::appendMethodCallHeader(

Array<Sint8>& out,

Buffer& out,

const char* host,

const CIMName& cimMethod,

const String& cimObject,

Line 1678

Line 1991

// do that in client today. Permanent change is to retry until spec

// updated. This change is temp to finish tests or until the retry

// installed. Required because of change to wbemservices cimom

#if defined PEGASUS_SNIA_INTEROP_TEST || defined PEGASUS_FORCE_POST_METHOD

out << "POST /cimom HTTP/1.1\r\n";

#else

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "M-POST /cimom HTTP/1.1\r\n";

out << LIT("M-POST /cimom HTTP/1.1\r\n");

}

else

{

out << "POST /cimom HTTP/1.1\r\n";

out << LIT("POST /cimom HTTP/1.1\r\n");

}

#endif

out << LIT("HOST: ") << host << LIT("\r\n");

out << "HOST: " << host << "\r\n";

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

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

OUTPUT_CONTENTLENGTH;

out << "Content-Length: " << contentLength << "\r\n";

if (acceptLanguages.size() > 0)

{

out << "Accept-Language: " << acceptLanguages << "\r\n";

out << LIT("Accept-Language: ") << acceptLanguages << LIT("\r\n");

}

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");

}

#ifdef PEGASUS_DEBUG

// backdoor environment variable to turn OFF client requesting transfer

// encoding. The default is on. to turn off, set this variable to zero.

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

// a debugging/testing environment.

static const char *clientTransferEncodingOff =

getenv("PEGASUS_HTTP_TRANSFER_ENCODING_REQUEST");

if (!clientTransferEncodingOff || *clientTransferEncodingOff != '0')

#endif

out << LIT("TE: chunked, trailers\r\n");

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=";

out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");

out << nn <<"\r\n";

out << nn << LIT("\r\n");

out << nn << "-CIMOperation: MethodCall\r\n";

out << nn << LIT("-CIMOperation: MethodCall\r\n");

out << nn << "-CIMMethod: "

out << nn << LIT("-CIMMethod: ")

<< encodeURICharacters(cimMethod.getString()) << "\r\n";

<< encodeURICharacters(cimMethod.getString()) << LIT("\r\n");

out << nn << "-CIMObject: " << encodeURICharacters(cimObject) << "\r\n";

out << nn << LIT("-CIMObject: ") << encodeURICharacters(cimObject)

<< LIT("\r\n");

}

else

{

out << "CIMOperation: MethodCall\r\n";

out << LIT("CIMOperation: MethodCall\r\n");

out << "CIMMethod: " << encodeURICharacters(cimMethod.getString())

out << LIT("CIMMethod: ") << encodeURICharacters(cimMethod.getString())

<< "\r\n";

<< LIT("\r\n");

out << "CIMObject: " << encodeURICharacters(cimObject) << "\r\n";

out << LIT("CIMObject: ") << encodeURICharacters(cimObject)

<< LIT("\r\n");

}

if (authenticationHeader.size())

{

out << authenticationHeader << "\r\n";

out << authenticationHeader << LIT("\r\n");

}

out << "\r\n";

}

out << LIT("\r\n");

}

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

// appendMethodResponseHeader()

// Build HTTP response header.

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

void XmlWriter::appendMethodResponseHeader(

Array<Sint8>& out,

Buffer& out,

HttpMethod httpMethod,

const ContentLanguages & contentLanguages,

Uint32 contentLength)

Uint32 contentLength,

Uint32 serverResponseTime)

{

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

out << LIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");

out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n";

STAT_SERVERTIME

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

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

out << "Content-Length: " << contentLength << "\r\n";

OUTPUT_CONTENTLENGTH;

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");

}

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Ext:\r\n";

out << LIT("Ext:\r\n");

out << "Cache-Control: no-cache\r\n";

out << LIT("Cache-Control: no-cache\r\n");

out << "Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=";

out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");

out << nn <<"\r\n";

out << nn << LIT("\r\n");

out << nn << "-CIMOperation: MethodResponse\r\n\r\n";

out << nn << LIT("-CIMOperation: MethodResponse\r\n\r\n");

}

else

{

out << "CIMOperation: MethodResponse\r\n\r\n";

out << LIT("CIMOperation: MethodResponse\r\n\r\n");

}

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

// appendHttpErrorResponseHeader()

Line 1779

Line 2099

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

void XmlWriter::appendHttpErrorResponseHeader(

Array<Sint8>& out,

Buffer& out,

const String& status,

const String& cimError,

const String& errorDetail)

{

out << "HTTP/1.1 " << status << "\r\n";

out << LIT("HTTP/1.1 ") << status << LIT("\r\n");

if (cimError != String::EMPTY)

{

out << "CIMError: " << cimError << "\r\n";

out << LIT("CIMError: ") << cimError << LIT("\r\n");

}

if (errorDetail != String::EMPTY)

{

// ATTN-RK-P3-20020404: It is critical that this text not contain '\n'

// ATTN-RK-P3-20020404: Need to encode this value properly. (See

// CIM/HTTP Specification section 3.3.2

out << PEGASUS_HTTPHEADERTAG_ERRORDETAIL ": "

out << LIT(PEGASUS_HTTPHEADERTAG_ERRORDETAIL ": ")

<< encodeURICharacters(errorDetail) << "\r\n";

<< encodeURICharacters(errorDetail) << LIT("\r\n");

}

out << "\r\n";

out << LIT("\r\n");

}

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

Line 1820

Line 2140

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

void XmlWriter::appendUnauthorizedResponseHeader(

Array<Sint8>& out,

Buffer& out,

const String& content)

{

out << "HTTP/1.1 " HTTP_STATUS_UNAUTHORIZED "\r\n";

out << LIT("HTTP/1.1 " HTTP_STATUS_UNAUTHORIZED "\r\n");

out << content << "\r\n";

out << content << LIT("\r\n");

out << "\r\n";

out << LIT("\r\n");

//ATTN: We may need to include the following line, so that the browsers

// can display the error message.

Line 1847

Line 2167

// Returns OK message in the following format:

// HTTP/1.1 200 OK

// Content-Length: 0

// WWW-Authenticate: Negotiate "token"

// <HTML><HEAD>

// <TITLE>200 OK</TITLE>

Line 1858

Line 2179

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

void XmlWriter::appendOKResponseHeader(

Array<Sint8>& out,

Buffer& out,

const String& content)

{

out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n";

out << LIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");

out << content << "\r\n";

// Content-Length header needs to be added because 200 OK record

out << "\r\n";

// is usually intended to have content. But, for Kerberos this

// may not always be the case so we need to indicate that there

// is no content

Uint32 contentLength = 0;

OUTPUT_CONTENTLENGTH;

out << content << LIT("\r\n");

out << LIT("\r\n");

//ATTN: We may need to include the following line, so that the browsers

// can display the error message.

Line 1889

Line 2216

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

void XmlWriter::_appendMessageElementBegin(

Array<Sint8>& out,

Buffer& out,

const String& messageId)

{

out << "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n";

out << LIT("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n");

out << "<CIM CIMVERSION=\"2.0\" DTDVERSION=\"2.0\">\n";

out << LIT("<CIM CIMVERSION=\"2.0\" DTDVERSION=\"2.0\">\n");

out << "<MESSAGE ID=\"" << messageId << "\" PROTOCOLVERSION=\"1.0\">\n";

out << LIT("<MESSAGE ID=\"") << messageId;

out << LIT("\" PROTOCOLVERSION=\"1.0\">\n");

}

void XmlWriter::_appendMessageElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</MESSAGE>\n";

out << LIT("</MESSAGE>\n");

out << "</CIM>\n";

out << LIT("</CIM>\n");

}

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

Line 1914

Line 2242

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

void XmlWriter::_appendSimpleReqElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLEREQ>\n";

out << LIT("<SIMPLEREQ>\n");

}

void XmlWriter::_appendSimpleReqElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</SIMPLEREQ>\n";

out << LIT("</SIMPLEREQ>\n");

}

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

Line 1936

Line 2264

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

void XmlWriter::_appendMethodCallElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

out << "<METHODCALL NAME=\"" << name << "\">\n";

out << LIT("<METHODCALL NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendMethodCallElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</METHODCALL>\n";

out << LIT("</METHODCALL>\n");

}

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

Line 1959

Line 2287

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

void XmlWriter::_appendIMethodCallElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

out << "<IMETHODCALL NAME=\"" << name << "\">\n";

out << LIT("<IMETHODCALL NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendIMethodCallElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</IMETHODCALL>\n";

out << LIT("</IMETHODCALL>\n");

}

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

Line 1984

Line 2312

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

void XmlWriter::_appendIParamValueElementBegin(

Array<Sint8>& out,

Buffer& out,

const char* name)

{

out << "<IPARAMVALUE NAME=\"" << name << "\">\n";

out << LIT("<IPARAMVALUE NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendIParamValueElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</IPARAMVALUE>\n";

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

}

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

Line 2006

Line 2334

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

void XmlWriter::_appendSimpleRspElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLERSP>\n";

out << LIT("<SIMPLERSP>\n");

}

void XmlWriter::_appendSimpleRspElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</SIMPLERSP>\n";

out << LIT("</SIMPLERSP>\n");

}

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

Line 2028

Line 2356

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

void XmlWriter::_appendMethodResponseElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

out << "<METHODRESPONSE NAME=\"" << name << "\">\n";

out << LIT("<METHODRESPONSE NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendMethodResponseElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</METHODRESPONSE>\n";

out << LIT("</METHODRESPONSE>\n");

}

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

Line 2051

Line 2379

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

void XmlWriter::_appendIMethodResponseElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

out << "<IMETHODRESPONSE NAME=\"" << name << "\">\n";

out << LIT("<IMETHODRESPONSE NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendIMethodResponseElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</IMETHODRESPONSE>\n";

out << LIT("</IMETHODRESPONSE>\n");

}

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

Line 2070

Line 2398

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

void XmlWriter::_appendErrorElement(

Array<Sint8>& out,

Buffer& out,

const CIMException& cimException)

{

Tracer::traceCIMException(TRC_XML_WRITER, Tracer::LEVEL2, cimException);

out << "<ERROR";

out << LIT("<ERROR");

out << " CODE=\"" << Uint32(cimException.getCode()) << "\"";

out << LIT(" CODE=\"") << Uint32(cimException.getCode());

out.append('"');

String description = TraceableCIMException(cimException).getDescription();

if (description != String::EMPTY)

{

out << " DESCRIPTION=\"";

out << LIT(" DESCRIPTION=\"");

appendSpecial(out, description);

out << "\"";

out.append('"');

}

out << "/>";

out << LIT("/>");

}

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

Line 2093

Line 2422

// <!ELEMENT RETURNVALUE (VALUE|VALUE.REFERENCE)>

// <!ATTLIST RETURNVALUE

// %EmbeddedObject; #IMPLIED

// %ParamType;>

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

void XmlWriter::appendReturnValueElement(

Array<Sint8>& out,

Buffer& out,

const CIMValue& value)

{

out << "<RETURNVALUE";

out << LIT("<RETURNVALUE");

CIMType type = value.getType();

out << " PARAMTYPE=\"" << cimTypeToString (type) << "\"";

// If the property type is CIMObject, then

// encode the property in CIM-XML as a string with the EMBEDDEDOBJECT attribute

// (there is not currently a CIM-XML "object" datatype)

// else

// output the real type

if (type == CIMTYPE_OBJECT)

{

out << LIT(" PARAMTYPE=\"string\"");

out << LIT(" EMBEDDEDOBJECT=\"object\"");

}

else

{

out << LIT(" PARAMTYPE=\"") << cimTypeToString (type);

out.append('"');

}

out << ">\n";

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

// Add value.

appendValueElement(out, value);

out << "</RETURNVALUE>\n";

out << LIT("</RETURNVALUE>\n");

}

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

Line 2126

Line 2470

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

void XmlWriter::_appendIReturnValueElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<IRETURNVALUE>\n";

out << LIT("<IRETURNVALUE>\n");

}

void XmlWriter::_appendIReturnValueElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</IRETURNVALUE>\n";

out << LIT("</IRETURNVALUE>\n");

}

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

Line 2144

Line 2488

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

void XmlWriter::appendBooleanIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

Boolean flag)

{

_appendIParamValueElementBegin(out, name);

out << "<VALUE>";

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

append(out, flag);

out << "</VALUE>\n";

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

_appendIParamValueElementEnd(out);

}

Line 2162

Line 2506

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

void XmlWriter::appendStringIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const String& str)

{

_appendIParamValueElementBegin(out, name);

out << "<VALUE>";

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

appendSpecial(out, str);

out << "</VALUE>\n";

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

_appendIParamValueElementEnd(out);

}

Line 2180

Line 2524

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

void XmlWriter::appendQualifierNameIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const String& qualifierName)

{

Line 2204

Line 2548

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

void XmlWriter::appendClassNameIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMName& className)

{

Line 2229

Line 2573

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

void XmlWriter::appendInstanceNameIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMObjectPath& instanceName)

{

Line 2239

Line 2583

}

void XmlWriter::appendObjectNameIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMObjectPath& objectName)

{

Line 2268

Line 2612

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

void XmlWriter::appendClassIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMConstClass& cimClass)

{

Line 2284

Line 2628

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

void XmlWriter::appendInstanceIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMConstInstance& instance)

{

Line 2300

Line 2644

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

void XmlWriter::appendNamedInstanceIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMInstance& namedInstance)

{

Line 2319

Line 2663

// USE: Create parameter for getProperty operation

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

void XmlWriter::appendPropertyNameIParameter(

Array<Sint8>& out,

Buffer& out,

const CIMName& propertyName)

{

_appendIParamValueElementBegin(out, "PropertyName");

out << "<VALUE>" << propertyName << "</VALUE>\n";

out << LIT("<VALUE>") << propertyName << LIT("</VALUE>\n");

_appendIParamValueElementEnd(out);

}

Line 2334

Line 2678

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

void XmlWriter::appendPropertyValueIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMValue& value)

{

Line 2350

Line 2694

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

void XmlWriter::appendPropertyListIParameter(

Array<Sint8>& out,

Buffer& out,

const CIMPropertyList& propertyList)

{

_appendIParamValueElementBegin(out, "PropertyList");

Line 2361

Line 2705

if (!propertyList.isNull ())

{

out << "<VALUE.ARRAY>\n";

out << LIT("<VALUE.ARRAY>\n");

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

{

out << "<VALUE>" << propertyList[i] << "</VALUE>\n";

out << LIT("<VALUE>") << propertyList[i] << LIT("</VALUE>\n");

}

out << "</VALUE.ARRAY>\n";

out << LIT("</VALUE.ARRAY>\n");

}

_appendIParamValueElementEnd(out);

Line 2379

Line 2723

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

void XmlWriter::appendQualifierDeclarationIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMConstQualifierDecl& qualifierDecl)

{

Line 2394

Line 2738

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

Array<Sint8> XmlWriter::formatHttpErrorRspMessage(

Buffer XmlWriter::formatHttpErrorRspMessage(

const String& status,

const String& cimError,

const String& errorDetail)

{

Array<Sint8> out;

Buffer out;

appendHttpErrorResponseHeader(out, status, cimError, errorDetail);

Line 2415

Line 2759

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

// ATTN-RK-P1-20020228: Need to complete copy elimination optimization

Array<Sint8> XmlWriter::formatSimpleMethodReqMessage(

Buffer XmlWriter::formatSimpleMethodReqMessage(

const char* host,

const CIMNamespaceName& nameSpace,

const CIMObjectPath& path,

Line 2427

Line 2771

const AcceptLanguages& httpAcceptLanguages,

const ContentLanguages& httpContentLanguages)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

CIMObjectPath localObjectPath = path;

localObjectPath.setNameSpace(nameSpace.getString());

localObjectPath.setHost(String::EMPTY);

Line 2460

Line 2804

return tmp;

}

Array<Sint8> XmlWriter::formatSimpleMethodRspMessage(

//PEP 128 adding serverRsponseTime to header

Buffer XmlWriter::formatSimpleMethodRspMessage(

const CIMName& methodName,

const String& messageId,

HttpMethod httpMethod,

const ContentLanguages & httpContentLanguages,

const Array<Sint8>& body)

const Buffer& body,

{

Uint32 serverResponseTime,

Array<Sint8> out;

Boolean isFirst,

Array<Sint8> tmp;

Boolean isLast)

{

Buffer out;

if (isFirst == true)

{

// NOTE: temporarily put zero for content length. the http code

// will later decide to fill in the length or remove it altogether

appendMethodResponseHeader(out, httpMethod, httpContentLanguages, 0,

serverResponseTime);

_appendMessageElementBegin(out, messageId);

_appendSimpleRspElementBegin(out);

_appendMethodResponseElementBegin(out, methodName);

}

if (body.size() != 0)

{

out << body;

}

if (isLast == true)

{

_appendMethodResponseElementEnd(out);

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

}

appendMethodResponseHeader(tmp,

return out;

httpMethod,

httpContentLanguages,

out.size());

tmp << out;

return tmp;

}

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

// XmlWriter::formatSimpleMethodErrorRspMessage()

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

Array<Sint8> XmlWriter::formatSimpleMethodErrorRspMessage(

Buffer XmlWriter::formatSimpleMethodErrorRspMessage(

const CIMName& methodName,

const String& messageId,

HttpMethod httpMethod,

const CIMException& cimException)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleRspElementBegin(out);

Line 2526

Line 2884

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

Array<Sint8> XmlWriter::formatSimpleIMethodReqMessage(

Buffer XmlWriter::formatSimpleIMethodReqMessage(

const char* host,

const CIMNamespaceName& nameSpace,

const CIMName& iMethodName,

Line 2535

Line 2893

const String& authenticationHeader,

const AcceptLanguages& httpAcceptLanguages,

const ContentLanguages& httpContentLanguages,

const Array<Sint8>& body)

const Buffer& body)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleReqElementBegin(out);

Line 2570

Line 2928

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

Array<Sint8> XmlWriter::formatSimpleIMethodRspMessage(

Buffer XmlWriter::formatSimpleIMethodRspMessage(

const CIMName& iMethodName,

const String& messageId,

HttpMethod httpMethod,

const ContentLanguages & httpContentLanguages,

const Array<Sint8>& body)

const Buffer& body,

{

Uint32 serverResponseTime,

Array<Sint8> out;

Boolean isFirst,

Array<Sint8> tmp;

Boolean isLast)

{

Buffer out;

if (isFirst == true)

{

// NOTE: temporarily put zero for content length. the http code

// will later decide to fill in the length or remove it altogether

appendMethodResponseHeader(out, httpMethod, httpContentLanguages, 0,

serverResponseTime);

_appendMessageElementBegin(out, messageId);

_appendSimpleRspElementBegin(out);

_appendIMethodResponseElementBegin(out, iMethodName);

// output the start of the return tag. Test if there is response data by:

// 1. there is data on the first chunk OR

// 2. there is no data on the first chunk but isLast is false implying

// there is more non-empty data to come. If all subsequent chunks

// are empty, then this generates and empty response.

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

_appendIReturnValueElementBegin(out);

}

if (body.size() != 0)

{

_appendIReturnValueElementBegin(out);

out << body;

_appendIReturnValueElementEnd(out);

}

if (isLast == true)

{

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

_appendIReturnValueElementEnd(out);

_appendIMethodResponseElementEnd(out);

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

}

appendMethodResponseHeader(tmp,

return out;

httpMethod,

httpContentLanguages,

out.size());

tmp << out;

return tmp;

}

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

// XmlWriter::formatSimpleIMethodErrorRspMessage()

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

Array<Sint8> XmlWriter::formatSimpleIMethodErrorRspMessage(

Buffer XmlWriter::formatSimpleIMethodErrorRspMessage(

const CIMName& iMethodName,

const String& messageId,

HttpMethod httpMethod,

const CIMException& cimException)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleRspElementBegin(out);

Line 2650

Line 3025

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

void XmlWriter::appendEMethodRequestHeader(

Array<Sint8>& out,

Buffer& out,

const char* requestUri,

const char* host,

const CIMName& cimMethod,

Line 2664

Line 3039

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "M-POST " << requestUri << " HTTP/1.1\r\n";

out << LIT("M-POST ") << requestUri << LIT(" HTTP/1.1\r\n");

}

else

{

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

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

}

out << "HOST: " << host << "\r\n";

out << LIT("HOST: ") << host << LIT("\r\n");

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

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

out << "Content-Length: " << contentLength << "\r\n";

OUTPUT_CONTENTLENGTH;

if (acceptLanguages.size() > 0)

{

out << "Accept-Language: " << acceptLanguages << "\r\n";

out << LIT("Accept-Language: ") << acceptLanguages << LIT("\r\n");

}

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");

}

#ifdef PEGASUS_DEBUG

// backdoor environment variable to turn OFF client requesting transfer

// encoding. The default is on. to turn off, set this variable to zero.

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

// a debugging/testing environment.

static const char *clientTransferEncodingOff =

getenv("PEGASUS_HTTP_TRANSFER_ENCODING_REQUEST");

if (!clientTransferEncodingOff || *clientTransferEncodingOff != '0')

#endif

out << LIT("TE: chunked, trailers\r\n");

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Man: http://www.hp.com; ns=";

out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");

out << nn <<"\r\n";

out << nn << LIT("\r\n");

out << nn << "-CIMExport: MethodRequest\r\n";

out << nn << LIT("-CIMExport: MethodRequest\r\n");

out << nn << "-CIMExportMethod: " << cimMethod << "\r\n";

out << nn << LIT("-CIMExportMethod: ") << cimMethod << LIT("\r\n");

}

else

{

out << "CIMExport: MethodRequest\r\n";

out << LIT("CIMExport: MethodRequest\r\n");

out << "CIMExportMethod: " << cimMethod << "\r\n";

out << LIT("CIMExportMethod: ") << cimMethod << LIT("\r\n");

}

if (authenticationHeader.size())

{

out << authenticationHeader << "\r\n";

out << authenticationHeader << LIT("\r\n");

}

out << "\r\n";

out << LIT("\r\n");

}

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

Line 2710

Line 3100

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

void XmlWriter::appendEMethodResponseHeader(

Array<Sint8>& out,

Buffer& out,

HttpMethod httpMethod,

const ContentLanguages& contentLanguages,

Uint32 contentLength)

{

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

out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n";

out << LIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");

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

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

out << "Content-Length: " << contentLength << "\r\n";

OUTPUT_CONTENTLENGTH;

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");

}

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Ext:\r\n";

out << LIT("Ext:\r\n");

out << "Cache-Control: no-cache\r\n";

out << LIT("Cache-Control: no-cache\r\n");

out << "Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=";

out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");

out << nn <<"\r\n";

out << nn << LIT("\r\n");

out << nn << "-CIMExport: MethodResponse\r\n\r\n";

out << nn << LIT("-CIMExport: MethodResponse\r\n\r\n");

}

else

{

out << "CIMExport: MethodResponse\r\n\r\n";

out << LIT("CIMExport: MethodResponse\r\n\r\n");

}

Line 2748

Line 3139

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

void XmlWriter::_appendSimpleExportReqElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLEEXPREQ>\n";

out << LIT("<SIMPLEEXPREQ>\n");

}

void XmlWriter::_appendSimpleExportReqElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</SIMPLEEXPREQ>\n";

out << LIT("</SIMPLEEXPREQ>\n");

}

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

Line 2770

Line 3161

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

void XmlWriter::_appendEMethodCallElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

out << "<EXPMETHODCALL NAME=\"" << name << "\">\n";

out << LIT("<EXPMETHODCALL NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendEMethodCallElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</EXPMETHODCALL>\n";

out << LIT("</EXPMETHODCALL>\n");

}

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

Line 2794

Line 3185

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

void XmlWriter::_appendEParamValueElementBegin(

Array<Sint8>& out,

Buffer& out,

const char* name)

{

out << "<EXPPARAMVALUE NAME=\"" << name << "\">\n";

out << LIT("<EXPPARAMVALUE NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendEParamValueElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</EXPPARAMVALUE>\n";

out << LIT("</EXPPARAMVALUE>\n");

}

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

Line 2813

Line 3204

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

void XmlWriter::appendInstanceEParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMInstance& instance)

{

Line 2832

Line 3223

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

void XmlWriter::_appendSimpleExportRspElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLEEXPRSP>\n";

out << LIT("<SIMPLEEXPRSP>\n");

}

void XmlWriter::_appendSimpleExportRspElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</SIMPLEEXPRSP>\n";

out << LIT("</SIMPLEEXPRSP>\n");

}

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

Line 2854

Line 3245

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

void XmlWriter::_appendEMethodResponseElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

out << "<EXPMETHODRESPONSE NAME=\"" << name << "\">\n";

out << LIT("<EXPMETHODRESPONSE NAME=\"") << name << LIT("\">\n");

}

void XmlWriter::_appendEMethodResponseElementEnd(

Array<Sint8>& out)

Buffer& out)

{

out << "</EXPMETHODRESPONSE>\n";

out << LIT("</EXPMETHODRESPONSE>\n");

}

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

Line 2872

Line 3263

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

Array<Sint8> XmlWriter::formatSimpleEMethodReqMessage(

Buffer XmlWriter::formatSimpleEMethodReqMessage(

const char* requestUri,

const char* host,

const CIMName& eMethodName,

Line 2881

Line 3272

const String& authenticationHeader,

const AcceptLanguages& httpAcceptLanguages,

const ContentLanguages& httpContentLanguages,

const Array<Sint8>& body)

const Buffer& body)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleExportReqElementBegin(out);

Line 2915

Line 3306

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

Array<Sint8> XmlWriter::formatSimpleEMethodRspMessage(

Buffer XmlWriter::formatSimpleEMethodRspMessage(

const CIMName& eMethodName,

const String& messageId,

HttpMethod httpMethod,

const ContentLanguages& httpContentLanguages,

const Array<Sint8>& body)

const Buffer& body)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleExportRspElementBegin(out);

Line 2948

Line 3339

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

Array<Sint8> XmlWriter::formatSimpleEMethodErrorRspMessage(

Buffer XmlWriter::formatSimpleEMethodErrorRspMessage(

const CIMName& eMethodName,

const String& messageId,

HttpMethod httpMethod,

const CIMException& cimException)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleExportRspElementBegin(out);

Line 2977

Line 3368

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

// _printAttributes()

// _xmlWritter_printAttributes()

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

static void _printAttributes(

void _xmlWritter_printAttributes(

PEGASUS_STD(ostream)& os,

const XmlAttribute* attributes,

Uint32 attributeCount)

Line 2991

Line 3382

os << attributes[i].name << "=";

os << '"';

_appendSpecial(os, attributes[i].value);

_xmlWritter_appendSpecial(os, attributes[i].value);

os << '"';

if (i + 1 != attributeCount)

Line 3001

Line 3392

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

// _indent()

// _xmlWritter_indent()

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

static void _indent(PEGASUS_STD(ostream)& os, Uint32 level, Uint32 indentChars)

void _xmlWritter_indent(PEGASUS_STD(ostream)& os, Uint32 level, Uint32 indentChars)

{

Uint32 n = level * indentChars;

Line 3024

Line 3415

const char* text,

Uint32 indentChars)

{

char* tmp = strcpy(new char[strlen(text) + 1], text);

AutoArrayPtr<char> tmp(strcpy(new char[strlen(text) + 1], text));

XmlParser parser(tmp);

XmlParser parser(tmp.get());

XmlEntry entry;

Stack<const char*> stack;

Line 3036

Line 3427

{

case XmlEntry::XML_DECLARATION:

{

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

os << "<?" << entry.text << " ";

_printAttributes(os, entry.attributes, entry.attributeCount);

_xmlWritter_printAttributes(os, entry.attributes, entry.attributeCount);

os << "?>";

break;

}

case XmlEntry::START_TAG:

{

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

os << "<" << entry.text;

if (entry.attributeCount)

os << ' ';

_printAttributes(os, entry.attributes, entry.attributeCount);

_xmlWritter_printAttributes(os, entry.attributes, entry.attributeCount);

os << ">";

stack.push(entry.text);

break;

Line 3061

Line 3452

case XmlEntry::EMPTY_TAG:

{

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

os << "<" << entry.text << " ";

_printAttributes(os, entry.attributes, entry.attributeCount);

_xmlWritter_printAttributes(os, entry.attributes, entry.attributeCount);

os << "/>";

break;

}

Line 3074

Line 3465

if (!stack.isEmpty() && strcmp(stack.top(), entry.text) == 0)

stack.pop();

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

os << "</" << entry.text << ">";

break;

Line 3083

Line 3474

case XmlEntry::COMMENT:

{

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

os << "<!--";

_appendSpecial(os, entry.text);

_xmlWritter_appendSpecial(os, entry.text);

os << "-->";

break;

}

case XmlEntry::CONTENT:

{

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

_appendSpecial(os, entry.text);

_xmlWritter_appendSpecial(os, entry.text);

break;

}

case XmlEntry::CDATA:

{

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

os << "<![CDATA[...]]>";

break;

}

case XmlEntry::DOCTYPE:

{

_indent(os, stack.size(), indentChars);

_xmlWritter_indent(os, stack.size(), indentChars);

os << "<!DOCTYPE...>";

break;

}

Line 3115

Line 3506

os << PEGASUS_STD(endl);

}

delete [] tmp;

}

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

Line 3166

Line 3556

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.95
changed lines
	Added in v.1.124.2.7

No CVS admin address has been configured