Changeset 1184

Timestamp:

03/02/09 16:08:19 (3 years ago)

Author:

Peter Peterson

Message:

Changed exception on EOD in getnext entry to return tuple and added function to get listing of all entries at the current level. Refs #101.

File:

• trunk/bindings/python/nxs/napi.py (modified) (3 diffs)

trunk/bindings/python/nxs/napi.py

@@ -596 +596 @@
     def getnextentry(self):
         """
-        Return the next entry in the group as name,nxclass tuple.
-
-        Raises NeXusError if this fails, or if there is no next entry.
+        Return the next entry in the group as name,nxclass tuple. If
+        end of data is reached this returns the tuple (None, None)
+
+        Raises NeXusError if this fails.
 
         Corresponds to NXgetnextentry(handle,name,nxclass,&storage).
@@ -616 +617 @@
         storage = c_int(0)
         status = nxlib.nxigetnextentry_(self.handle,name,nxclass,_ref(storage))
-        if status == ERROR or status == EOD:
+        if status == EOD:
+            return (None, None)
+        if status == ERROR:
             raise NeXusError, \
                 "Could not get next entry: %s"%(self._loc())
@@ -624 +627 @@
         #print "group next",nxclass.value, name.value, storage.value
         return name.value,nxclass.value
+
+    def getentries(self):
+        """
+        Return a dictionary of the groups[name]=type below the
+        existing open one.
+
+        Raises NeXusError if this fails.
+        """
+        self.initgroupdir()
+        result = {}
+        (name, nxclass) = self.getnextentry()
+        if (name, nxclass) != (None, None):
+            result[name] = nxclass
+        while (name, nxclass) != (None, None):
+            result[name] = nxclass
+            (name, nxclass) = self.getnextentry()
+        return result
 
     def entries(self):