Changeset 1731

Timestamp:

02/11/11 18:08:42 (7 months ago)

Author:

Tobias Richter

Message:

refs #290

added hdf5 specific isexternalgroup and even isexternaldataset

the only thing that I cannot get to work right now is inquirefile
hdf5 seems to insist on reporting the file you opened, rather than
the one it currently reads through traversing the link. Ideas anyone?

Location:

trunk

Files:

• include/napi.h (modified) (3 diffs)
• src/napi.c (modified) (3 diffs)
• src/napi5.c (modified) (2 diffs)
• src/nexus_symbols.txt (modified) (1 diff)

trunk/include/napi.h

@@ -246 +246 @@
 #    define NXinquirefile       MANGLE(nxiinquirefile) 
 #    define NXisexternalgroup   MANGLE(nxiisexternalgroup)
+#    define NXisexternaldataset   MANGLE(nxiisexternaldataset)
 #    define NXlinkexternal      MANGLE(nxilinkexternal)
 #    define NXlinkexternaldataset      MANGLE(nxilinkexternaldataset)
@@ -723 +724 @@
 extern  NXstatus  NXisexternalgroup(NXhandle handle, CONSTCHAR *name, CONSTCHAR *nxclass, char *url, int urlLen); 
 
+
+  /**
+   * Test if a dataset is actually pointing to an external file. If so, retrieve the URL of the 
+   * external file.
+   * \param handle A NeXus file handle as initialized by NXopen.
+   * \param name The name of the dataset to test.
+   * \param url A buffer to copy the URL too.
+   * \param urlLen The length of the Url buffer. At maximum urlLen bytes will be copied to url.
+   * \return NX_OK when the dataset is pointing to an external file, NX_ERROR else.
+   * \ingroup c_external
+   */
+extern  NXstatus  NXisexternaldataset(NXhandle handle, CONSTCHAR *name, char *url, int urlLen); 
+
   /**
    * Create a link to a group in an external file. This works by creating a NeXus group under the current level in 
-   * the hierarchy which actually points to a group in  another file. 
+   * the hierarchy which actually points to a group in another file. 
    * \param handle A NeXus file handle as initialized by NXopen.
    * \param name The name of the group which points to the external file.
@@ -905 +919 @@
         NXstatus ( *nxprintlink)(NXhandle handle, NXlink* link);
         NXstatus ( *nxnativeexternallink)(NXhandle handle, CONSTCHAR* name, CONSTCHAR* externalfile, CONSTCHAR* remotetarget);
+        NXstatus ( *nxnativeinquirefile)(NXhandle handle, char* externalfile, const int filenamelength);
+        NXstatus ( *nxnativeisexternallink)(NXhandle handle, CONSTCHAR* name, char* url, int urllen);
   } NexusFunction, *pNexusFunction;
   /*---------------------*/

trunk/src/napi.c

@@ -1278 +1278 @@
   pFileStack fileStack;
   char *pPtr = NULL;
-  int length;
+  int length, status;
+
+  pNexusFunction pFunc = handleToNexusFunc(handle);
+   if (pFunc->nxnativeinquirefile != NULL) {
+
+        status = LOCKED_CALL(pFunc->nxnativeinquirefile(pFunc->pNexusData, filename, filenameBufferLength));
+        if (status < 0) {
+                return NX_ERROR;
+        } else {
+                return NX_OK;
+        }
+
+   }
 
   fileStack = (pFileStack)handle;
@@ -1302 +1314 @@
   pNexusFunction pFunc = handleToNexusFunc(fid);
 
-  status = LOCKED_CALL(pFunc->nxopengroup(pFunc->pNexusData, name,nxclass));
+   if (pFunc->nxnativeisexternallink != NULL) {
+        status = LOCKED_CALL(pFunc->nxnativeisexternallink(pFunc->pNexusData, name, url, urlLen));
+        if (status == NX_OK) {
+                return NX_OK;
+        }
+        // need to continue, could still be old style link
+   }
+
+  status = LOCKED_CALL(pFunc->nxopengroup(pFunc->pNexusData, name, nxclass));
   if(status != NX_OK){
     return status;
@@ -1323 +1343 @@
 }
 /*------------------------------------------------------------------------*/
-NXstatus  NXlinkexternal(NXhandle fid, CONSTCHAR *name, CONSTCHAR *nxclass, CONSTCHAR *url){
+NXstatus  NXisexternaldataset(NXhandle fid, CONSTCHAR *name,
+                            char *url, int urlLen){
+  int status, attStatus, length = 1023, type = NX_CHAR;
+  char nxurl[1024];
+
+  pNexusFunction pFunc = handleToNexusFunc(fid);
+
+   if (pFunc->nxnativeisexternallink != NULL) {
+        status = LOCKED_CALL(pFunc->nxnativeisexternallink(pFunc->pNexusData, name, url, urlLen));
+        if (status == NX_OK) {
+                return NX_OK;
+        }
+        // need to continue, could still be old style link
+   }
+
+  status = LOCKED_CALL(pFunc->nxopendata(pFunc->pNexusData, name));
+  if(status != NX_OK){
+    return status;
+  }
+  NXMDisableErrorReporting();
+  attStatus = NXgetattr(fid,"napimount",nxurl,&length, &type);
+  NXMEnableErrorReporting();
+  LOCKED_CALL(pFunc->nxclosedata(pFunc->pNexusData));
+  if(attStatus == NX_OK){
+    length = strlen(nxurl);
+    if(length > urlLen){
+      length = urlLen - 1;
+    }
+    memset(url,0,urlLen);
+    memcpy(url,nxurl,length);
+    return attStatus;
+  } else {
+    return NX_ERROR;
+  }
+}
+/*------------------------------------------------------------------------*/
+NXstatus  NXlinkexternal(NXhandle fid, CONSTCHAR *name, CONSTCHAR *nxclass, CONSTCHAR *url) {
   int status, type = NX_CHAR, length=1024, urllen;
   char nxurl[1024], exfile[512], expath[512];

trunk/src/napi5.c

@@ -2105 +2105 @@
   /* ------------------------------------------------------------------- */
 
+   NXstatus  NX5nativeinquirefile(NXhandle fileid, char* externalfile, const int filenamelen)
+  {
+     pNexusFile5 pFile;
+     ssize_t name_size;
+
+     pFile = NXI5assert(fileid);
+
+     name_size = H5Fget_name(pFile->iFID, externalfile, filenamelen);
+
+     // Check for failure again
+     if( name_size < 0 ) {
+         NXReportError("ERROR: retrieving file name");
+         return NX_ERROR;
+     }
+     return NX_OK;
+  }
+  /* ------------------------------------------------------------------- */
+
+   NXstatus  NX5nativeisexternallink(NXhandle fileid, const char* name, char* url, const int urllen)
+  {
+     pNexusFile5 pFile;
+     herr_t ret;
+     H5L_info_t link_buff;
+     int size=1024;
+     char linkval_buff[size];
+     const char *filepath, *objpath;
+
+     pFile = NXI5assert(fileid);
+
+     ret = H5Lget_info(pFile->iFID, name, &link_buff, H5P_DEFAULT);
+     if (ret < 0 || link_buff.type != H5L_TYPE_EXTERNAL) {
+       return NX_ERROR;
+     }
+
+     ret = H5Lget_val(pFile->iFID, name, linkval_buff, size, H5P_DEFAULT);
+     if (ret < 0) {
+       return NX_ERROR;
+     }
+
+     ret = H5Lunpack_elink_val(linkval_buff, size, 0, &filepath, &objpath);
+     if (ret < 0 || link_buff.type != H5L_TYPE_EXTERNAL) {
+       return NX_ERROR;
+     }
+
+    snprintf(url, urllen, "nxfile://%s#%s", filepath, objpath);
+    return NX_OK;
+     
+  }
+  /* ------------------------------------------------------------------- */
+
   NXstatus  NX5sameID (NXhandle fileid, NXlink* pFirstID, NXlink* pSecondID)
   {
@@ -2170 +2220 @@
       fHandle->nxprintlink=NX5printlink;
       fHandle->nxnativeexternallink=NX5nativeexternallink;
-//      fHandle->nxnativeexternallink=NULL;
+      fHandle->nxnativeinquirefile=NX5nativeinquirefile;
+      fHandle->nxnativeisexternallink=NX5nativeisexternallink;
 }
 

trunk/src/nexus_symbols.txt

@@ -52 +52 @@
 nxiinquirefile_
 nxiisexternalgroup_
+nxiisexternaldataset_
 NXMSetError
 NXMSetTError