Changeset 1375 for trunk/bindings

Timestamp:

29/10/09 10:59:48 (3 years ago)

Author:

Mark Koennecke

Message:

• Implemented NXgetpath for C, C++, Java, SWIG and F77, refs #199
• Python still needs to be done but I think python has an own implementation.
• I added to the test code: now as they are based on text comparison all of them fail :-(

Location:

trunk/bindings

Files:

• cpp/NeXusFile.cpp (modified) (1 diff)
• cpp/NeXusFile.hpp (modified) (1 diff)
• f77/napif.f (modified) (1 diff)
• f77/napif.inc (modified) (3 diffs)
• idl/NeXusIDL-API.c (modified) (2 diffs)
• idl/NeXusIDL-API.dlm (modified) (1 diff)
• java/native/NexusFile.c (modified) (2 diffs)
• java/org/nexusformat/NeXusFileInterface.java (modified) (1 diff)
• java/org/nexusformat/NexusFile.java (modified) (2 diffs)
• swig/nxinter.i (modified) (1 diff)
• swig/nxinterhelper.c (modified) (1 diff)
• swig/nxinterhelper.h (modified) (1 diff)

trunk/bindings/cpp/NeXusFile.cpp

@@ -230 +230 @@
     throw Exception(msg.str(), status);
   }
+}
+
+std::string File::getPath(){
+  char cPath[1024];
+
+  memset(cPath,0,1024*sizeof(char));
+  NXstatus status = NXgetpath(this->m_file_id,cPath, 1024);
+  if (status != NX_OK) {
+    stringstream msg;
+    msg << "NXgetpath() failed";
+    throw Exception(msg.str(), status);
+  }
+  return std::string(cPath);
 }
 

trunk/bindings/cpp/NeXusFile.hpp

@@ -191 +191 @@
      */
     void openGroupPath(const std::string& path);
+    /**
+     * Get the path into the current file
+     * \return A unix like path string pointing to the current 
+     *         position in the file
+     */
+    std::string  getPath();
 
     /**

trunk/bindings/f77/napif.f

@@ -121 +121 @@
       CALL EXTRACT_STRING(IPATH, 256, PATH)
       NXOPENPATH = NXIOPENPATH(FILEID, IPATH)
+      END
+
+      INTEGER FUNCTION NXGETPATH(FILEID, PATH)
+      INTEGER FILEID(*),NXIGETPATH, NXIFGETPATH
+      CHARACTER*(*) PATH
+      INTEGER*1 IPATH(1024)
+      INTEGER PLEN
+      EXTERNAL NXIFGETPATH
+      PLEN = 1024
+      NXGETPATH = NXIFGETPATH(FILEID,IPATH,PLEN)
+      CALL REPLACE_STRING(PATH,IPATH)
       END
 

trunk/bindings/f77/napif.inc

@@ -36 +36 @@
 C *** large enough to hold an NXhandle structure
       INTEGER NXHANDLESIZE
-      PARAMETER(NXHANDLESIZE=5120)
+C      PARAMETER(NXHANDLESIZE=5120)
+      PARAMETER(NXHANDLESIZE=9058)
 C *** NXLINKSIZE is (at least) the size of an INTEGER*4 array that can hold
 C *** an NXlink structure: we'll assume 64bit alignment of structure members for safety
@@ -79 +80 @@
      +       NXINITATTRDIR, NXFLUSH, NXCOMPMAKEDATA, NXOPENPATH,
      +       NXSETNUMBERFORMAT, NXOPENGROUPPATH, NXOPENSOURCEGROUP,
-     +       NXMAKENAMEDLINK
+     +       NXMAKENAMEDLINK, NXGETPATH
       LOGICAL NXSAMEID
       EXTERNAL NXOPEN, NXCLOSE, NXMAKEGROUP, NXOPENGROUP, NXCLOSEGROUP,
@@ -91 +92 @@
      +       NXOPENPATH,NXSETNUMBERFORMAT, NXOPENGROUPPATH,
      +       NXOPENSOURCEGROUP, NXINQUIREFILE, NXISEXTERNALGROUP, 
-     +       NXLINKEXTERNAL, NXMAKENAMEDLINK
+     +       NXLINKEXTERNAL, NXMAKENAMEDLINK, NXGETPATH

trunk/bindings/idl/NeXusIDL-API.c

@@ -217 +217 @@
 
   return IDL_GettmpInt(status);
+}
+/*======================================================================
+ * NXgetpath
+ * string = NXgetpath(file_id)
+ *======================================================================*/
+static IDL_VPTR NXgetpath_this(int argc, IDL_VPTR *argv)
+{
+  int fileid;
+  NXhandle hHandle;
+  int iHandle, status;
+  char path[1024];
+
+  if (argc != 1) {
+        IDL_Message(IDL_M_NAMED_GENERIC, IDL_MSG_INFO, "One argument expected");
+        return IDL_StrToSTRING("One argument expected");
+        }
+
+  IDL_ENSURE_SCALAR(argv[0]);
+
+  fileid = (int)IDL_LongScalar(argv[0]);
+
+  if(HHCheckIfHandleExists(fileid) == -1) {
+        IDL_Message(IDL_M_NAMED_GENERIC, IDL_MSG_INFO, "Unknown file id");
+        return IDL_StrToSTRING("ERROR: Unknown file ID");
+        }
+
+  hHandle = HHGetPointer(fileid);
+  NXMSetError(NULL,idlError);
+
+  status = NXgetpath(hHandle,path,1024);
+  if(status == NX_ERROR){
+        IDL_Message(IDL_M_NAMED_GENERIC, IDL_MSG_INFO, nexusError);
+        return IDL_StrToSTRING(nexusError);
+  }
+   return IDL_StrToSTRING(path);
 }
 
@@ -2549 +2584 @@
     { NXsetnumberformat_this, "NXSETNUMBERFORMAT", 0, IDL_MAXPARAMS, 0, 0},
     { NXopenpath_this, "NXOPENPATH", 0, IDL_MAXPARAMS, 0, 0},
-        { NXopengrouppath_this, "NXOPENGROUPPATH", 0, IDL_MAXPARAMS, 0, 0},
+    { NXopengrouppath_this, "NXOPENGROUPPATH", 0, IDL_MAXPARAMS, 0, 0},
+    { NXgetpath_this, "NXGETPATH", 0, IDL_MAXPARAMS, 0, 0},
     { NXmakegroup_this, "NXMAKEGROUP", 0, IDL_MAXPARAMS, 0, 0},
     { NXopengroup_this, "NXOPENGROUP", 0, IDL_MAXPARAMS, 0, 0},

trunk/bindings/idl/NeXusIDL-API.dlm

@@ -8 +8 @@
 FUNCTION        NXOPENPATH 0    IDL_MAXPARAMS
 FUNCTION        NXOPENGROUPPATH 0       IDL_MAXPARAMS
+FUNCTION        NXGETPATH       0       IDL_MAXPARAMS
 FUNCTION        NXMAKEGROUP 0   IDL_MAXPARAMS
 FUNCTION        NXCLOSEGROUP 0  IDL_MAXPARAMS

trunk/bindings/java/native/NexusFile.c

@@ -23 +23 @@
 
    Added NXinitattrdir and NXinitgroupdir, Mark Koennecke, October 2009
+
+   Added NXgetpath, Mark Koennecke, October 2009
 
    IMPLEMENTATION NOTES
@@ -307 +309 @@
     (*env)->ReleaseStringUTFChars(env,path, nxpath);
 }
+/*-----------------------------------------------------------------------*/
+JNIEXPORT jstring JNICALL Java_org_nexusformat_NexusFile_nxgetpath
+  (JNIEnv *env, jobject obj, jint handle)
+{
+    NXhandle nxhandle;
+    int iRet;
+    char path[1024];
+
+    /* set error handler */
+    NXMSetError(env,JapiError);
+
+    /* exchange the Java handler to a NXhandle */
+    nxhandle =  (NXhandle)HHGetPointer(handle);
+
+    iRet = NXgetpath(nxhandle, path,1024);
+    
+    return (*env)->NewStringUTF(env,path);
+}
+
 /*------------------------------------------------------------------------
                      nxclosegroup

trunk/bindings/java/org/nexusformat/NeXusFileInterface.java

@@ -89 +89 @@
     public void opengrouppath(String path) throws 
                            NexusException;
+    /**
+     * return the current path into the NeXus file in the 
+     * form of a Unix path string.
+     * @return A unix path string
+     */
+    public String getpath() throws NexusException;
     /**
       * closegroup closes access to the current group and steps down one

trunk/bindings/java/org/nexusformat/NexusFile.java

@@ -186 +186 @@
     protected native void nxopengrouppath(int handle, String path);
     protected native void nxclosegroup(int handle);
+    protected native String nxgetpath(int handle);
 
     /** 
@@ -246 +247 @@
         nxopengrouppath(handle,path);
     }
-
+    /**
+     * return the current path into the NeXus file in the 
+     * form of a Unix path string.
+     * @return A unix path string
+     */
+    public String getpath() throws NexusException 
+    {
+        if(handle < 0) throw new NexusException("NAPI-ERROR: File not open");
+        return nxgetpath(handle);
+    }
     /**
       * closegroup closes access to the current group and steps down one

trunk/bindings/swig/nxinter.i

@@ -57 +57 @@
 extern int nx_openpath(void *handle, char *path);
 extern int nx_opengrouppath(void *handle, char *path);
+extern char *nx_getpath(void *handle);
 extern int nx_closegroup(void *handle);
 extern char *nx_getnextentry(void *handle, char separator);

trunk/bindings/swig/nxinterhelper.c

@@ -114 +114 @@
 }
 /*--------------------------------------------------------------------*/
+char *nx_getpath(void *handle){
+  int status;
+  NXhandle hfil;
+  char path[1024];
+
+  hfil = (NXhandle)handle;
+  status = NXgetpath(hfil,path,1024);
+  if(status == NX_OK){
+    return strdup(path);
+  } else {
+    return strdup("Error in NXgetpath");
+  }
+}
+/*--------------------------------------------------------------------*/
 int nx_closegroup(void *handle){
   int status;

trunk/bindings/swig/nxinterhelper.h

@@ -23 +23 @@
 int nx_opengrouppath(void *handle, char *path);
 int nx_openpath(void *handle, char *path);
+extern char *nx_getpath(void *handle);
 int nx_closegroup(void *handle);
 char *nx_getnextentry(void *handle, char separator);