Changeset 1222

Timestamp:

08/04/09 01:14:55 (3 years ago)

Author:

Paul Kienzle

Message:

python binding requires matched open/close data to maintain path. Refs #101.

Location:

trunk/bindings/python

Files:

• nxs/napi.py (modified) (3 diffs)
• nxstest.py (modified) (1 diff)

trunk/bindings/python/nxs/napi.py

@@ -577 +577 @@
         """
         #print "closegroup"
+        if self._indata:
+            raise NeXusError, "Close data before group at %s"%(self._loc())
         status = nxlib.nxiclosegroup_(self.handle)
         if status == ERROR:
-            raise NeXusError, "Could not close group at %s"%(name,self._loc())
+            raise NeXusError, "Could not close group at %s"%(self._loc())
         self._path.pop()
 
@@ -809 +811 @@
         """
         #print "opendata",self._loc(),name
-        status = nxlib.nxiopendata_(self.handle, name)
+        if self._indata:
+            status = ERROR
+        else:
+            status = nxlib.nxiopendata_(self.handle, name)
         if status == ERROR:
             raise ValueError, "Could not open data %s: %s"%(name, self._loc())
@@ -830 +835 @@
         if status == ERROR:
             raise NeXusError,\
-                "Could not close data at %s"%(name,self._loc())
+                "Could not close data at %s"%(self._loc())
         self._path.pop()
         self._indata = False

trunk/bindings/python/nxstest.py

@@ -132 +132 @@
     # .. demonstrate extensible data
     file.makedata('flush_data','int32',[nxs.UNLIMITED])
+    file.opendata('flush_data')
     for i in range(7):
-        file.opendata('flush_data')
         file.putslab(i,[i],[1])
-        file.flush()
-        # Oops... why isn't there a closedata()?
+    file.closedata()
+    file.flush()
     file.closegroup()