Changeset 1190

Timestamp:

03/02/09 22:06:37 (3 years ago)

Author:

Peter Peterson

Message:

Added small optimization to get search for the type of a supplied entry name rather than parsing whole level of tree. Refs #101.

File:

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

trunk/bindings/python/nxs/napi.py

@@ -517 +517 @@
             (name, nxclass) = target
             if nxclass is None:
-                entries = self.getentries()
-                if not entries.has_key(name):
+                nxclass = self.__getnxclass(name)
+                if nxclass is None:
                     raise KeyError("Failed to find entry with name \"%s\"" \
                                    % name)
-                nxclass = entries[name]
             if nxclass != "SDS":
                 self.opengroup(name, nxclass)
@@ -556 +555 @@
         #print "open group",nxclass,name
         if nxclass is None:
-            listing = self.getentries()
-            if not listing.has_key(name):
+            nxclass = self.__getnxclass(name)
+            if nxclass is None:
                 raise KeyError("file does not have \"%s\" at this level" \
                                % name)
-            nxclass = listing[name]
         status = nxlib.nxiopengroup_(self.handle, name, nxclass)
         if status == ERROR:
@@ -676 +674 @@
             (name, nxclass) = self.getnextentry()
         return result
+
+    def __getnxclass(self, name):
+        """
+        Return the nxclass of the supplied name.
+        """
+        self.initgroupdir()
+        (myname, nxclass) = self.getnextentry()
+        if (myname, nxclass) != (None, None):
+            if myname == name:
+                return nxclass
+        while (myname, nxclass) != (None, None):
+            (myname, nxclass) = self.getnextentry()
+            if myname == name:
+                return nxclass
+        return None
 
     def entries(self):