streamOpenReadQuery(): return CDI_EQNAVAIL for non NetCDF data.

src/cdi.h

@@ -59,6 +59,7 @@ extern "C" {
 #define  CDI_EUNC4                -26   // Unsupported NetCDF4 structure
 #define  CDI_EDIMSIZE             -27   // Invalid dimension size
 #define  CDI_EQENF                -50   // Query entries not found
+#define  CDI_EQNAVAIL             -51   // Query not available for file type
 #define  CDI_ELIMIT               -99   // Internal limits exceeded
 
 // File types

src/cdi_error.c

@@ -9,6 +9,7 @@ cdiStringError(int cdiErrno)
   // clang-format off
   static const char UnknownError[] = "Unknown Error";
   static const char _ETMOF[]       = "Too many open files";
+  static const char _EINVAL[]      = "Invalid argument";
   static const char _EISDIR[]      = "Is a directory";
   static const char _EISEMPTY[]    = "File is empty";
   static const char _EUFTYPE[]     = "Unsupported file type";
@@ -16,9 +17,9 @@ cdiStringError(int cdiErrno)
   static const char _EUFSTRUCT[]   = "Unsupported file structure";
   static const char _EUNC4[]       = "Unsupported NetCDF4 structure";
   static const char _EDIMSIZE[]    = "Invalid dimension size";
-  static const char _ELIMIT[]      = "Internal limits exceeded";
-  static const char _EINVAL[]      = "Invalid argument";
   static const char _EQENF[]       = "Query entries not found";
+  static const char _EQNAVAIL[]    = "Query not available for file type";
+  static const char _ELIMIT[]      = "Internal limits exceeded";
 
   switch (cdiErrno) {
   case CDI_ESYSTEM:
@@ -28,6 +29,7 @@ cdiStringError(int cdiErrno)
       return cp;
     }
   case CDI_ETMOF:      return _ETMOF;
+  case CDI_EINVAL:     return _EINVAL;
   case CDI_EISDIR:     return _EISDIR;
   case CDI_EISEMPTY:   return _EISEMPTY;
   case CDI_EUFTYPE:    return _EUFTYPE;
@@ -35,9 +37,9 @@ cdiStringError(int cdiErrno)
   case CDI_EUFSTRUCT:  return _EUFSTRUCT;
   case CDI_EUNC4:      return _EUNC4;
   case CDI_EDIMSIZE:   return _EDIMSIZE;
-  case CDI_ELIMIT:     return _ELIMIT;
-  case CDI_EINVAL:     return _EINVAL;
   case CDI_EQENF:      return _EQENF;
+  case CDI_EQNAVAIL:   return _EQNAVAIL;
+  case CDI_ELIMIT:     return _ELIMIT;
   }
   // clang-format on
   return UnknownError;

src/stream.c

@@ -846,6 +846,8 @@ streamOpenReadQuery(const char *filename, CdiQuery *query)
   int filetype = cdiGetFiletype(filename, &byteorder);
   if (filetype < 0) return filetype;
 
+  if (cdiBaseFiletype(filetype) != CDI_FILETYPE_NETCDF) return CDI_EQNAVAIL;
+
   int streamID = streamOpen(filename, "r", filetype);
   if (streamID >= 0)
     {