version 1.132, 2008/10/01 04:46:17
|
version 1.140.2.1, 2009/02/09 11:35:00
|
|
|
//%2006//////////////////////////////////////////////////////////////////////// |
//%LICENSE//////////////////////////////////////////////////////////////// |
// | // |
// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development |
// Licensed to The Open Group (TOG) under one or more contributor license |
// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. |
// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with |
// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; |
// this work for additional information regarding copyright ownership. |
// IBM Corp.; EMC Corporation, The Open Group. |
// Each contributor licenses this file to you under the OpenPegasus Open |
// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; |
// Source License; you may not use this file except in compliance with the |
// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. |
// License. |
// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; |
// |
// EMC Corporation; VERITAS Software Corporation; The Open Group. |
// Permission is hereby granted, free of charge, to any person obtaining a |
// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; |
// copy of this software and associated documentation files (the "Software"), |
// EMC Corporation; Symantec Corporation; The Open Group. |
// to deal in the Software without restriction, including without limitation |
// |
// the rights to use, copy, modify, merge, publish, distribute, sublicense, |
// Permission is hereby granted, free of charge, to any person obtaining a copy |
// and/or sell copies of the Software, and to permit persons to whom the |
// of this software and associated documentation files (the "Software"), to |
// Software is furnished to do so, subject to the following conditions: |
// deal in the Software without restriction, including without limitation the |
// |
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or |
// The above copyright notice and this permission notice shall be included |
// sell copies of the Software, and to permit persons to whom the Software is |
// in all copies or substantial portions of the Software. |
// furnished to do so, subject to the following conditions: |
// |
// |
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN |
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED |
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. |
// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT |
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY |
// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR |
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, |
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION |
|
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
|
// | // |
//============================================================================== |
////////////////////////////////////////////////////////////////////////// |
// | // |
//%///////////////////////////////////////////////////////////////////////////// | //%///////////////////////////////////////////////////////////////////////////// |
#include <Pegasus/Common/Config.h> | #include <Pegasus/Common/Config.h> |
|
|
# include <errno.h> | # include <errno.h> |
#endif | #endif |
#include "CIMName.h" | #include "CIMName.h" |
|
#include "CIMNameCast.h" |
#include "XmlReader.h" | #include "XmlReader.h" |
#include "XmlWriter.h" | #include "XmlWriter.h" |
#include "CIMQualifier.h" | #include "CIMQualifier.h" |
|
|
#include <Pegasus/Common/MessageLoader.h> | #include <Pegasus/Common/MessageLoader.h> |
#include <Pegasus/Common/StringConversion.h> | #include <Pegasus/Common/StringConversion.h> |
#include <Pegasus/Common/AutoPtr.h> | #include <Pegasus/Common/AutoPtr.h> |
#include "CIMNameUnchecked.h" |
|
| |
PEGASUS_USING_STD; | PEGASUS_USING_STD; |
PEGASUS_NAMESPACE_BEGIN | PEGASUS_NAMESPACE_BEGIN |
|
|
const char* elementName, | const char* elementName, |
Boolean acceptNull) | Boolean acceptNull) |
{ | { |
String name; |
const char* name; |
| |
if (!entry.getAttributeValue("NAME", name)) | if (!entry.getAttributeValue("NAME", name)) |
{ | { |
|
|
throw XmlValidationError(lineNumber, mlParms); | throw XmlValidationError(lineNumber, mlParms); |
} | } |
| |
if (acceptNull && name.size() == 0) |
if (acceptNull && *name == '\0') |
return CIMName (); | return CIMName (); |
| |
|
Uint32 size = CIMNameLegalASCII(name); |
|
|
|
if (size) |
|
{ |
|
String tmp(name, size); |
|
return CIMName(CIMNameCast(tmp)); |
|
} |
|
|
if (!CIMName::legal(name)) | if (!CIMName::legal(name)) |
{ | { |
#ifdef PEGASUS_SNIA_INTEROP_TEST | #ifdef PEGASUS_SNIA_INTEROP_TEST |
|
|
| |
#endif | #endif |
} | } |
return CIMNameUnchecked(name); |
|
|
return CIMNameCast(name); |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
if (!entry.getAttributeValue("CLASSORIGIN", name)) | if (!entry.getAttributeValue("CLASSORIGIN", name)) |
return CIMName(); | return CIMName(); |
| |
|
/* Interoperability hack to make the C++ client of OpenPegasus able |
|
to deal with the wbemservices CIMOM delivered with Sun Solaris. |
|
The issue is that the wbemservices delivers Xml responses with |
|
CLASSORIGIN="" |
|
Originally this had been reported with Bug#537. |
|
*/ |
|
if (name.size()==0) |
|
{ |
|
return CIMName(); |
|
} |
|
|
if (!CIMName::legal(name)) | if (!CIMName::legal(name)) |
{ | { |
char buffer[MESSAGE_SIZE]; | char buffer[MESSAGE_SIZE]; |
|
|
throw XmlSemanticError(lineNumber, mlParms); | throw XmlSemanticError(lineNumber, mlParms); |
} | } |
// The CIMName was already checked with legal() + String() | // The CIMName was already checked with legal() + String() |
return CIMNameUnchecked(name); |
return CIMNameCast(name); |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
throw XmlSemanticError(lineNumber, mlParms); | throw XmlSemanticError(lineNumber, mlParms); |
} | } |
// The CIMName was already checked with legal() + String() | // The CIMName was already checked with legal() + String() |
return CIMNameUnchecked(name); |
return CIMNameCast(name); |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
throw XmlSemanticError(lineNumber, mlParms); | throw XmlSemanticError(lineNumber, mlParms); |
} | } |
// The CIMName was already checked with legal() + String() | // The CIMName was already checked with legal() + String() |
return CIMNameUnchecked(superClass); |
return CIMNameCast(superClass); |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
{ | { |
Uint32 i; | Uint32 i; |
| |
Array<Uint8> utf8Chars; |
Buffer utf8Chars; |
| |
for (i=0; i<uriString.size(); i++) | for (i=0; i<uriString.size(); i++) |
{ | { |
|
|
} | } |
| |
Uint16 decodedChar = Uint16(digit1<<4) + Uint16(digit2); | Uint16 decodedChar = Uint16(digit1<<4) + Uint16(digit2); |
utf8Chars.append((Uint8)decodedChar); |
utf8Chars.append((char)decodedChar); |
} | } |
else | else |
{ | { |
utf8Chars.append((Uint8)uriString[i]); |
utf8Chars.append((char)uriString[i]); |
} | } |
} | } |
| |
|
|
if (uriString.size() > 0) | if (uriString.size() > 0) |
{ | { |
// Convert UTF-8 to UTF-16 and return the String | // Convert UTF-8 to UTF-16 and return the String |
utf8Chars.append('\0'); |
return String(utf8Chars.getData(), utf8Chars.size()); |
return String((char *)utf8Chars.getData()); |
|
} | } |
else | else |
{ | { |
|
|
const char* valueString, | const char* valueString, |
CIMType type) | CIMType type) |
{ | { |
|
return stringToValue(lineNumber, valueString, strlen(valueString), type); |
|
} |
|
|
|
CIMValue XmlReader::stringToValue( |
|
Uint32 lineNumber, |
|
const char* valueString, |
|
Uint32 valueStringLen, |
|
CIMType type) |
|
{ |
// ATTN-B: accepting only UTF-8 for now! (affects string and char16): | // ATTN-B: accepting only UTF-8 for now! (affects string and char16): |
| |
|
// Char string must have been null terminated. |
|
PEGASUS_ASSERT (!valueString[valueStringLen]); |
|
|
// Create value per type | // Create value per type |
switch (type) | switch (type) |
{ | { |
|
|
| |
case CIMTYPE_STRING: | case CIMTYPE_STRING: |
{ | { |
return CIMValue(String(valueString)); |
return CIMValue(String(valueString, valueStringLen)); |
} | } |
| |
case CIMTYPE_CHAR16: | case CIMTYPE_CHAR16: |
{ | { |
// Converts UTF-8 to UTF-16 | // Converts UTF-8 to UTF-16 |
String tmp(valueString); |
String tmp(valueString, valueStringLen); |
if (tmp.size() != 1) | if (tmp.size() != 1) |
{ | { |
MessageLoaderParms mlParms( | MessageLoaderParms mlParms( |
|
|
// Bugzilla 137 Adds the following if line. | // Bugzilla 137 Adds the following if line. |
// Expect this to become permanent but test only for now | // Expect this to become permanent but test only for now |
#ifdef PEGASUS_SNIA_INTEROP_TEST | #ifdef PEGASUS_SNIA_INTEROP_TEST |
if (strlen(valueString) != 0) |
if (valueStringLen != 0) |
#endif | #endif |
tmp.set(valueString); | tmp.set(valueString); |
} | } |
|
|
// just the value of the Embedded Object in String | // just the value of the Embedded Object in String |
// representation. | // representation. |
AutoArrayPtr<char> tmp_buffer( | AutoArrayPtr<char> tmp_buffer( |
new char[strlen(valueString) + 1]); |
new char[valueStringLen + 1]); |
strcpy(tmp_buffer.get(), valueString); |
memcpy(tmp_buffer.get(), valueString, valueStringLen + 1); |
XmlParser tmp_parser(tmp_buffer.get()); | XmlParser tmp_parser(tmp_buffer.get()); |
| |
// The next bit of logic constructs a CIMObject from the | // The next bit of logic constructs a CIMObject from the |
|
|
Boolean empty = entry.type == XmlEntry::EMPTY_TAG; | Boolean empty = entry.type == XmlEntry::EMPTY_TAG; |
| |
const char* valueString = ""; | const char* valueString = ""; |
|
Uint32 valueStringLen = 0; |
if (!empty) | if (!empty) |
{ | { |
if (testContentOrCData(parser, entry)) | if (testContentOrCData(parser, entry)) |
{ | { |
valueString = entry.text; | valueString = entry.text; |
|
valueStringLen = entry.textLen; |
} | } |
| |
expectEndTag(parser, "VALUE"); | expectEndTag(parser, "VALUE"); |
|
|
// Bugzilla tbd | // Bugzilla tbd |
if (!empty) | if (!empty) |
#endif | #endif |
value = stringToValue(parser.getLine(), valueString,type); |
value = stringToValue( |
|
parser.getLine(), |
|
valueString, |
|
valueStringLen, |
|
type); |
| |
return true; | return true; |
} | } |
|
|
Boolean empty = entry.type == XmlEntry::EMPTY_TAG; | Boolean empty = entry.type == XmlEntry::EMPTY_TAG; |
| |
const char* valueString = ""; | const char* valueString = ""; |
|
Uint32 valueStringLen = 0; |
| |
if (!empty) | if (!empty) |
{ | { |
if (testContentOrCData(parser, entry)) | if (testContentOrCData(parser, entry)) |
|
{ |
valueString = entry.text; | valueString = entry.text; |
|
valueStringLen = entry.textLen; |
|
} |
| |
expectEndTag(parser, "VALUE"); | expectEndTag(parser, "VALUE"); |
} | } |
| |
str = String(valueString); |
str = String(valueString, valueStringLen); |
return true; | return true; |
} | } |
| |
|
|
template<class T> | template<class T> |
CIMValue StringArrayToValueAux( | CIMValue StringArrayToValueAux( |
Uint32 lineNumber, | Uint32 lineNumber, |
const Array<const char*>& stringArray, |
const Array<CharString>& stringArray, |
CIMType type, | CIMType type, |
T*) | T*) |
{ | { |
|
|
for (Uint32 i = 0, n = stringArray.size(); i < n; i++) | for (Uint32 i = 0, n = stringArray.size(); i < n; i++) |
{ | { |
CIMValue value = XmlReader::stringToValue( | CIMValue value = XmlReader::stringToValue( |
lineNumber, stringArray[i], type); |
lineNumber, |
|
stringArray[i].value, |
|
stringArray[i].length, |
|
type); |
| |
T x; | T x; |
value.get(x); | value.get(x); |
|
|
const Array<const char*>& array, | const Array<const char*>& array, |
CIMType type) | CIMType type) |
{ | { |
|
Array<CharString> strArray; |
|
|
|
for (Uint32 i = 0, n = array.size() ; i < n ; ++i) |
|
{ |
|
strArray.append(CharString(array[i], strlen(array[i]))); |
|
} |
|
|
|
return _stringArrayToValue(lineNumber, strArray, type); |
|
} |
|
|
|
CIMValue XmlReader::_stringArrayToValue( |
|
Uint32 lineNumber, |
|
const Array<CharString> &array, |
|
CIMType type) |
|
{ |
switch (type) | switch (type) |
{ | { |
case CIMTYPE_BOOLEAN: | case CIMTYPE_BOOLEAN: |
|
|
// Get VALUE.ARRAY open tag: | // Get VALUE.ARRAY open tag: |
| |
XmlEntry entry; | XmlEntry entry; |
Array<const char*> stringArray; |
Array<CharString> stringArray; |
| |
// If no VALUE.ARRAY start tag, return false | // If no VALUE.ARRAY start tag, return false |
if (!testStartTagOrEmptyTag(parser, entry, "VALUE.ARRAY")) | if (!testStartTagOrEmptyTag(parser, entry, "VALUE.ARRAY")) |
|
|
| |
while (testStartTagOrEmptyTag(parser, entry, "VALUE")) | while (testStartTagOrEmptyTag(parser, entry, "VALUE")) |
{ | { |
|
// ATTN: NULL values in array will have VALUE.NULL subelement |
|
// See DSP0201 Version 2.3.0, Section 5.2.3.2 |
if (entry.type == XmlEntry::EMPTY_TAG) | if (entry.type == XmlEntry::EMPTY_TAG) |
{ | { |
stringArray.append(""); |
stringArray.append(CharString("", 0)); |
continue; | continue; |
} | } |
| |
if (testContentOrCData(parser, entry)) | if (testContentOrCData(parser, entry)) |
stringArray.append(entry.text); |
{ |
|
stringArray.append(CharString(entry.text, entry.textLen)); |
|
} |
else | else |
stringArray.append(""); |
{ |
|
stringArray.append(CharString("", 0)); |
|
} |
expectEndTag(parser, "VALUE"); | expectEndTag(parser, "VALUE"); |
} | } |
| |
expectEndTag(parser, "VALUE.ARRAY"); | expectEndTag(parser, "VALUE.ARRAY"); |
} | } |
| |
value = stringArrayToValue(parser.getLine(), stringArray, type); |
value = _stringArrayToValue(parser.getLine(), stringArray, type); |
return true; | return true; |
} | } |
| |