version 1.4, 2008/08/26 17:48:07
|
version 1.5, 2008/08/28 17:24:47
|
|
|
| |
if (!FileSystem::existsNoCase(path, realPath)) | if (!FileSystem::existsNoCase(path, realPath)) |
{ | { |
PEG_TRACE_STRING(TRC_REPOSITORY, Tracer::LEVEL1, |
PEG_TRACE((TRC_REPOSITORY, Tracer::LEVEL1, |
path + " does not exist."); |
"%s does not exist.",(const char*)path.getCString())); |
PEG_METHOD_EXIT(); | PEG_METHOD_EXIT(); |
throw CannotOpenFile(path); | throw CannotOpenFile(path); |
} | } |
| |
PEG_TRACE_STRING(TRC_REPOSITORY, Tracer::LEVEL4, "realpath = " + realPath); |
PEG_TRACE((TRC_REPOSITORY, Tracer::LEVEL4, "realpath = %s", |
|
(const char*)realPath.getCString())); |
| |
// Load file into memory: | // Load file into memory: |
| |
|
|
!FileSystem::isDirectory(nameSpacePath + _INSTANCES_SUFFIX) || | !FileSystem::isDirectory(nameSpacePath + _INSTANCES_SUFFIX) || |
!FileSystem::isDirectory(nameSpacePath + _QUALIFIERS_SUFFIX)) | !FileSystem::isDirectory(nameSpacePath + _QUALIFIERS_SUFFIX)) |
{ | { |
PEG_TRACE_STRING(TRC_REPOSITORY, Tracer::LEVEL2, |
PEG_TRACE((TRC_REPOSITORY, Tracer::LEVEL2, |
"Namespace: " + nameSpaceDirName + |
"Namespace: %s ignored -- " |
" ignored -- subdirectories are not correctly formed"); |
"subdirectories are not correctly formed", |
|
(const char*)nameSpaceDirName.getCString())); |
continue; | continue; |
} | } |
| |
|
|
} | } |
else | else |
{ | { |
PEG_TRACE_STRING(TRC_REPOSITORY, Tracer::LEVEL2, |
PEG_TRACE((TRC_REPOSITORY, Tracer::LEVEL2, |
"Namespace " + nameSpaceDirName + |
"Namespace %s ignored - " |
" ignored - using incorrect parent namespace " |
"using incorrect parent namespace specification: %s", |
"specification: " + |
(const char*)nameSpaceDirName.getCString(), |
nameSpaceSubDirName); |
(const char*)nameSpaceSubDirName.getCString())); |
|
|
skipThisNamespace = true; | skipThisNamespace = true; |
} | } |
#ifndef PEGASUS_ENABLE_REMOTE_CMPI | #ifndef PEGASUS_ENABLE_REMOTE_CMPI |
|
|
// case two-character identifier | // case two-character identifier |
nsdef.remoteInfo = nameSpaceSubDirName; | nsdef.remoteInfo = nameSpaceSubDirName; |
| |
PEG_TRACE_STRING(TRC_REPOSITORY, Tracer::LEVEL4, |
PEG_TRACE((TRC_REPOSITORY, Tracer::LEVEL4, |
"Remote namespace: " + nameSpaceDirName + " >" + |
"Remote namespace: %s >%s", |
nameSpaceSubDirName); |
(const char*)nameSpaceDirName.getCString(), |
|
(const char*)nameSpaceSubDirName.getCString())); |
} | } |
#endif | #endif |
} | } |