h5exists, ncexists: correct/simplify

Author: scivision

+stdlib/h5exists.m

@@ -18,15 +18,10 @@
   h5info(file, variable);
   exists = true;
 catch e
-  if stdlib.isoctave
-    disp(e.message)
-    if strcmp(e.identifier, "Octave:undefined-function") || isempty(strfind(e.message, 'does not exist'))
-      rethrow(e)
-    end
-  else
-    if ~strcmp(e.identifier, 'MATLAB:imagesci:h5info:unableToFind')
-      rethrow(e)
-    end
+  if ~strcmp(e.identifier, 'MATLAB:imagesci:h5info:unableToFind') && ...
+     ~strncmp(e.message, "h5info: location", 16)
+    disp(e)
+    rethrow(e)
   end
 end
 
@@ -38,4 +33,5 @@
 %! ds = '/a';
 %! h5create(fn, ds, [1])
 %! assert(h5exists(fn, ds))
+%! assert(!h5exists(fn, '/b'))
 %! delete(fn)

+stdlib/ncexists.m

@@ -19,7 +19,8 @@
   exists = true;
 catch e
   if ~strcmp(e.identifier, "MATLAB:imagesci:netcdf:badLocationString") && ...
-     ~strcmp(e.identifier, "MATLAB:imagesci:netcdf:unknownLocation")
+     ~strcmp(e.identifier, "MATLAB:imagesci:netcdf:unknownLocation") && ...
+     ~strcmp(e.message, "NetCDF: Variable not found")
 
     rethrow(e)
   end
@@ -34,4 +35,5 @@
 %! ds = 'a';
 %! nccreate(fn, ds)
 %! assert(ncexists(fn, ds))
+%! assert(!ncexists(fn, 'b'))
 %! delete(fn)