Commit 975f4b53 authored by js9's avatar js9
Browse files

merge from 2.1RC: allow "VTK", not just "VTK_1.0", in OpenAs requests


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12652 18c085ea-50e0-402c-830e-de6fd14e8384
parent c67b73a9
......@@ -275,6 +275,10 @@ avtDatabaseFactory::SetDefaultFileOpenOptions(const FileOpenOptions &opts)
// Hank Childs, Sun Sep 19 09:02:05 PDT 2010
// Add parsing for explicit setting of times by user.
//
// Jeremy Meredith, Thu Sep 30 12:16:00 EDT 2010
// Allow specified file type to look for a name match, now allowing
// "VTK" (as well as "VTK_1.0" which previously worked), for example.
//
// ****************************************************************************
avtDatabase *
......@@ -336,6 +340,13 @@ avtDatabaseFactory::FileList(DatabasePluginManager *dbmgr,
<< format << endl;
int formatindex = dbmgr->GetAllIndex(format);
if (formatindex < 0)
{
formatindex = dbmgr->GetAllIndexFromName(format);
debug3 << "avtDatabaseFactory: couldn't find "
<< format << " by ID, attempt at a name match "
<< ((formatindex>=0) ? "succeeded" : "failed") << endl;
}
if (formatindex < 0)
{
char msg[1000];
SNPRINTF(msg, sizeof(msg),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment