Compare commits

..

No commits in common. '802dcb55cd670cbac6bc3328f053894b3abb6807' and 'c00ce9418060b8701482207ac73b697edeeaa97e' have entirely different histories.

  1. 11
      include/cache.h
  2. 4
      sources/NEMO.h

11
include/cache.h

@ -376,10 +376,14 @@ class PostgreSQLCache: public GenericCache
inline GenericCache* CreateCache(const MString& cachedesc)
{
auto i = cachedesc.GetPos(':');
auto name = i == 0 ? cachedesc : cachedesc.SubStr(1, i - 1);
auto par = i == 0 ? "" : cachedesc.SubStr(i + 1, cachedesc.Len() - i);
if(i == 0)
{
if(cachedesc == "no") return new FakeCache;
return nullptr;
}
if(name == "no") return new FakeCache;
auto name = cachedesc.SubStr(1, i - 1);
auto par = cachedesc.SubStr(i + 1, cachedesc.Len() - i);
if(name == "sqlite")
{
@ -388,7 +392,6 @@ inline GenericCache* CreateCache(const MString& cachedesc)
if(*ret) return ret;
delete ret;
}
if(name == "postgre" || name == "postgres" || name == "postgresql")
{
auto ret = new PostgreSQLCache;

4
sources/NEMO.h

@ -7,7 +7,6 @@ class NEMOData: public LayeredDataZ
{
TYPE_UNKNOWN,
TYPE_DT,
TYPE_DT1,
TYPE_NRT,
TYPE_NRT6,
TYPE_BALTICDT,
@ -35,7 +34,6 @@ class NEMOData: public LayeredDataZ
switch(type)
{
case(TYPE_DT): return "NEMO Delayed time, daily mean (DT)";
case(TYPE_DT1): return "NEMO Delayed time, daily mean, part 2 (DT1)";
case(TYPE_NRT): return "NEMO Near-real time, daily mean (NRT)";
case(TYPE_NRT6): return "NEMO Near-real time, 6h resolution (NRT6)";
case(TYPE_BALTICDT): return "NEMO Delayed time, Baltic region, daily mean (BALTICDT)";
@ -61,8 +59,6 @@ class NEMOData: public LayeredDataZ
GPL.UsePrefix("NEMO");
if(dataset == "DT")
type = TYPE_DT;
else if(dataset == "DT1")
type = TYPE_DT1;
else if(dataset == "NRT")
type = TYPE_NRT;
else if(dataset == "NRT6")

Loading…
Cancel
Save