HYRAX-1261, try to fix structure reading for dap4.

OPENDAP · Jan 4, 2024 · 5b419ac · 5b419ac
1 parent e6b45ff
commit 5b419ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/Constructor.cc b/Constructor.cc
@@ -524,6 +524,9 @@ Constructor::compute_checksum(Crc32 &)
 void
 Constructor::intern_data()
 {
+    if (!read_p())
+        read();  // read() throws Error
+
     for (auto var: d_vars) {
         if (var->send_p()) {
             var->intern_data(/*checksum, dmr, eval*/);

diff --git a/Structure.cc b/Structure.cc
@@ -434,27 +434,6 @@ Structure::width(bool constrained)
 }
 #endif
 
-void
-Structure::intern_data(ConstraintEvaluator & eval, DDS & dds)
-{
-    DBG(cerr << "Structure::intern_data: " << name() << endl);
-    if (is_dap4())
-        throw Error(string("A method usable only with DAP2 variables was called on a DAP4 variable (").append(name()).append(")."), __FILE__, __LINE__);
-
-    if (!read_p())
-        read();          // read() throws Error and InternalErr
-
-#if 0
-    for (auto var: d_vars) {
-        if (var->send_p()) {
-            var->intern_data(eval, dds);
-        }
-    }
-#endif
-
-}
-
-
 #if 0
 void
 Structure::intern_data(ConstraintEvaluator & eval, DDS & dds)

diff --git a/Structure.h b/Structure.h
@@ -104,7 +104,6 @@ class Structure: public Constructor
 
     virtual void dump(ostream &strm) const ;
 
-    void intern_data(ConstraintEvaluator &eval, DDS &dds) override;
 };
 
 } // namespace libdap