Remove hard coded dataset name, add dataset selection from stage options

PDAL · Jan 30, 2020 · 800712e · 800712e
1 parent 929fc3f
commit 800712e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/plugins/hdf/io/Hdf5Handler.cpp b/plugins/hdf/io/Hdf5Handler.cpp
@@ -68,14 +68,15 @@ Hdf5Handler::Hdf5Handler()
 { }
 
 void Hdf5Handler::initialize(
-        const std::string& filename)
+        const std::string& filename,
+        const std::string& datasetName)
 {
     try
     {
         m_h5File.reset(new H5::H5File(filename, H5F_ACC_RDONLY));
 
         std::cout << "Number of HD5 Objects: " << m_h5File.get()->getObjCount() <<std::endl;
-        H5::DataSet dset = m_h5File.get()->openDataSet("/autzen");
+        H5::DataSet dset = m_h5File.get()->openDataSet(datasetName);
         H5::DataSpace dspace = dset.getSpace();
         m_numPoints = dspace.getSelectNpoints();
         std::cout << "--" << m_numPoints << "--" << std::endl;

diff --git a/plugins/hdf/io/Hdf5Handler.hpp b/plugins/hdf/io/Hdf5Handler.hpp
@@ -103,7 +103,8 @@ class Hdf5Handler
     Hdf5Handler();
 
     void initialize(
-            const std::string& filename);
+            const std::string& filename,
+            const std::string& datasetName);
             // const std::vector<hdf5::Hdf5ColumnData>& columns);
     void close();
 

diff --git a/plugins/hdf/io/HdfReader.cpp b/plugins/hdf/io/HdfReader.cpp
@@ -273,7 +273,7 @@ void HdfReader::initialize()
     {
         throwError("Invalid metadata file: '" + m_metadataFile + "'");
     }
-    m_hdf5Handler.initialize(m_filename);
+    m_hdf5Handler.initialize(m_filename, m_datasetName);
 
     // Data are WGS84 (4326) with ITRF2000 datum (6656)
     // See http://nsidc.org/data/docs/daac/icebridge/ilvis2/index.html for