Remove metkit/codes/GribAccessor

Author: pgeier

src/metkit/CMakeLists.txt

@@ -137,8 +137,6 @@ if ( HAVE_GRIB )
         codes/BufrContent.h
         codes/CodesSplitter.cc
         codes/CodesSplitter.h
-        codes/GribAccessor.cc
-        codes/GribAccessor.h
         codes/GribHandle.cc
         codes/GribHandle.h
         codes/GribIterator.cc

src/metkit/codes/GribAccessor.cc

@@ -16,7 +16,6 @@
 #include "eckit/io/DataHandle.h"
 #include "eckit/io/StdFile.h"
 
-#include "metkit/codes/GribAccessor.h"
 
 using namespace std;
 
@@ -103,7 +102,12 @@ GribHandle::~GribHandle() noexcept(false) {
 
 std::string GribHandle::geographyHash() const {
     // The following key is edition independent
-    return GribAccessor<std::string>("md5GridSection")(*this);
+    std::string ret;
+    std::size_t keylen = 1024;
+    ret.resize(keylen);
+    CODES_CALL(codes_get_string(raw(), "md5GridSection", ret.data(), &keylen));
+    ret.resize(strlen(ret.c_str()));
+    return ret;
 }
 
 size_t GribHandle::getDataValuesSize() const {

src/metkit/codes/GribAccessor.h

@@ -25,7 +25,6 @@ namespace metkit {
 namespace grib {
 
 class GribMetaData;
-class GribAccessorBase;
 class GribMutatorBase;
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -95,7 +94,6 @@ class GribHandle : private eckit::NonCopyable {
 
 protected:  // methods
 
-    friend class GribAccessorBase;
     friend class GribMutatorBase;
     friend class GribIterator;
 

src/metkit/codes/GribHandle.cc

@@ -9,9 +9,10 @@
  */
 
 #include "metkit/pointdb/GribFieldInfo.h"
-#include <bitset>
-#include "metkit/codes/GribAccessor.h"
 #include "metkit/pointdb/GribDataSource.h"
+#include "metkit/codes/api/CodesAPI.h"
+
+#include <bitset>
 
 using namespace eckit;
 using namespace metkit::grib;
@@ -25,17 +26,6 @@ double grib_power(long s, long n);
 namespace metkit {
 namespace pointdb {
 
-static GribAccessor<long> bitmapPresent("bitmapPresent");
-static GribAccessor<long> binaryScaleFactor("binaryScaleFactor");
-static GribAccessor<long> decimalScaleFactor("decimalScaleFactor");
-static GribAccessor<unsigned long> bitsPerValue("bitsPerValue");
-static GribAccessor<double> referenceValue("referenceValue");
-static GribAccessor<unsigned long> offsetBeforeData("offsetBeforeData");
-static GribAccessor<unsigned long> offsetBeforeBitmap("offsetBeforeBitmap");
-static GribAccessor<unsigned long> numberOfValues("numberOfValues");
-static GribAccessor<unsigned long> numberOfDataPoints("numberOfDataPoints");
-static GribAccessor<long> sphericalHarmonics("sphericalHarmonics");
-
 static Mutex mutex;
 
 #define MISSING 9999
@@ -63,23 +53,23 @@ GribFieldInfo::GribFieldInfo() :
     numberOfDataPoints_(0),
     sphericalHarmonics_(0) {}
 
-void GribFieldInfo::update(const GribHandle& h) {
-    binaryScaleFactor_  = binaryScaleFactor(h);
-    decimalScaleFactor_ = decimalScaleFactor(h);
-    bitsPerValue_       = bitsPerValue(h);
-    referenceValue_     = referenceValue(h);
-    offsetBeforeData_   = offsetBeforeData(h);
-    numberOfDataPoints_ = numberOfDataPoints(h);
-    numberOfValues_     = numberOfValues(h);
-    sphericalHarmonics_ = sphericalHarmonics(h);
-
-    if (bitmapPresent(h))
-        offsetBeforeBitmap_ = offsetBeforeBitmap(h);
+void GribFieldInfo::update(const codes::CodesHandle& h) {
+    binaryScaleFactor_  = h.getLong("binaryScaleFactor");
+    decimalScaleFactor_ = h.getLong("decimalScaleFactor");
+    bitsPerValue_       = h.getLong("bitsPerValue");
+    referenceValue_     = h.getDouble("referenceValue");
+    offsetBeforeData_   = h.getLong("offsetBeforeData");
+    numberOfDataPoints_ = h.getLong("numberOfDataPoints");
+    numberOfValues_     = h.getLong("numberOfValues");
+    sphericalHarmonics_ = h.getLong("sphericalHarmonics");
+
+    if (h.getLong("bitmapPresent"))
+        offsetBeforeBitmap_ = h.getLong("offsetBeforeBitmap");
     else
         offsetBeforeBitmap_ = 0;
 
     if (!sphericalHarmonics_)
-        geographyHash_ = h.geographyHash();
+        geographyHash_ = h.getString("md5GridSection");
 }
 
 void GribFieldInfo::print(std::ostream& s) const {

src/metkit/codes/GribHandle.h

@@ -11,11 +11,15 @@
 #ifndef FieldInfoData_H
 #define FieldInfoData_H
 
+
+#include "metkit/codes/api/CodesAPI.h"
+
 #include "eckit/io/Length.h"
 #include "eckit/io/Offset.h"
 #include "eckit/types/FixedString.h"
 
 
+
 namespace eckit {
 class PathName;
 }
@@ -40,7 +44,7 @@ class GribFieldInfo {
 
     bool ready() const { return numberOfValues_ > 0; }
 
-    void update(const grib::GribHandle& h);
+    void update(const codes::CodesHandle& h);
 
     double value(const GribDataSource&, size_t index) const;