Changeset 1205

Timestamp:

06/02/09 17:16:11 (3 years ago)

Author:

Stuart Campbell

Message:

Merged latest changes to python binding from trunk. refs #115. fixes #160

File:

• branches/4.2/bindings/python/nxs/napi.py (modified) (15 diffs)

branches/4.2/bindings/python/nxs/napi.py

@@ -315 +315 @@
         self.isopen = True
 
-    def _getpath(self): 
-        return '/'+'/'.join(self._path)
+    def _getpath(self):
+        mypath = [level[0] for level in self._path]
+        return '/'+'/'.join(mypath)
     path = property(_getpath,doc="Unix-style path to node")
+
+    def _getlongpath(self):
+        mypath = [':'.join(level) for level in self._path]
+        return '/' + '/'.join(mypath)
+    longpath = property(_getlongpath, doc="Unix-style path including " \
+                        + "nxclass to the node")
 
     def __del__(self):
@@ -421 +428 @@
     def openpath(self, path):
         """
-        Open a particular group '/path/to/group'.  Paths can
-        be absolute or relative to the currently open group.
-        If openpath fails, then currently open path may not
-        be different from the starting path.
+        Open a particular group '/path/to/group'.  Paths can be
+        absolute or relative to the currently open group.  If openpath
+        fails, then currently open path may not be different from the
+        starting path. For better performation the types can be
+        specified as well using '/path:type1/to:type2/group:type3'
+        which will prevent searching the file for the types associated
+        with the supplied names.
 
         Raises ValueError.
@@ -437 +447 @@
         if path == '/':
             target = []
-        elif path.startswith('/'):
-            target = path[1:].split('/')
         else:
-            target = self._path + path.split('/')
+            if path.endswith("/"):
+                path = path[:-1]
+            if path.startswith('/'):
+                target = path[1:].split('/')
+            else:
+                target = self._path + path.split('/')
 
         # Remove relative path indicators from target
@@ -455 +468 @@
                 L.append(t)
         target = L
+
+        # split out nxclass from each level if available
+        L = []
+        for t in target:
+            try:
+                item = t.split(":")
+                if len(item) == 1:
+                    L.append((item[0], None))
+                else:
+                    L.append(tuple(item))
+            except AttributeError:
+                L.append(t)
+        target = L
+
         #print "current path",self._path
         #print "%s"%path,target
@@ -461 +488 @@
         up = []
         down = []
-        for i,name in enumerate(target):
+        for (i, (name, nxclass)) in enumerate(target):
             if i == len(self._path):
                 #print "target longer than current"
@@ -476 +503 @@
             up = self._path[len(target):]
             down = []
-        up.reverse()
+
+        # add more information to the down path
+        for i in xrange(len(down)):
+            try:
+                (name, nxclass) = down[i]
+            except ValueError:
+                down[i] = (down[i], None)
         #print "close,open",up,down
 
@@ -488 +521 @@
         # Open groups on the way down
         for target in down:
-            # Find target name in current group.  We need to do this because
-            # we can't open the group without knowing the class.  We also
-            # need the class so that we can handle SDS specially.
-            n,_,_ = self.getgroupinfo()
-            self.initgroupdir()
-            for i in range(n):
-                name,nxclass = self.getnextentry()
-                if name != target: continue
-                if nxclass != 'SDS':
-                    self.opengroup(name,nxclass)
-                elif opendata: 
-                    self.opendata(name)
-                break
+            (name, nxclass) = target
+            if nxclass is None:
+                nxclass = self.__getnxclass(name)
+            if nxclass != "SDS":
+                self.opengroup(name, nxclass)
+            elif opendata:
+                self.opendata(name)
             else:
                 raise ValueError("node %s not in %s"%(name,self.path))
@@ -520 +547 @@
     nxlib.nxiopengroup_.restype = c_int
     nxlib.nxiopengroup_.argtypes = [c_void_p, c_char_p, c_char_p]
-    def opengroup(self, name, nxclass):
-        """
-        Open the group nxclass:name.
+    def opengroup(self, name, nxclass=None):
+        """
+        Open the group nxclass:name. If the nxclass is not specified
+        this will search for it.
 
         Raises ValueError if the group could not be opened.
@@ -529 +557 @@
         """
         #print "open group",nxclass,name
+        if nxclass is None:
+            nxclass = self.__getnxclass(name)
         status = nxlib.nxiopengroup_(self.handle, name, nxclass)
         if status == ERROR:
             raise ValueError,\
                 "Could not open %s:%s in %s"%(nxclass,name,self._loc())
-        self._path.append(name)
+        self._path.append((name,nxclass))
 
     nxlib.nxiclosegroup_.restype = c_int
@@ -596 +626 @@
     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 +647 @@
         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 +657 @@
         #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 __getnxclass(self, target):
+        """
+        Return the nxclass of the supplied name.
+        """
+        self.initgroupdir()
+        while True:
+            (nxname, nxclass) = self.getnextentry()
+            if nxname == target:
+                return nxclass
+            if nxname is None:
+                break
+        raise NeXusError("Failed to find entry with name \"%s\" " \
+                         + "at %s" % (target, self.path))
 
     def entries(self):
@@ -711 +775 @@
         if status == ERROR:
             raise ValueError, "Could not open data %s: %s"%(name, self._loc())
-        self._path.append(name)
+        self._path.append((name,"SDS"))
         self._indata = True
 
@@ -942 +1006 @@
         storage = c_int(0)
         status = nxlib.nxigetnextattr_(self.handle,name,_ref(length),_ref(storage))
+        if status == EOD:
+            return (None, None, None)
         if status == ERROR or status == EOD:
             raise NeXusError, "Could not get next attr: %s"%(self._loc())
@@ -1020 +1086 @@
         if status == ERROR:
             raise NeXusError, "Could not write attr %s: %s"%(name,self._loc())
+
+    def getattrs(self):
+        """
+        Returns a dicitonary of the attributes on the current node.
+
+        This is a second form of attrs(self).
+        """
+        result = {}
+        for (name, value) in self.attrs():
+            result[name] = value
+        return result
 
     def attrs(self):