pegasus/src/Pegasus/Repository/CIMRepository.cpp - diff

Return to CIMRepository.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Repository/CIMRepository.cpp between version 1.113 and 1.114

version 1.113, 2004/06/02 09:55:51

version 1.114, 2004/06/03 08:47:11

Line 33

// Karl Schopmeyer(k.schopmeyer@opengroup.org) - extend ref function.

// Robert Kieninger, IBM (kieningr@de.ibm.com) - Bugzilla 383

// Seema Gupta (gseema@in.ibm.com) - Bugzilla 281, Bugzilla 1313

// Adrian Schuur (schuur@de.ibm.com) - PEP 129 & 164

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

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

Line 44

Line 45

#include <Pegasus/Common/Pair.h>

#include <Pegasus/Common/FileSystem.h>

#include <Pegasus/Common/InternalException.h>

#include <Pegasus/Common/XmlReader.h>

#include <Pegasus/Common/XmlWriter.h>

#include <Pegasus/Common/DeclContext.h>

#include <Pegasus/Common/Resolver.h>

#include <Pegasus/Common/System.h>

Line 54

#include <Pegasus/Common/MessageLoader.h> //l10n

#include <Pegasus/Common/CommonUTF.h>

#include <Pegasus/Common/XmlStreamer.h>

#include <Pegasus/Common/BinaryStreamer.h>

#include <Pegasus/Common/AutoStreamer.h>

#include "CIMRepository.h"

#include "RepositoryDeclContext.h"

#include "InstanceIndexFile.h"

Line 94

Line 98

PEGASUS_NAMESPACE_BEGIN

static const Uint32 _MAX_FREE_COUNT = 16;

static int binaryMode = 0;

// The following _xx functions are local to the repository implementation

Line 364

Line 369

template<class Object>

void _LoadObject(

const String& path,

Object& object)

Object& object,

ObjectStreamer *streamer)

{

PEG_METHOD_ENTER(TRC_REPOSITORY, "CIMRepository::_LoadObject");

Line 388

Line 394

FileSystem::loadFileToMemory(data, realPath);

data.append('\0');

XmlParser parser((char*)data.getData());

streamer->decode(data, 0, object);

//XmlParser parser((char*)data.getData());

XmlReader::getObject(parser, object);

//XmlReader::getObject(parser, object);

PEG_METHOD_EXIT();

}

Line 404

Line 412

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

void _SaveObject(const String& path, Array<Sint8>& objectXml)

void _SaveObject(const String& path, Array<Sint8>& objectXml,

ObjectStreamer *streamer)

{

PEG_METHOD_ENTER(TRC_REPOSITORY, "CIMRepository::_SaveObject");

Line 417

Line 426

}

#ifdef INDENT_XML_FILES

objectXml.append('\0');

streamer->indentedOut(os, objectXml, 2);

XmlWriter::indentedPrint(os, objectXml.getData(), 2);

// objectXml.append('\0');

// XmlWriter::indentedPrint(os, objectXml.getData(), 2);

#else

os.write((char*)objectXml.getData(), objectXml.size());

#endif

Line 446

Line 456

{

PEG_METHOD_ENTER(TRC_REPOSITORY, "CIMRepository::CIMRepository");

if (!binaryMode) {

if (getenv("PEGASUS_BINARY_REPOSITORY")) binaryMode=1;

else binaryMode=-1;

}

if (binaryMode>0) {

streamer=new AutoStreamer(new BinaryStreamer(),BINREP_MARKER);

((AutoStreamer*)streamer)->addReader(new XmlStreamer(),0);

}

else streamer=new XmlStreamer();

_context = new RepositoryDeclContext(this);

_isDefaultInstanceProvider = (ConfigManager::getInstance()->getCurrentValue(

"repositoryIsDefaultInstanceProvider") == "true");

Line 512

Line 534

try

{

_LoadObject(classFilePath, cimClass);

_LoadObject(classFilePath, cimClass, streamer);

}

catch (Exception& e)

{

Line 1090

Line 1112

// -- Create the class file:

Array<Sint8> classXml;

XmlWriter::appendClassElement(classXml, cimClass);

streamer->encode(classXml, cimClass);

_SaveObject(classFilePath, classXml);

//XmlWriter::appendClassElement(classXml, cimClass);

_SaveObject(classFilePath, classXml,streamer);

PEG_METHOD_EXIT();

}

Line 1359

Line 1382

{

Array<Sint8> data;

XmlWriter::appendInstanceElement(data, cimInstance);

streamer->encode(data, cimInstance);

// XmlWriter::appendInstanceElement(data, cimInstance);

size = data.size();

if (!InstanceDataFile::appendInstance(dataFilePath, data, index))

Line 1505

Line 1529

Array<Sint8> classXml;

XmlWriter::appendClassElement(classXml, cimClass);

streamer->encode(classXml, cimClass);

_SaveObject(classFilePath, classXml);

//XmlWriter::appendClassElement(classXml, cimClass);

_SaveObject(classFilePath, classXml,streamer);

if (cimClass.isAssociation()) {

// Remove from Association

Line 1859

Line 1884

{

Array<Sint8> out;

XmlWriter::appendInstanceElement(out, cimInstance);

streamer->encode(out, cimInstance);

//XmlWriter::appendInstanceElement(out, cimInstance);

newSize = out.size();

Line 2059

Line 2085

{

if (!freeFlags[i])

{

XmlParser parser(&(buffer[indices[i]]));

Uint32 pos=(&(buffer[indices[i]]))-buffer;

streamer->decode(data, pos, tmpInstance);

XmlReader::getObject(parser, tmpInstance);

// XmlParser parser(&(buffer[indices[i]]));

// XmlReader::getObject(parser, tmpInstance);

Resolver::resolveInstance (tmpInstance, _context, nameSpace,

true);

Line 2874

Line 2903

try

{

_LoadObject(qualifierFilePath, qualifierDecl);

_LoadObject(qualifierFilePath, qualifierDecl, streamer);

}

catch (CannotOpenFile&)

{

Line 2930

Line 2959

// -- Save qualifier:

Array<Sint8> qualifierDeclXml;

XmlWriter::appendQualifierDeclElement(qualifierDeclXml, qualifierDecl);

streamer->encode(qualifierDeclXml, qualifierDecl);

_SaveObject(qualifierFilePath, qualifierDeclXml);

//XmlWriter::appendQualifierDeclElement(qualifierDeclXml, qualifierDecl);

_SaveObject(qualifierFilePath, qualifierDeclXml,streamer);

PEG_METHOD_EXIT();

}

Line 3130

Line 3160

// Convert XML into an actual object:

XmlParser parser((char*)data.getData());

streamer->decode(data, 0, object);

XmlReader::getObject(parser, object);

//XmlParser parser((char*)data.getData());

//XmlReader::getObject(parser, object);

PEG_METHOD_EXIT();

return true;

Legend:

Removed from v.1.113
changed lines
	Added in v.1.114

No CVS admin address has been configured