From 5cc757bed38c30c0d835e791214045049f900fd8 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 2 Aug 2023 13:09:25 +0000
Subject: [PATCH] ECC-1654: Error setting key of type 'codetable' as a string

---
 src/grib_accessor_class_codetable.cc | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/grib_accessor_class_codetable.cc b/src/grib_accessor_class_codetable.cc
index 9ac580f85..1130de40d 100644
--- a/src/grib_accessor_class_codetable.cc
+++ b/src/grib_accessor_class_codetable.cc
@@ -627,11 +627,27 @@ static int value_count(grib_accessor* a, long* count)
     return 0;
 }
 
+static bool is_number(const char* input, size_t len)
+{
+    size_t i = 0;
+    for (i=0; i<len; ++i) {
+        char c = input[i];
+        if (c && !isdigit(c))
+            return false;
+    }
+    return true;
+}
 static int pack_string(grib_accessor* a, const char* buffer, size_t* len)
 {
+    long lValue = 0;
+    if (is_number(buffer, *len) && string_to_long(buffer, &lValue) == GRIB_SUCCESS) {
+        // ECC-1654: If value is a pure number, just pack as long
+        size_t l = 1;
+        return grib_pack_long(a, &lValue, &l);
+    }
+
     grib_accessor_codetable* self = (grib_accessor_codetable*)a;
     grib_codetable* table;
-
     long i;
     size_t size = 1;