Bug fix for codecs gt 64 in a dataset

das-developers · Jun 12, 2024 · 0263767 · 0263767
1 parent a831ea7
commit 0263767
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/das2/codec.c b/das2/codec.c
@@ -245,15 +245,15 @@ DasErrCode DasCodec_init(
 
 	UNSUPPORTED:
 	if(bDateTime)
-		return das_error(DASERR_ENC, "Can not encode/decode datetime data from buffers "
-			"with encoding '%s' for items of %hs bytes each to/from an array of "
-			" '%s' type elements with time units of '%s'", sEncType, nSzEach, 
-			das_vt_toStr(vtAry), epoch == NULL ? "none" : Units_toStr(epoch)
+		return das_error(DASERR_ENC, "For array %s: Can not encode/decode datetime data from buffers "
+			"with encoding '%s' for items of %hd bytes each to/from an array of "
+			" '%s' type elements with time units of '%s'", DasAry_id(pAry), sEncType,
+			nSzEach,  das_vt_toStr(vtAry), epoch == NULL ? "none" : Units_toStr(epoch)
 		);
 	else
-		return das_error(DASERR_ENC, "Can not encode/decode '%s' data from buffers "
-			"with encoding '%s' for items of %hs bytes each to/from an array of "
-			" '%s' type elements", sSemantic, sEncType, nSzEach, das_vt_toStr(vtAry)
+		return das_error(DASERR_ENC, "For array %s: Can not encode/decode '%s' data from buffers "
+			"with encoding '%s' for items of %hd bytes each to/from an array of "
+			" '%s' type elements", DasAry_id(pAry), sSemantic, sEncType, nSzEach, das_vt_toStr(vtAry)
 		);
 }
 

diff --git a/utilities/das3_cdf.c b/utilities/das3_cdf.c
@@ -141,7 +141,7 @@ void prnHelp()
 "      summary               -> CATDESC\n"
 "      notes                 -> VAR_NOTES\n"
 "      format                -> FORMAT\n"
-"      frame                 -> VECTOR_FRAME\n"
+"      frame                 -> REFERENCE_FRAME\n"
 "      nominalMin,nominalMax -> LIMITS_NOMINAL_MIN,LIMITS_NOMINAL_MAX\n"
 "      scaleMin,scaleMax     -> SCALEMIN,SCALEMAX\n"
 "      scaleType             -> SCALETYP\n"
@@ -476,7 +476,7 @@ const char* DasProp_cdfVarName(const DasProp* pProp)
 	if(strcmp(sName, "info"       ) == 0) return "VAR_NOTES";
 	if(strcmp(sName, "notes"      ) == 0) return "VAR_NOTES";
 
-	if(strcmp(sName, "frame"      ) == 0) return "VECTOR_FRAME";
+	if(strcmp(sName, "frame"      ) == 0) return "REFERENCE_FRAME";
 
 	if(strcmp(sName, "fill"       ) == 0) return "FILLVAL";
 	if(strcmp(sName, "format"     ) == 0) return "FORMAT";