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.80 and 1.152

version 1.80, 2002/09/13 21:40:42

version 1.152, 2007/09/03 11:27:02

Line 1

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

//%2006////////////////////////////////////////////////////////////////////////

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

// EMC Corporation; Symantec 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 21

Line 29

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

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

// Modified By: Nitin Upasani, Hewlett-Packard Company (Nitin_Upasani@hp.com)

// Nag Boranna, Hewlett-Packard Company (nagaraja_boranna@hp.com)

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

// Carol Ann Krug Graves, Hewlett-Packard Company

// (carolann_graves@hp.com)

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

#include <Pegasus/Common/Config.h>

#include <cstdlib>

#include <cstdio>

#include "Constants.h"

#include "Destroyer.h"

#include "CIMClass.h"

#include "CIMClassRep.h"

#include "CIMInstance.h"

Line 57

Line 56

#include "XmlParser.h"

#include "Tracer.h"

#include <Pegasus/Common/StatisticalData.h>

#include "CommonUTF.h"

#include "Buffer.h"

#include "StrLit.h"

#include "LanguageParser.h"

#include "IDFactory.h"

#include "StringConversion.h"

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]; \

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

out << STRLIT("content-length: "); \

out.append(contentLengthP, n); \

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

}

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

// SpecialChar and table.

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

// Note: we cannot use StrLit here since it has a constructur (forbits

// structure initialization).

struct SpecialChar

{

const char* str;

Uint32 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[] =

{

{STRLIT_ARGS("")},

{STRLIT_ARGS("	")},

{STRLIT_ARGS("
")},

{STRLIT_ARGS("")},

{STRLIT_ARGS("")},

{STRLIT_ARGS("")},

{STRLIT_ARGS(" ")},

{STRLIT_ARGS("!")},

{STRLIT_ARGS(""")},

{STRLIT_ARGS("#")},

{STRLIT_ARGS("$")},

{STRLIT_ARGS("%")},

{STRLIT_ARGS("&")},

{STRLIT_ARGS("'")},

{STRLIT_ARGS("(")},

{STRLIT_ARGS(")")},

{STRLIT_ARGS("*")},

{STRLIT_ARGS("+")},

{STRLIT_ARGS(",")},

{STRLIT_ARGS("-")},

{STRLIT_ARGS(".")},

{STRLIT_ARGS("/")},

{STRLIT_ARGS("0")},

{STRLIT_ARGS("1")},

{STRLIT_ARGS("2")},

{STRLIT_ARGS("3")},

{STRLIT_ARGS("4")},

{STRLIT_ARGS("5")},

{STRLIT_ARGS("6")},

{STRLIT_ARGS("7")},

{STRLIT_ARGS("8")},

{STRLIT_ARGS("9")},

{STRLIT_ARGS(":")},

{STRLIT_ARGS(";")},

{STRLIT_ARGS("<")},

{STRLIT_ARGS("=")},

{STRLIT_ARGS(">")},

{STRLIT_ARGS("?")},

{STRLIT_ARGS("@")},

{STRLIT_ARGS("A")},

{STRLIT_ARGS("B")},

{STRLIT_ARGS("C")},

{STRLIT_ARGS("D")},

{STRLIT_ARGS("E")},

{STRLIT_ARGS("F")},

{STRLIT_ARGS("G")},

{STRLIT_ARGS("H")},

{STRLIT_ARGS("I")},

{STRLIT_ARGS("J")},

{STRLIT_ARGS("K")},

{STRLIT_ARGS("L")},

{STRLIT_ARGS("M")},

{STRLIT_ARGS("N")},

{STRLIT_ARGS("O")},

{STRLIT_ARGS("P")},

{STRLIT_ARGS("Q")},

{STRLIT_ARGS("R")},

{STRLIT_ARGS("S")},

{STRLIT_ARGS("T")},

{STRLIT_ARGS("U")},

{STRLIT_ARGS("V")},

{STRLIT_ARGS("W")},

{STRLIT_ARGS("X")},

{STRLIT_ARGS("Y")},

{STRLIT_ARGS("Z")},

{STRLIT_ARGS("[")},

{STRLIT_ARGS("\\")},

{STRLIT_ARGS("]")},

{STRLIT_ARGS("^")},

{STRLIT_ARGS("_")},

{STRLIT_ARGS("`")},

{STRLIT_ARGS("a")},

{STRLIT_ARGS("b")},

{STRLIT_ARGS("c")},

{STRLIT_ARGS("d")},

{STRLIT_ARGS("e")},

{STRLIT_ARGS("f")},

{STRLIT_ARGS("g")},

{STRLIT_ARGS("h")},

{STRLIT_ARGS("i")},

{STRLIT_ARGS("j")},

{STRLIT_ARGS("k")},

{STRLIT_ARGS("l")},

{STRLIT_ARGS("m")},

{STRLIT_ARGS("n")},

{STRLIT_ARGS("o")},

{STRLIT_ARGS("p")},

{STRLIT_ARGS("q")},

{STRLIT_ARGS("r")},

{STRLIT_ARGS("s")},

{STRLIT_ARGS("t")},

{STRLIT_ARGS("u")},

{STRLIT_ARGS("v")},

{STRLIT_ARGS("w")},

{STRLIT_ARGS("x")},

{STRLIT_ARGS("y")},

{STRLIT_ARGS("z")},

{STRLIT_ARGS("{")},

{STRLIT_ARGS("|")},

{STRLIT_ARGS("}")},

{STRLIT_ARGS("~")},

{STRLIT_ARGS("")},

};

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

};

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

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

{

XmlWriter::append(out, x);

return out;

}

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

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

{

XmlWriter::append(out, x);

return out;

}

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

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

{

XmlWriter::append(out, x);

return out;

}

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

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

{

XmlWriter::append(out, x);

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

return out;

}

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

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

{

XmlWriter::append(out, x);

return out;

}

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

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

{

out.appendArray(x);

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

return out;

}

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

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

{

XmlWriter::append(out, x);

XmlWriter::append(out, LanguageParser::buildAcceptLanguageHeader(al));

return out;

}

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

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

{

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

XmlWriter::append(out, LanguageParser::buildContentLanguageHeader(cl));

return out;

}

PEGASUS_STD(ostream)& operator<<(PEGASUS_STD(ostream)& os, const CIMDateTime& x)

{

return os << x.toString();

Line 126

Line 312

return os;

}

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

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

{

out.append(Sint8(c));

}

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

{

// ATTN-B: Only UTF-8 handled for now.

switch (c)

{

case '&':

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

out.append("&", 5);

// character into the array.

break;

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

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

// all characters that have surogate pairs.

char str[6];

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

Uint8* charIN = (Uint8 *)&c;

case '<':

const Uint16 *strsrc = (Uint16 *)charIN;

out.append("<", 4);

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

break;

case '>':

Uint8 *strtgt = (Uint8 *)str;

out.append(">", 4);

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

break;

case '"':

UTF16toUTF8(

out.append(""", 6);

&strsrc,

break;

endsrc,

&strtgt,

endtgt);

case '\'':

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

out.append("'", 6);

}

break;

default:

inline void _appendSpecialChar7(Buffer& out, char c)

out.append(Sint8(c));

{

if (_isSpecialChar7[int(c)])

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

else

out.append(c);

}

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

{

if (c < 128)

_appendSpecialChar7(out, char(c));

else

_xmlWritter_appendChar(out, c);

}

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

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

{

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

{

char scratchBuffer[22];

Uint32 outputLength;

const char * output = Uint8ToString(scratchBuffer,

static_cast<Uint8>(c),

outputLength);

os << "&#" << output << ";";

}

else

{

switch (c)

{

Line 190

Line 393

os << c;

}

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

{

char str[6];

Uint8 charIN[5];

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

memcpy(&charIN,&high,2);

memcpy(&charIN[2],&low,2);

const Uint16 *strsrc = (Uint16 *)charIN;

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

Uint8 *strtgt = (Uint8 *)str;

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

UTF16toUTF8(

&strsrc,

endsrc,

&strtgt,

endtgt);

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

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++);

}

// On windows sprintf outputs 3 digit precision exponent prepending

// zeros. Make it 2 digit precision if first digit is zero in the exponent.

#ifdef PEGASUS_OS_TYPE_WINDOWS

inline void _xmlWriter_normalizeRealValueString(char *str)

{

// skip initial sign value...

if (*str == '-' || *str == '+')

{

++str;

}

while (*str && *str != '+' && *str != '-')

{

++str;

}

if (*str && * ++str == '0')

{

*str = *(str+1);

*(str+1) = *(str+2);

*(str+2) = 0;

}

#endif

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"));

if (x)

out.append(STRLIT_ARGS("TRUE"));

else

out.append(STRLIT_ARGS("FALSE"));

}

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

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

{

char buffer[32];

Uint32 outputLength=0;

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

char buffer[22];

append(out, buffer);

const char * output = Uint32ToString(buffer, x, outputLength);

out.append(output, outputLength);

}

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

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

{

char buffer[32];

Uint32 outputLength=0;

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

char buffer[22];

append(out, buffer);

const char * output = Sint32ToString(buffer, x, outputLength);

out.append(output, outputLength);

}

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

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

{

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

Uint32 outputLength=0;

// I know I shouldn't put platform flags here, but the other way is too hard

char buffer[22];

#if defined(PEGASUS_PLATFORM_WIN32_IX86_MSVC)

const char * output = Uint64ToString(buffer, x, outputLength);

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

out.append(output, outputLength);

#else

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

#endif

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

Uint32 outputLength=0;

// I know I shouldn't put platform flags here, but the other way is too hard

char buffer[22];

#if defined(PEGASUS_PLATFORM_WIN32_IX86_MSVC)

const char * output = Sint64ToString(buffer, x, outputLength);

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

out.append(output, outputLength);

#else

}

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

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

{

char buffer[128];

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

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

#ifdef PEGASUS_OS_TYPE_WINDOWS

_xmlWriter_normalizeRealValueString(buffer);

#endif

append(out, buffer);

}

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

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

{

char buffer[128];

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

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

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

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

#ifdef PEGASUS_OS_TYPE_WINDOWS

_xmlWriter_normalizeRealValueString(buffer);

#endif

append(out, buffer);

}

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

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

{

while (*str)

size_t n = strlen(str);

_appendChar(out, *str++);

out.append(str, n);

}

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

{

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)

{

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

p += 8;

n -= 8;

}

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

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

{

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

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;

}

// Handle UTF8 case (if reached).

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

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

{

Char16 highSurrogate = p[-1];

Char16 lowSurrogate = p[0];

p++;

n--;

_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, Char16(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(Buffer& out, const String& str)

{

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

// prevCharIsSpace is true when the last character written to the Buffer

// is a space character (not a character reference).

Boolean prevCharIsSpace = false;

// If the first character is a space, use a character reference to avoid

// space compression.

if (*p == ' ')

{

out.append(STRLIT_ARGS(" "));

p++;

}

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

Uint16 c;

while ((c = *p++) != 0)

{

if (c < 128)

{

if (_isSpecialChar7[c])

{

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

// Write the character reference for the special character

out.append(

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

prevCharIsSpace = false;

}

else if (prevCharIsSpace && (c == ' '))

{

_appendSpecialChar(out, str[i]);

// Write the character reference for the space character, to

// avoid compression

out.append(STRLIT_ARGS(" "));

prevCharIsSpace = false;

}

else

{

out.append(c);

prevCharIsSpace = (c == ' ');

}

else

{

// Handle UTF8 case

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

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

*p)

{

_xmlWritter_appendSurrogatePair(out, c, *p++);

}

else

{

_xmlWritter_appendChar(out, c);

}

prevCharIsSpace = false;

}

// If the last character is a space, use a character reference to avoid

// space compression.

if (prevCharIsSpace)

{

out.remove(out.size() - 1);

out.append(STRLIT_ARGS(" "));

}

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

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

// Excluded characters:

// Control characters = 0x00-0x1f, 0x7f

// Space character = 0x20

// Delimiters = '<' '>' '#' '%' '"'

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

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,

};

// Perform the necessary URI encoding of characters in HTTP header values.

// This is required by the HTTP/1.1 specification and the CIM/HTTP

// Specification (section 3.3.2).

static void _xmlWritter_encodeURIChar(String& outString, Sint8 char8)

{

Uint8 c = (Uint8)char8;

#ifndef PEGASUS_DO_NOT_IMPLEMENT_URI_ENCODING

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

{

char hexencoding[4];

int n = 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

{

outString.append((Uint16)c);

}

String XmlWriter::encodeURICharacters(const Buffer& uriString)

{

String encodedString;

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

{

_xmlWritter_encodeURIChar(encodedString, uriString[i]);

}

return encodedString;

}

String XmlWriter::encodeURICharacters(const String& uriString)

{

String encodedString;

/* i18n remove - did not handle surrogate pairs

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

{

_xmlWritter_encodeURIChar(encodedString, uriString[i]);

}

// See the "CIM Operations over HTTP" spec, section 3.3.2 and

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

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

Buffer utf8;

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

{

Uint16 c = uriString[i];

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

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

{

Char16 highSurrogate = uriString[i];

Char16 lowSurrogate = uriString[++i];

_xmlWritter_appendSurrogatePair(

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

}

else

{

_xmlWritter_appendChar(utf8, uriString[i]);

}

// Second, escape the non HTTP-safe chars

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

{

_xmlWritter_encodeURIChar(encodedString, utf8[i]);

}

return encodedString;

}

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

Line 306

Line 774

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

void XmlWriter::appendLocalNameSpacePathElement(

Array<Sint8>& out,

Buffer& out,

const CIMNamespaceName& nameSpace)

{

out << "<LOCALNAMESPACEPATH>\n";

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

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

#if !defined(PEGASUS_COMPILER_MSVC) && !defined(PEGASUS_OS_ZOS)

char *last;

for (const char* p = strtok_r(nameSpaceCopy, "/", &last); p;

p = strtok_r(NULL, "/", &last))

#else

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

#endif

{

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

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

}

delete nameSpaceCopy;

free(nameSpaceCopy);

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

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

}

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

Line 330

Line 805

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

void XmlWriter::appendNameSpacePathElement(

Array<Sint8>& out,

Buffer& out,

const String& host,

const CIMNamespaceName& nameSpace)

{

out << "<NAMESPACEPATH>\n";

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

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

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

appendLocalNameSpacePathElement(out, nameSpace);

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

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

}

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

Line 351

Line 826

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

void XmlWriter::appendClassNameElement(

Array<Sint8>& out,

Buffer& out,

const CIMName& className)

{

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

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

}

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

Line 368

Line 843

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

void XmlWriter::appendInstanceNameElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& instanceName)

{

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

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

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

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

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

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

{

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

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

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

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

{

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

appendValueReferenceElement(out, ref, true);

}

else {

else

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

{

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

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

out << "\">";

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

// fixed the special character problem - Markus

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

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

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

}

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

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

}

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

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

}

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

Line 407

Line 885

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

void XmlWriter::appendClassPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& classPath)

{

out << "<CLASSPATH>\n";

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

appendNameSpacePathElement(out,

classPath.getHost(),

classPath.getNameSpace());

appendClassNameElement(out, classPath.getClassName());

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

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

}

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

Line 427

Line 905

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

void XmlWriter::appendInstancePathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& instancePath)

{

out << "<INSTANCEPATH>\n";

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

appendNameSpacePathElement(out,

instancePath.getHost(),

instancePath.getNameSpace());

appendInstanceNameElement(out, instancePath);

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

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

}

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

Line 447

Line 925

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

void XmlWriter::appendLocalClassPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& classPath)

{

out << "<LOCALCLASSPATH>\n";

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

appendLocalNameSpacePathElement(out, classPath.getNameSpace());

appendClassNameElement(out, classPath.getClassName());

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

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

}

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

Line 465

Line 943

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

void XmlWriter::appendLocalInstancePathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& instancePath)

{

out << "<LOCALINSTANCEPATH>\n";

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

appendLocalNameSpacePathElement(out, instancePath.getNameSpace());

appendInstanceNameElement(out, instancePath);

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

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

}

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

Line 484

Line 962

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

void XmlWriter::appendLocalObjectPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& objectPath)

{

Line 509

Line 987

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

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?

// It is not necessary to use XmlWriter::appendSpecial(), because

// CIMDateTime values do not contain special characters.

out << x.toString();

}

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 << STRLIT("<VALUE.REFARRAY>\n");

while (size--)

{

_appendValue(out, *p++);

_xmlWritter_appendValue(out, *p++);

}

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

out << STRLIT("</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 << STRLIT("<VALUE.ARRAY>\n");

while (size--)

{

out << "<VALUE>";

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

_appendValue(out, *p++);

_xmlWritter_appendValue(out, *p++);

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

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

}

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

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

}

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

Line 623

Line 1110

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

void XmlWriter::appendValueElement(

Array<Sint8>& out,

Buffer& out,

const CIMValue& value)

{

if (value.isNull())

Line 638

Line 1125

{

Array<Boolean> a;

value.get(a);

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

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

break;

}

Line 646

Line 1133

{

Array<Uint8> a;

value.get(a);

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

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

break;

}

Line 654

Line 1141

{

Array<Sint8> a;

value.get(a);

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

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

break;

}

Line 662

Line 1149

{

Array<Uint16> a;

value.get(a);

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

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

break;

}

Line 670

Line 1157

{

Array<Sint16> a;

value.get(a);

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

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

break;

}

Line 678

Line 1165

{

Array<Uint32> a;

value.get(a);

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

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

break;

}

Line 686

Line 1173

{

Array<Sint32> a;

value.get(a);

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

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

break;

}

Line 694

Line 1181

{

Array<Uint64> a;

value.get(a);

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

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

break;

}

Line 702

Line 1189

{

Array<Sint64> a;

value.get(a);

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

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

break;

}

Line 710

Line 1197

{

Array<Real32> a;

value.get(a);

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

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

break;

}

Line 718

Line 1205

{

Array<Real64> a;

value.get(a);

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

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

break;

}

Line 726

Line 1213

{

Array<Char16> a;

value.get(a);

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

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

break;

}

case CIMTYPE_STRING:

{

Array<String> a;

const String* data;

value.get(a);

Uint32 size;

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

value._get(data, size);

_xmlWritter_appendValueArray(out, data, size);

break;

}

Line 742

Line 1230

{

Array<CIMDateTime> a;

value.get(a);

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

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

break;

}

Line 750

Line 1238

{

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;

}

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

case CIMTYPE_INSTANCE:

{

Array<CIMInstance> a;

value.get(a);

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

break;

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

default:

PEGASUS_ASSERT(false);

}

Line 763

Line 1267

// 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 << STRLIT("<VALUE>");

switch (value.getType())

{

Line 775

Line 1279

{

Boolean v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 783

Line 1287

{

Uint8 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 791

Line 1295

{

Sint8 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 799

Line 1303

{

Uint16 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 807

Line 1311

{

Sint16 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 815

Line 1319

{

Uint32 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 823

Line 1327

{

Sint32 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 831

Line 1335

{

Uint64 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 839

Line 1343

{

Sint64 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 847

Line 1351

{

Real32 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 855

Line 1359

{

Real64 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 863

Line 1367

{

Char16 v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 871

Line 1375

{

String v;

value.get(v);

_appendValue(out, v);

_xmlWritter_appendValue(out, v);

break;

}

Line 879

Line 1383

{

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;

}

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

case CIMTYPE_INSTANCE:

{

CIMInstance v;

value.get(v);

_xmlWritter_appendValue(out, v);

break;

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

default:

PEGASUS_ASSERT(false);

}

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

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

}

Line 895

Line 1415

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 911

Line 1430

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

void XmlWriter::appendValueObjectWithPathElement(

Array<Sint8>& out,

Buffer& out,

const CIMObject& objectWithPath)

{

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

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

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

appendObjectElement(out, objectWithPath);

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

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

}

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

Line 933

Line 1452

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

void XmlWriter::appendValueReferenceElement(

Array<Sint8>& out,

Buffer& out,

const CIMObjectPath& reference,

Boolean putValueWrapper)

{

if (putValueWrapper)

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

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

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

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

Line 949

Line 1468

// key bindings

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

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

if (kbs.size())

{

Line 983

Line 1502

}

if (putValueWrapper)

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

out << STRLIT("</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 1005

Line 1523

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

void XmlWriter::appendValueNamedInstanceElement(

Array<Sint8>& out,

Buffer& out,

const CIMInstance& namedInstance)

{

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

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

appendInstanceNameElement(out, namedInstance.getPath ());

appendInstanceElement(out, namedInstance);

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

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

}

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

Line 1029

Line 1547

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

void XmlWriter::appendClassElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstClass& cimclass)

{

cimclass._checkRep();

CheckRep(cimclass._rep);

cimclass._rep->toXml(out);

}

Line 1040

Line 1558

const CIMConstClass& cimclass,

PEGASUS_STD(ostream)& os)

{

Array<Sint8> tmp;

Buffer tmp;

appendClassElement(tmp, cimclass);

tmp.append('\0');

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

}

Line 1058

Line 1575

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

void XmlWriter::appendInstanceElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstInstance& instance)

{

instance._checkRep();

CheckRep(instance._rep);

instance._rep->toXml(out);

}

Line 1069

Line 1586

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 1084

Line 1600

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

void XmlWriter::appendObjectElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstObject& object)

{

if (object.isClass())

Line 1129

Line 1645

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

void XmlWriter::appendPropertyElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstProperty& property)

{

property._checkRep();

CheckRep(property._rep);

property._rep->toXml(out);

}

Line 1140

Line 1656

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 1161

Line 1676

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

void XmlWriter::appendMethodElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstMethod& method)

{

method._checkRep();

CheckRep(method._rep);

method._rep->toXml(out);

}

Line 1172

Line 1687

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 1207

Line 1721

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

void XmlWriter::appendParameterElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstParameter& parameter)

{

parameter._checkRep();

CheckRep(parameter._rep);

parameter._rep->toXml(out);

}

Line 1218

Line 1732

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 1235

Line 1748

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

void XmlWriter::appendParamValueElement(

Array<Sint8>& out,

Buffer& out,

const CIMParamValue& paramValue)

{

paramValue._checkRep();

CheckRep(paramValue._rep);

paramValue._rep->toXml(out);

}

Line 1246

Line 1759

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 1266

Line 1778

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

void XmlWriter::appendQualifierElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstQualifier& qualifier)

{

qualifier._checkRep();

CheckRep(qualifier._rep);

qualifier._rep->toXml(out);

}

Line 1277

Line 1789

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 1298

Line 1809

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

void XmlWriter::appendQualifierDeclElement(

Array<Sint8>& out,

Buffer& out,

const CIMConstQualifierDecl& qualifierDecl)

{

qualifierDecl._checkRep();

CheckRep(qualifierDecl._rep);

qualifierDecl._rep->toXml(out);

}

Line 1309

Line 1820

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 1327

Line 1837

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

void XmlWriter::appendQualifierFlavorEntity(

Array<Sint8>& out,

Buffer& out,

const CIMFlavor & flavor)

{

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

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

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

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

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

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

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

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

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

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

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

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

}

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

Line 1360

Line 1870

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

void XmlWriter::appendScopeElement(

Array<Sint8>& out,

Buffer& out,

const CIMScope & scope)

{

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

{

out << "<SCOPE";

out << STRLIT("<SCOPE");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

out << "/>";

out << STRLIT("/>");

}

// l10n - added content language and accept language support to

// the header methods below

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

// appendMethodCallHeader()

Line 1401

Line 1914

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

void XmlWriter::appendMethodCallHeader(

Array<Sint8>& out,

Buffer& out,

const char* host,

const CIMName& cimMethod,

const String& cimObject,

const String& authenticationHeader,

HttpMethod httpMethod,

const AcceptLanguageList& acceptLanguages,

const ContentLanguageList& contentLanguages,

Uint32 contentLength)

{

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

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

// ATTN: KS 20020926 - Temporary change to issue only POST. This may

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

// be changed in the DMTF CIM Operations standard in the future.

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

// If we kept M-Post we would have to retry with Post. Does not

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

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

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

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

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

// installed. Required because of change to wbemservices cimom

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

if (httpMethod == HTTP_METHOD_M_POST)

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

{

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

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

}

else

{

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

}

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

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

OUTPUT_CONTENTLENGTH;

if (acceptLanguages.size() > 0)

{

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

}

if (contentLanguages.size() > 0)

{

out << STRLIT("Content-Language: ") << contentLanguages <<

STRLIT("\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 << STRLIT("TE: chunked, trailers\r\n");

if (httpMethod == HTTP_METHOD_M_POST)

{

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

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

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

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

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

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

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

}

else

{

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

out << STRLIT("CIMMethod: ")

<< encodeURICharacters(cimMethod.getString())

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

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

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

}

if (authenticationHeader.size())

{

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

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

}

out << "\r\n";

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

}

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

// appendMethodResponseHeader()

// Build HTTP response header.

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

void XmlWriter::appendMethodResponseHeader(

Array<Sint8>& out,

Buffer& out,

Uint32 contentLength)

HttpMethod httpMethod,

const ContentLanguageList& contentLanguages,

Uint32 contentLength,

Uint64 serverResponseTime)

{

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

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

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

#ifndef PEGASUS_DISABLE_PERFINST

STAT_SERVERTIME

if (StatisticalData::current()->copyGSD)

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

{

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

out << STRLIT("WBEMServerResponseTime: ") <<

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

CIMValue(serverResponseTime).toString() << STRLIT("\r\n");

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

}

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

#endif

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

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

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

OUTPUT_CONTENTLENGTH;

if (contentLanguages.size() > 0)

{

out << STRLIT("Content-Language: ") << contentLanguages <<

STRLIT("\r\n");

}

if (httpMethod == HTTP_METHOD_M_POST)

{

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

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

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

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

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

}

else

{

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

}

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

// appendHttpErrorResponseHeader()

Line 1466

Line 2052

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

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 << STRLIT("HTTP/1.1 ") << status << STRLIT("\r\n");

if (cimError != String::EMPTY)

{

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

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

}

if (errorDetail != String::EMPTY)

{

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

out << STRLIT(PEGASUS_HTTPHEADERTAG_ERRORDETAIL ": ")

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

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

// CIM/HTTP Specification section 3.3.2

out << PEGASUS_HTTPHEADERTAG_ERRORDETAIL ": " << errorDetail << "\r\n";

}

out << "\r\n";

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

}

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

Line 1506

Line 2090

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

void XmlWriter::appendUnauthorizedResponseHeader(

Array<Sint8>& out,

Buffer& out,

const String& content)

{

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

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

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

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

out << "\r\n";

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

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

// can display the error message.

Line 1523

Line 2107

// out << "</BODY></HTML>\r\n";

}

#ifdef PEGASUS_KERBEROS_AUTHENTICATION

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

// appendOKResponseHeader()

// Build HTTP authentication response header for unauthorized requests.

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

// </HEAD><BODY BGCOLOR="#99cc99">

// <H2>TEST200 OK</H2>

// <HR>

// </BODY></HTML>

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

void XmlWriter::appendOKResponseHeader(

Buffer& out,

const String& content)

{

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

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

// 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 << STRLIT("\r\n");

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

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

// can display the error message.

// out << "<HTML><HEAD>\r\n";

// out << "<TITLE>" << "200 OK" << "</TITLE>\r\n";

// out << "</HEAD><BODY BGCOLOR=\"#99cc99\">\r\n";

// out << "<H2>TEST" << "200 OK" << "</H2>\r\n";

// out << "<HR>\r\n";

// out << "</BODY></HTML>\r\n";

}

#endif

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

// _appendMessageElementBegin()

Line 1536

Line 2166

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

void XmlWriter::_appendMessageElementBegin(

Array<Sint8>& out,

Buffer& out,

const String& messageId)

{

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

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

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

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

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

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

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

}

void XmlWriter::_appendMessageElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

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

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

}

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

Line 1561

Line 2192

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

void XmlWriter::_appendSimpleReqElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLEREQ>\n";

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

}

void XmlWriter::_appendSimpleReqElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1583

Line 2214

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

void XmlWriter::_appendMethodCallElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

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

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

}

void XmlWriter::_appendMethodCallElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1606

Line 2237

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

void XmlWriter::_appendIMethodCallElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

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

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

}

void XmlWriter::_appendIMethodCallElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1631

Line 2262

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

void XmlWriter::_appendIParamValueElementBegin(

Array<Sint8>& out,

Buffer& out,

const char* name)

{

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

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

}

void XmlWriter::_appendIParamValueElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1653

Line 2284

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

void XmlWriter::_appendSimpleRspElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLERSP>\n";

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

}

void XmlWriter::_appendSimpleRspElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1675

Line 2306

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

void XmlWriter::_appendMethodResponseElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

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

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

}

void XmlWriter::_appendMethodResponseElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1698

Line 2329

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

void XmlWriter::_appendIMethodResponseElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

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

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

}

void XmlWriter::_appendIMethodResponseElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1717

Line 2348

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

void XmlWriter::_appendErrorElement(

Array<Sint8>& out,

Buffer& out,

const CIMException& cimException)

{

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

out << "<ERROR";

out << STRLIT("<ERROR");

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

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

out.append('"');

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

if (description != String::EMPTY)

{

out << " DESCRIPTION=\"";

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

appendSpecial(out, description);

out << "\"";

out.append('"');

}

if (cimException.getErrorCount())

{

out << STRLIT(">");

for (Uint32 i = 0, n = cimException.getErrorCount(); i < n; i++)

appendInstanceElement(out, cimException.getError(i));

out << STRLIT("</ERROR>");

}

out << "/>";

else

out << STRLIT("/>");

}

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

Line 1740

Line 2385

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

// <!ATTLIST RETURNVALUE

// %EmbeddedObject; #IMPLIED

// %ParamType;>

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

void XmlWriter::appendReturnValueElement(

Array<Sint8>& out,

Buffer& out,

const CIMValue& value)

{

out << "<RETURNVALUE";

out << STRLIT("<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 << STRLIT(" PARAMTYPE=\"string\"");

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

}

#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

else if (type == CIMTYPE_INSTANCE)

{

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

out << STRLIT(" EMBEDDEDOBJECT=\"instance\"");

}

#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT

else

{

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

out.append('"');

}

out << ">\n";

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

// Add value.

appendValueElement(out, value);

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

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

}

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

Line 1773

Line 2440

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

void XmlWriter::_appendIReturnValueElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<IRETURNVALUE>\n";

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

}

void XmlWriter::_appendIReturnValueElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 1791

Line 2458

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

void XmlWriter::appendBooleanIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

Boolean flag)

{

_appendIParamValueElementBegin(out, name);

out << "<VALUE>";

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

append(out, flag);

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

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

_appendIParamValueElementEnd(out);

}

Line 1809

Line 2476

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

void XmlWriter::appendStringIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const String& str)

{

_appendIParamValueElementBegin(out, name);

out << "<VALUE>";

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

appendSpecial(out, str);

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

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

_appendIParamValueElementEnd(out);

}

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

// appendQualifierNameIParameter()

// appendClassNameIParameter()

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

void XmlWriter::appendQualifierNameIParameter(

void XmlWriter::appendClassNameIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const String& qualifierName)

const CIMName& className)

{

// <!ELEMENT IPARAMVALUE (VALUE|VALUE.ARRAY|VALUE.REFERENCE

// |INSTANCENAME|CLASSNAME|QUALIFIER.DECLARATION

// |CLASS|INSTANCE|VALUE.NAMEDINSTANCE)?>

// ATTN: notice that there is really no way to pass a qualifier name

// as an IPARAMVALUE element according to the spec (look above). So we

// just pass it as a class name. An answer must be obtained later.

_appendIParamValueElementBegin(out, name);

appendClassNameElement(out, qualifierName);

_appendIParamValueElementEnd(out);

}

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

// appendClassNameIParameter()

// A NULL (unassigned) value for a parameter is specified by an

// <IPARAMVALUE> element with no subelement

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

if (!className.isNull ())

void XmlWriter::appendClassNameIParameter(

Array<Sint8>& out,

const char* name,

const CIMName& className)

{

_appendIParamValueElementBegin(out, name);

appendClassNameElement(out, className);

}

_appendIParamValueElementEnd(out);

}

Line 1867

Line 2519

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

void XmlWriter::appendInstanceNameIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMObjectPath& instanceName)

{

Line 1877

Line 2529

}

void XmlWriter::appendObjectNameIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMObjectPath& objectName)

{

Line 1906

Line 2558

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

void XmlWriter::appendClassIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMConstClass& cimClass)

{

Line 1922

Line 2574

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

void XmlWriter::appendInstanceIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMConstInstance& instance)

{

Line 1938

Line 2590

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

void XmlWriter::appendNamedInstanceIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMInstance& namedInstance)

{

Line 1957

Line 2609

// 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 << STRLIT("<VALUE>") << propertyName << STRLIT("</VALUE>\n");

_appendIParamValueElementEnd(out);

}

Line 1972

Line 2624

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

void XmlWriter::appendPropertyValueIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMValue& value)

{

Line 1988

Line 2640

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

void XmlWriter::appendPropertyListIParameter(

Array<Sint8>& out,

Buffer& out,

const CIMPropertyList& propertyList)

{

// ATTN: P3 KS 4 Mar 2002 - As check shouldn't we check for null property list

_appendIParamValueElementBegin(out, "PropertyList");

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

// A NULL (unassigned) value for a parameter is specified by an

// <IPARAMVALUE> element with no subelement

if (!propertyList.isNull ())

{

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

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

{

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

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

}

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

}

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

_appendIParamValueElementEnd(out);

}

Line 2011

Line 2669

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

void XmlWriter::appendQualifierDeclarationIParameter(

Array<Sint8>& out,

Buffer& out,

const char* name,

const CIMConstQualifierDecl& qualifierDecl)

{

Line 2026

Line 2684

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

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);

return out;

}

// l10n - add content language support to the format methods below

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

// XmlWriter::formatSimpleMethodReqMessage()

Line 2045

Line 2705

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

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

const CIMName& methodName,

const Array<CIMParamValue>& parameters,

const String& messageId,

const String& authenticationHeader)

HttpMethod httpMethod,

const String& authenticationHeader,

const AcceptLanguageList& httpAcceptLanguages,

const ContentLanguageList& httpContentLanguages)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

CIMObjectPath localObjectPath = path;

localObjectPath.setNameSpace(nameSpace.getString());

localObjectPath.setHost(String::EMPTY);

Line 2078

Line 2741

methodName,

localObjectPath.toString(),

authenticationHeader,

httpMethod,

httpAcceptLanguages,

httpContentLanguages,

out.size());

tmp << out;

return tmp;

}

Array<Sint8> XmlWriter::formatSimpleMethodRspMessage(

//PEP 128 adding serverRsponseTime to header

Buffer XmlWriter::formatSimpleMethodRspMessage(

const CIMName& methodName,

const String& messageId,

const Array<Sint8>& body)

HttpMethod httpMethod,

{

const ContentLanguageList& httpContentLanguages,

Array<Sint8> out;

const Buffer& body,

Array<Sint8> tmp;

Uint64 serverResponseTime,

Boolean isFirst,

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, out.size());

return out;

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 2128

Line 2813

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

appendMethodResponseHeader(tmp, out.size());

appendMethodResponseHeader(

tmp,

httpMethod,

cimException.getContentLanguages(),

out.size());

tmp << out;

return tmp;

Line 2140

Line 2829

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

Array<Sint8> XmlWriter::formatSimpleIMethodReqMessage(

Buffer XmlWriter::formatSimpleIMethodReqMessage(

const char* host,

const CIMNamespaceName& nameSpace,

const CIMName& iMethodName,

const String& messageId,

HttpMethod httpMethod,

const String& authenticationHeader,

const Array<Sint8>& body)

const AcceptLanguageList& httpAcceptLanguages,

const ContentLanguageList& httpContentLanguages,

const Buffer& body)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleReqElementBegin(out);

Line 2166

Line 2858

iMethodName,

nameSpace.getString(),

authenticationHeader,

httpMethod,

httpAcceptLanguages,

httpContentLanguages,

out.size());

tmp << out;

Line 2178

Line 2873

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

Array<Sint8> XmlWriter::formatSimpleIMethodRspMessage(

Buffer XmlWriter::formatSimpleIMethodRspMessage(

const CIMName& iMethodName,

const String& messageId,

const Array<Sint8>& body)

HttpMethod httpMethod,

{

const ContentLanguageList& httpContentLanguages,

Array<Sint8> out;

const Buffer& body,

Array<Sint8> tmp;

Uint64 serverResponseTime,

Boolean isFirst,

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, out.size());

return out;

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 2227

Line 2946

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

appendMethodResponseHeader(tmp, out.size());

appendMethodResponseHeader(tmp,

httpMethod,

cimException.getContentLanguages(),

out.size());

tmp << out;

return tmp;

Line 2248

Line 2970

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

void XmlWriter::appendEMethodRequestHeader(

Array<Sint8>& out,

Buffer& out,

const char* requestUri,

const char* host,

const CIMName& cimMethod,

HttpMethod httpMethod,

const String& authenticationHeader,

const AcceptLanguageList& acceptLanguages,

const ContentLanguageList& contentLanguages,

Uint32 contentLength)

{

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

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

if (httpMethod == HTTP_METHOD_M_POST)

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

{

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

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

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

}

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

else

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

{

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

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

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

}

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

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

OUTPUT_CONTENTLENGTH;

if (acceptLanguages.size() > 0)

{

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

}

if (contentLanguages.size() > 0)

{

out << STRLIT("Content-Language: ") << contentLanguages <<

STRLIT("\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 << STRLIT("TE: chunked, trailers\r\n");

if (httpMethod == HTTP_METHOD_M_POST)

{

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

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

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

out << nn << STRLIT("-CIMExportMethod: ") << cimMethod <<

STRLIT("\r\n");

}

else

{

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

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

}

if (authenticationHeader.size())

{

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

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

}

out << "\r\n";

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

}

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

Line 2281

Line 3047

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

void XmlWriter::appendEMethodResponseHeader(

Array<Sint8>& out,

Buffer& out,

HttpMethod httpMethod,

const ContentLanguageList& contentLanguages,

Uint32 contentLength)

{

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

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

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

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

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

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

OUTPUT_CONTENTLENGTH;

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

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

if (contentLanguages.size() > 0)

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

{

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

out << STRLIT("Content-Language: ") << contentLanguages <<

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

STRLIT("\r\n");

}

if (httpMethod == HTTP_METHOD_M_POST)

{

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

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

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

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

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

}

else

{

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

}

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

Line 2306

Line 3087

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

void XmlWriter::_appendSimpleExportReqElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLEEXPREQ>\n";

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

}

void XmlWriter::_appendSimpleExportReqElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 2328

Line 3109

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

void XmlWriter::_appendEMethodCallElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

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

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

}

void XmlWriter::_appendEMethodCallElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

// _appendEParamValueElementBegin()

// _appendEParamValueElementEnd()

// <!ELEMENT EXPPARAMVALUE (INSTANCE)>

// <!ATTLIST EXPPARAMVALUE

// %CIMName;>

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

void XmlWriter::_appendEParamValueElementBegin(

Buffer& out,

const char* name)

{

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

}

void XmlWriter::_appendEParamValueElementEnd(

Buffer& out)

{

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

}

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

// appendInstanceEParameter()

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

void XmlWriter::appendInstanceEParameter(

Buffer& out,

const char* name,

const CIMInstance& instance)

{

_appendEParamValueElementBegin(out, name);

appendInstanceElement(out, instance);

_appendEParamValueElementEnd(out);

}

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

Line 2350

Line 3171

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

void XmlWriter::_appendSimpleExportRspElementBegin(

Array<Sint8>& out)

Buffer& out)

{

out << "<SIMPLEEXPRSP>\n";

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

}

void XmlWriter::_appendSimpleExportRspElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 2372

Line 3193

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

void XmlWriter::_appendEMethodResponseElementBegin(

Array<Sint8>& out,

Buffer& out,

const CIMName& name)

{

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

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

}

void XmlWriter::_appendEMethodResponseElementEnd(

Array<Sint8>& out)

Buffer& out)

{

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

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

}

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

Line 2390

Line 3211

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

Array<Sint8> XmlWriter::formatSimpleEMethodReqMessage(

Buffer XmlWriter::formatSimpleEMethodReqMessage(

const char* requestUri,

const char* host,

const CIMName& eMethodName,

const String& messageId,

HttpMethod httpMethod,

const String& authenticationHeader,

const Array<Sint8>& body)

const AcceptLanguageList& httpAcceptLanguages,

const ContentLanguageList& httpContentLanguages,

const Buffer& body)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleExportReqElementBegin(out);

Line 2414

Line 3238

requestUri,

host,

eMethodName,

httpMethod,

authenticationHeader,

httpAcceptLanguages,

httpContentLanguages,

out.size());

tmp << out;

Line 2427

Line 3254

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

Array<Sint8> XmlWriter::formatSimpleEMethodRspMessage(

Buffer XmlWriter::formatSimpleEMethodRspMessage(

const CIMName& eMethodName,

const String& messageId,

const Array<Sint8>& body)

HttpMethod httpMethod,

const ContentLanguageList& httpContentLanguages,

const Buffer& body)

{

Array<Sint8> out;

Buffer out;

Array<Sint8> tmp;

Buffer tmp;

_appendMessageElementBegin(out, messageId);

_appendSimpleExportRspElementBegin(out);

Line 2443

Line 3272

_appendSimpleExportRspElementEnd(out);

_appendMessageElementEnd(out);

appendEMethodResponseHeader(tmp, out.size());

appendEMethodResponseHeader(tmp,

httpMethod,

httpContentLanguages,

out.size());

tmp << out;

return tmp;

Line 2455

Line 3287

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

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 2471

Line 3304

_appendSimpleExportRspElementEnd(out);

_appendMessageElementEnd(out);

appendEMethodResponseHeader(tmp, out.size());

appendEMethodResponseHeader(

tmp,

httpMethod,

cimException.getContentLanguages(),

out.size());

tmp << out;

return tmp;

Line 2479

Line 3316

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

// _printAttributes()

// _xmlWritter_printAttributes()

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

static void _printAttributes(

void _xmlWritter_printAttributes(

PEGASUS_STD(ostream)& os,

const XmlAttribute* attributes,

Uint32 attributeCount)

Line 2493

Line 3330

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

os << '"';

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

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

os << '"';

if (i + 1 != attributeCount)

Line 2503

Line 3340

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

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

Line 3366

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 2538

Line 3378

{

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 2563

Line 3405

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 2576

Line 3419

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 2584

Line 3427

case XmlEntry::COMMENT:

{

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

_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[...]]>";

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

break;

}

case XmlEntry::DOCTYPE:

{

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

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

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

break;

}

Line 2616

Line 3458

os << PEGASUS_STD(endl);

}

delete [] tmp;

}

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

Line 2626

Line 3466

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

static IDFactory _messageIDFactory(1000);

String XmlWriter::getNextMessageId()

{

// ATTN: make thread-safe:

char scratchBuffer[22];

static Uint32 messageId = 1000;

Uint32 n;

const char * startP = Uint32ToString(scratchBuffer,

messageId++;

_messageIDFactory.getID(),

n);

if (messageId < 1000)

return String(startP, n);

messageId = 1001;

char buffer[16];

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

return buffer;

}

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

Legend:

Removed from v.1.80
changed lines
	Added in v.1.152

No CVS admin address has been configured