Have env tryGetPropertyAsString() ck for ENV_PARAM default.

This commit is contained in:
Bruce Hill
2019-03-22 22:06:18 -07:00
committed by mdavidsaver
parent 78410499f0
commit b3b1e0b2c5

View File

@@ -119,9 +119,30 @@ void ConfigurationMap::addKeys(keys_t& names) const
names.insert(it->first);
}
const ENV_PARAM * findEnvConfigParam( const char * envVarName )
{
const ENV_PARAM **ppParam = env_param_list;
/* Find a match with one of the EPICS env vars */
while (*ppParam) {
if ( strcmp( envVarName, (*ppParam)->name ) == 0 ) {
return *ppParam;
}
ppParam++;
}
return 0;
}
bool ConfigurationEnviron::tryGetPropertyAsString(const std::string& name, std::string* val) const
{
const char *env = getenv(name.c_str());
if(!env) {
const ENV_PARAM *pParam = findEnvConfigParam( name.c_str() );
if ( pParam )
env = pParam->pdflt;
}
if(!env || !*env)
return false;
if(val)