Merge pull request #328 from KNMI/315-fixopendap

315 fixopendap

.vscode/settings.json

@@ -65,7 +65,9 @@
     "variant": "cpp",
     "shared_mutex": "cpp",
     "regex": "cpp",
-    "numbers": "cpp"
+    "numbers": "cpp",
+    "compare": "cpp",
+    "concepts": "cpp"
   },
   "cmake.buildDirectory": "${workspaceFolder}/bin",
   "cmake.configureOnOpen": true,

Dockerfile

@@ -6,7 +6,7 @@ USER root
 LABEL maintainer="adaguc@knmi.nl"
 
 # Version should be same as in Definitions.h
-LABEL version="2.14.2"
+LABEL version="2.14.3"
 
 # Try to update image packages
 RUN apt-get -q -y update \

NEWS.md

@@ -1,3 +1,6 @@
+**Version 2.14.3 2024-01-19**
+- Opendap services are accessible again in the Layer configuration: https://github.com/KNMI/adaguc-server/issues/315
+
 **Version 2.14.2 2024-01-15**
 - Fix issue where the wrong dimension was forced to a value
 - Add Cache-Control header to WCS requests (DescribeCoverage and GetCoverage)

adagucserverEC/CDBFileScanner.cpp

@@ -410,10 +410,6 @@ int CDBFileScanner::DBLoopFiles(CDataSource *dataSource, int removeNonExistingFi
     }
 
     for (size_t j = 0; j < fileList->size(); j++) {
-      if (!CDirReader::isFile((*fileList)[j].c_str())) {
-        CDBWarning("File [%s] does not exist anymore, skipping", (*fileList)[j].c_str());
-        continue;
-      }
 // Loop through all configured dimensions.
 #ifdef CDBFILESCANNER_DEBUG
       CDBDebug("Loop through all configured dimensions.");

adagucserverEC/CDBFileScannerCleanFiles.cpp

@@ -113,6 +113,8 @@ int CDBFileScanner::cleanFiles(CDataSource *dataSource, int) {
             CDBError("Unable to remove file from FS: [%s]", fileNamestr.c_str());
           } else {
             filesDeletedFromFS.insert(fileNamestr);
+            // File is not present anymore, also remove it from the dirreaders
+            CCachedDirReader::removeFileFromCachedList(fileNamestr);
           }
         }
       }

adagucserverEC/Definitions.h

@@ -28,7 +28,7 @@
 #ifndef Definitions_H
 #define Definitions_H
 
-#define ADAGUCSERVER_VERSION "2.14.2" // Please also update in the Dockerfile to the same version
+#define ADAGUCSERVER_VERSION "2.14.3" // Please also update in the Dockerfile to the same version
 
 // CConfigReaderLayerType
 #define CConfigReaderLayerTypeUnknown 0

hclasses/CDirReader.cpp

@@ -402,6 +402,18 @@ CDirReader *CCachedDirReader::getDirReader(const char *directory, const char *ex
   return 0;
 }
 
+void CCachedDirReader::removeFileFromCachedList(std::string fileToRemove) {
+  for (auto i : dirReaderMap) {
+    CDirReader *dirReader = i.second;
+    // Find the file in the vector
+    auto itr = std::find(dirReader->fileList.begin(), dirReader->fileList.end(), fileToRemove);
+    // If found, remove it from the vector
+    if (itr != dirReader->fileList.end()) {
+      dirReader->fileList.erase(itr);
+    }
+  }
+}
+
 void CCachedDirReader::free() {
   for (std::map<std::string, CDirReader *>::iterator it = dirReaderMap.begin(); it != dirReaderMap.end(); ++it) {
     delete it->second;

hclasses/CDirReader.h

@@ -95,6 +95,7 @@ class CCachedDirReader {
 public:
   static void free();
   static CDirReader *getDirReader(const char *directory, const char *ext_filter);
+  static void removeFileFromCachedList(std::string fileToRemove);
 };
 
 #endif

tests/AdagucTests/TestWMS.py

@@ -2437,4 +2437,3 @@ def test_WMSGetMap_WithCaching(self):
         self.assertEqual(
             headers, ["Content-Type:image/png", "Cache-Control:max-age=60"]
         )
-        AdagucTestTools().writetofile("test1.png", data.getvalue())