gdalinfo_lib.cpp: do not list files of a raster FileGDB unless -json …

…is enabled

apps/gdalinfo_lib.cpp

@@ -287,7 +287,12 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
                GDALGetDriverShortName(hDriver), GDALGetDriverLongName(hDriver));
     }
 
-    char **papszFileList = GDALGetFileList(hDataset);
+    // The list of files of a raster FileGDB is not super useful and potentially
+    // super long, so omit it, unless the -json mode is enabled
+    char **papszFileList =
+        (!bJson && EQUAL(GDALGetDriverShortName(hDriver), "OpenFileGDB"))
+            ? nullptr
+            : GDALGetFileList(hDataset);
 
     if (papszFileList == nullptr || *papszFileList == nullptr)
     {

autotest/ogr/ogr_openfilegdb.py

@@ -407,6 +407,10 @@ def test_ogr_openfilegdb_1(gdb_source):
     srs = osr.SpatialReference()
     srs.SetFromUserInput("WGS84")
 
+    assert gdal.OpenEx(filename, gdal.OF_RASTER) is None
+
+    assert gdal.OpenEx(filename, gdal.OF_RASTER | gdal.OF_VECTOR) is not None
+
     ds = ogr.Open(filename)
 
     for data in ogrtest.openfilegdb_datalist:

autotest/ogr/ogr_openfilegdb_write.py

@@ -83,7 +83,7 @@ def test_ogr_openfilegdb_write_empty():
     assert ds is not None
     ds = None
 
-    ds = ogr.Open(dirname)
+    ds = ogr.Open(dirname, update=1)
     assert ds is not None
     assert ds.GetLayerCount() == 0
     ds = None
@@ -3232,23 +3232,6 @@ def test_ogr_openfilegdb_write_emulated_transactions():
         # Implicit rollback
         ds = None
 
-        gdal.Mkdir(dirname + "/.ogrtransaction_backup", 0o755)
-        with gdaltest.error_handler():
-            # Cannot open in update mode with an existing backup directory
-            assert ogr.Open(dirname, update=1) is None
-
-            # Emit warning in read-only mode when opening with an existing backup directory
-            gdal.ErrorReset()
-            assert ogr.Open(dirname) is not None
-            assert "A previous backup directory" in gdal.GetLastErrorMsg()
-        gdal.Rmdir(dirname + "/.ogrtransaction_backup")
-
-        # Transaction not supported in read-only mode
-        ds = ogr.Open(dirname)
-        assert ds.TestCapability(ogr.ODsCEmulatedTransactions) == 0
-        with gdaltest.error_handler():
-            assert ds.StartTransaction(True) == ogr.OGRERR_FAILURE
-
         ds = ogr.Open(dirname, update=1)
         assert ds.StartTransaction(True) == ogr.OGRERR_NONE
         gdal.Rmdir(dirname + "/.ogrtransaction_backup")
@@ -3283,6 +3266,24 @@ def test_ogr_openfilegdb_write_emulated_transactions():
         assert gdal.VSIStatL(dirname + "/a0000000a.gdbtable") is not None
         ds = None
 
+        gdal.Mkdir(dirname + "/.ogrtransaction_backup", 0o755)
+        with gdaltest.error_handler():
+            # Cannot open in update mode with an existing backup directory
+            assert ogr.Open(dirname, update=1) is None
+
+            # Emit warning in read-only mode when opening with an existing backup directory
+            gdal.ErrorReset()
+            assert ogr.Open(dirname) is not None
+            assert "A previous backup directory" in gdal.GetLastErrorMsg()
+        gdal.Rmdir(dirname + "/.ogrtransaction_backup")
+
+        # Transaction not supported in read-only mode
+        ds = ogr.Open(dirname)
+        assert ds.TestCapability(ogr.ODsCEmulatedTransactions) == 0
+        with gdaltest.error_handler():
+            assert ds.StartTransaction(True) == ogr.OGRERR_FAILURE
+        ds = None
+
         ds = ogr.Open(dirname, update=1)
         assert ds.GetLayerCount() == 1
         lyr = ds.GetLayerByName("foo2")

doc/source/drivers/raster/index.rst

@@ -133,6 +133,7 @@ Raster drivers
    ntv2
    nwtgrd
    ogcapi
+   openfilegdb
    ozi
    palsar
    paux

doc/source/drivers/vector/openfilegdb.rst

@@ -1,7 +1,7 @@
 .. _vector.openfilegdb:
 
-ESRI File Geodatabase (OpenFileGDB)
-===================================
+ESRI File Geodatabase vector (OpenFileGDB)
+==========================================
 
 .. shortname:: OpenFileGDB
 
@@ -23,6 +23,8 @@ Curve in geometries are supported with GDAL >= 2.2.
 
 Write and update capabilities are supported since GDAL >= 3.6
 
+The driver also supports :ref:`raster layers<raster.openfilegdb>` since GDAL 3.7
+
 Driver capabilities
 -------------------
 
@@ -243,6 +245,7 @@ Examples
 Links
 -----
 
+-  :ref:`OpenFileGDB raster <raster.openfilegdb>` documentation page
 -  :ref:`FileGDB driver <vector.filegdb>`, relying on the FileGDB API SDK
 -  Reverse-engineered specification of the `FileGDB
    format <https://github.com/rouault/dump_gdbtable/wiki/FGDB-Spec>`__

ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp

@@ -123,6 +123,22 @@ static GDALDataset *OGRFileGDBDriverOpen(GDALOpenInfo *poOpenInfo)
         GDAL_IDENTIFY_FALSE)
         return nullptr;
 
+    // If this is a raster-only GDB, do not try to open it, to be consistent
+    // with OpenFileGDB behavior.
+    const char *const apszOpenFileGDBDriver[] = {"OpenFileGDB", nullptr};
+    auto poOpenFileGDBDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        pszFilename, GDAL_OF_RASTER, apszOpenFileGDBDriver, nullptr, nullptr));
+    if (poOpenFileGDBDS)
+    {
+        poOpenFileGDBDS.reset();
+        poOpenFileGDBDS = std::unique_ptr<GDALDataset>(
+            GDALDataset::Open(pszFilename, GDAL_OF_VECTOR,
+                              apszOpenFileGDBDriver, nullptr, nullptr));
+        if (!poOpenFileGDBDS)
+            return nullptr;
+    }
+    poOpenFileGDBDS.reset();
+
     const bool bUpdate = poOpenInfo->eAccess == GA_Update;
     long hr;
 

ogr/ogrsf_frmts/openfilegdb/CMakeLists.txt

@@ -14,7 +14,9 @@ add_gdal_driver(
           ogropenfilegdbdriver.cpp
           ogropenfilegdblayer.cpp
           ogropenfilegdblayer_write.cpp
+          gdalopenfilegdbrasterband.cpp
   PLUGIN_CAPABLE NO_DEPS STRONG_CXX_WFLAGS)
+
 gdal_standard_includes(ogr_OpenFileGDB)
 target_include_directories(ogr_OpenFileGDB PRIVATE $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
 

ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp

@@ -684,22 +684,6 @@ int FileGDBTable::ReadTableXHeader()
     return TRUE;
 }
 
-/************************************************************************/
-/*                            ReadUTF16String()                         */
-/************************************************************************/
-
-static std::string ReadUTF16String(const GByte *pabyIter, int nCarCount)
-{
-    std::wstring osWideStr;
-    for (int j = 0; j < nCarCount; j++)
-        osWideStr += pabyIter[2 * j] | (pabyIter[2 * j + 1] << 8);
-    char *pszStr =
-        CPLRecodeFromWChar(osWideStr.c_str(), CPL_ENC_UCS2, CPL_ENC_UTF8);
-    std::string osRet(pszStr);
-    CPLFree(pszStr);
-    return osRet;
-}
-
 /************************************************************************/
 /*                                 Open()                               */
 /************************************************************************/

ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h

@@ -31,6 +31,8 @@
 #define FILEGDBTABLE_PRIV_H_INCLUDED
 
 #include "filegdbtable.h"
+
+#include "cpl_conv.h"
 #include "cpl_error.h"
 #include "cpl_time.h"
 
@@ -334,6 +336,22 @@ inline void WriteVarInt(std::vector<GByte> &abyBuffer, int64_t nVal)
     WriteVarUInt(abyBuffer, nUVal);
 }
 
+/************************************************************************/
+/*                            ReadUTF16String()                         */
+/************************************************************************/
+
+inline std::string ReadUTF16String(const GByte *pabyIter, int nCarCount)
+{
+    std::wstring osWideStr;
+    for (int j = 0; j < nCarCount; j++)
+        osWideStr += pabyIter[2 * j] | (pabyIter[2 * j + 1] << 8);
+    char *pszStr =
+        CPLRecodeFromWChar(osWideStr.c_str(), CPL_ENC_UCS2, CPL_ENC_UTF8);
+    std::string osRet(pszStr);
+    CPLFree(pszStr);
+    return osRet;
+}
+
 /************************************************************************/
 /*                           WriteUTF16String()                         */
 /************************************************************************/