From 67d1099ff69106b449eee18a710699e681f6242b Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Mon, 23 Oct 2023 14:29:03 -0600
Subject: [PATCH] test2

---
 nczarr_test/ref_jsonconvention.zmap | 10 +++++-----
 nczarr_test/test_nczarr.sh          |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nczarr_test/ref_jsonconvention.zmap b/nczarr_test/ref_jsonconvention.zmap
index c029dff684..0b6204ed03 100644
--- a/nczarr_test/ref_jsonconvention.zmap
+++ b/nczarr_test/ref_jsonconvention.zmap
@@ -1,5 +1,5 @@
-[0] /.zattrs : (354) |{"globalfloat": 1, "globalfloatvec": [1,2], "globalchar": "abc", "globalillegal": "[ [ 1.0, 0.0, 0.0 ], [ 0.0, 1.0, 0.0 ], [ 0.0, 0.0, 1.0 ", "_NCProperties": "version=2,netcdf=0.0.0,nczarr=0.0.0", "_nczarr_attr": {"types": {"globalfloat": "<f8", "globalfloatvec": "<f8", "globalchar": ">S1", "globalillegal": ">S1", "_NCProperties": ">S1"}}}|
-[1] /.zgroup : (142) |{"zarr_format": 2, "_nczarr_superblock": {"version": "0.0.0", "format": 2}, "_nczarr_group": {"dims": {"d1": 1}, "vars": ["v"], "groups": []}}|
-[3] /v/.zarray : (202) |{"zarr_format": 2, "shape": [1], "dtype": "<i4", "chunks": [1], "fill_value": -2147483647, "order": "C", "compressor": null, "filters": null, "_nczarr_array": {"dimrefs": ["/d1"], "storage": "chunked"}}|
-[4] /v/.zattrs : (296) |{"varjson1": {"key1": [1,2,3], "key2": {"key3": "abc"}}, "varjson2": [[1.0,0.0,0.0],[0.0,1.0,0.0],[0.0,0.0,1.0]], "varvec1": "1.0, 0.0, 0.0", "varvec2": [0.,0.,1.], "_ARRAY_DIMENSIONS": ["d1"], "_nczarr_attr": {"types": {"varjson1": ">S1", "varjson2": ">S1", "varvec1": ">S1", "varvec2": ">S1"}}}|
-[5] /v/0 : (4) (ubyte) |...|
+[0] /.zattrs : () |{"globalfloat": 1, "globalfloatvec": [1,2], "globalchar": "abc", "globalillegal": "[ [ 1.0, 0.0, 0.0 ], [ 0.0, 1.0, 0.0 ], [ 0.0, 0.0, 1.0 ", "_NCProperties": "version=2,netcdf=0.0.0,nczarr=0.0.0", "_nczarr_attr": {"types": {"globalfloat": "<f8", "globalfloatvec": "<f8", "globalchar": ">S1", "globalillegal": ">S1", "_NCProperties": ">S1"}}}|
+[1] /.zgroup : () |{"zarr_format": 2, "_nczarr_superblock": {"version": "0.0.0", "format": 2}, "_nczarr_group": {"dims": {"d1": 1}, "vars": ["v"], "groups": []}}|
+[3] /v/.zarray : () |{"zarr_format": 2, "shape": [1], "dtype": "<i4", "chunks": [1], "fill_value": -2147483647, "order": "C", "compressor": null, "filters": null, "_nczarr_array": {"dimrefs": ["/d1"], "storage": "chunked"}}|
+[4] /v/.zattrs : () |{"varjson1": {"key1": [1,2,3], "key2": {"key3": "abc"}}, "varjson2": [[1.0,0.0,0.0],[0.0,1.0,0.0],[0.0,0.0,1.0]], "varvec1": "1.0, 0.0, 0.0", "varvec2": [0.,0.,1.], "_ARRAY_DIMENSIONS": ["d1"], "_nczarr_attr": {"types": {"varjson1": ">S1", "varjson2": ">S1", "varvec1": ">S1", "varvec2": ">S1"}}}|
+[5] /v/0 : () (ubyte) |...|
diff --git a/nczarr_test/test_nczarr.sh b/nczarr_test/test_nczarr.sh
index 3ba83d18f8..d68e305753 100755
--- a/nczarr_test/test_nczarr.sh
+++ b/nczarr_test/test_nczarr.sh
@@ -125,6 +125,7 @@ sed -i.bak -e '/_global attributes:/d' $1
 # Function to rewrite selected key values in a zmapio output.
 # because these values might be platform dependent
 zmapclean() {
+sed -i.bak -e 's|^\([^(]*\)([0-9][0-9]*)|\1()|' $1
 sed -i.bak -e 's/"_NCProperties":[ ]*"version=\([0-9]\),[^"]*"/"_NCProperties": "version=\1,netcdf=0.0.0,nczarr=0.0.0"/g' $1
 sed -i.bak -e 's/"_nczarr_superblock":[ ]*{[^}]*}/"_nczarr_superblock": {"version": "0.0.0", "format": 2}/g' $1
 sed -i.bak -e 's/"_nczarr_superblock":[ ]*{[^}]*}/"_nczarr_superblock": {"version": "0.0.0", "format": 2}/g' $1