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

Return to XmlReader.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/XmlReader.cpp between version 1.132 and 1.140

version 1.132, 2008/10/01 04:46:17

version 1.140, 2008/12/17 12:29:14

Line 1

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

//%LICENSE////////////////////////////////////////////////////////////////

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

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

// Source License; you may not use this file except in compliance with the

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

// License.

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

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

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

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

Line 40

Line 38

# include <errno.h>

#endif

#include "CIMName.h"

#include "CIMNameCast.h"

#include "XmlReader.h"

#include "XmlWriter.h"

#include "CIMQualifier.h"

Line 54

Line 53

#include <Pegasus/Common/MessageLoader.h>

#include <Pegasus/Common/StringConversion.h>

#include <Pegasus/Common/AutoPtr.h>

#include "CIMNameUnchecked.h"

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

Line 371

Line 369

const char* elementName,

Boolean acceptNull)

{

String name;

const char* name;

if (!entry.getAttributeValue("NAME", name))

{

Line 385

Line 383

throw XmlValidationError(lineNumber, mlParms);

}

if (acceptNull && name.size() == 0)

if (acceptNull && *name == '\0')

return CIMName ();

Uint32 size = CIMNameLegalASCII(name);

if (size)

{

String tmp(name, size);

return CIMName(CIMNameCast(tmp));

}

if (!CIMName::legal(name))

{

#ifdef PEGASUS_SNIA_INTEROP_TEST

Line 408

Line 414

#endif

}

return CIMNameUnchecked(name);

return CIMNameCast(name);

}

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

Line 472

Line 479

if (!entry.getAttributeValue("CLASSORIGIN", name))

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

{

char buffer[MESSAGE_SIZE];

Line 484

Line 502

throw XmlSemanticError(lineNumber, mlParms);

}

// The CIMName was already checked with legal() + String()

return CIMNameUnchecked(name);

return CIMNameCast(name);

}

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

Line 574

Line 592

throw XmlSemanticError(lineNumber, mlParms);

}

// The CIMName was already checked with legal() + String()

return CIMNameUnchecked(name);

return CIMNameCast(name);

}

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

Line 607

Line 625

throw XmlSemanticError(lineNumber, mlParms);

}

// The CIMName was already checked with legal() + String()

return CIMNameUnchecked(superClass);

return CIMNameCast(superClass);

}

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

Line 772

Line 790

{

Uint32 i;

Array<Uint8> utf8Chars;

Buffer utf8Chars;

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

{

Line 799

Line 817

}

Uint16 decodedChar = Uint16(digit1<<4) + Uint16(digit2);

utf8Chars.append((Uint8)decodedChar);

utf8Chars.append((char)decodedChar);

}

else

{

utf8Chars.append((Uint8)uriString[i]);

utf8Chars.append((char)uriString[i]);

}

Line 811

Line 829

if (uriString.size() > 0)

{

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

{

Legend:

Removed from v.1.132
changed lines
	Added in v.1.140

No CVS admin address has been configured