Changeset 1728 for trunk

Timestamp:

02/11/11 14:49:41 (7 months ago)

Author:

Tobias Richter

Message:

external linking in hdf5

refs #290

external links are created correctly, but not displayed through napi
(h5dump and other hdf tools work)

Location:

trunk

Files:

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

trunk/include/napi.h

@@ -4 +4 @@
   Application Program Interface Header File
   
-  Copyright (C) 2000-2007 Mark Koennecke, Uwe Filges
+  Copyright (C) 2000-2011 Mark Koennecke, Uwe Filges
   
   This library is free software; you can redistribute it and/or
@@ -904 +904 @@
         NXstatus ( *nxsetnumberformat)(NXhandle handle, int type, char *format);
         NXstatus ( *nxprintlink)(NXhandle handle, NXlink* link);
+        NXstatus ( *nxnativeexternallink)(NXhandle handle, CONSTCHAR* name, CONSTCHAR* externalfile, CONSTCHAR* remotetarget);
   } NexusFunction, *pNexusFunction;
   /*---------------------*/

trunk/src/napi.c

@@ -1323 +1323 @@
 }
 /*------------------------------------------------------------------------*/
-NXstatus  NXlinkexternal(NXhandle fid, CONSTCHAR *name, CONSTCHAR *nxclass, 
-                         CONSTCHAR *url){
-  int status, type = NX_CHAR, length;
+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];
   pNexusFunction pFunc = handleToNexusFunc(fid);
+
+  // in HDF5 we support external linking natively
+  if (pFunc->nxnativeexternallink != NULL) {
+        urllen = strlen(url);
+        memset(nxurl, 0, length);
+        if(urllen > length){
+          urllen = length - 1;
+        }
+        memcpy(nxurl, url, urllen);
+        status = analyzeNapimount(nxurl,exfile,511,expath,511);
+        if(status != NX_OK){
+           return status;
+        }
+        status = LOCKED_CALL(pFunc->nxnativeexternallink(pFunc->pNexusData, name, exfile, expath));
+        if(status != NX_OK){
+           return status;
+        }
+        return NX_OK;
+  }
+
+  NXMDisableErrorReporting();
+  LOCKED_CALL(pFunc->nxmakegroup(pFunc->pNexusData,name,nxclass));
+  NXMEnableErrorReporting();
 
   status = LOCKED_CALL(pFunc->nxopengroup(pFunc->pNexusData,name,nxclass));
@@ -1343 +1366 @@
 NXstatus  NXlinkexternaldataset(NXhandle fid, CONSTCHAR *name, 
                          CONSTCHAR *url){
-  int status, type = NX_CHAR, length;
+  int status, type = NX_CHAR, length=1024, urllen;
+  char nxurl[1024], exfile[512], expath[512];
   pNexusFunction pFunc = handleToNexusFunc(fid);
   int64_t rank = 1;
   int64_t dims[1] = {1};
   
+  //TODO cut and paste
+
+  // in HDF5 we support external linking natively
+  if (pFunc->nxnativeexternallink != NULL) {
+        urllen = strlen(url);
+        memset(nxurl, 0, length);
+        if(urllen > length){
+          urllen = length - 1;
+        }
+        memcpy(nxurl, url, urllen);
+        status = analyzeNapimount(nxurl,exfile,511,expath,511);
+        if(status != NX_OK){
+           return status;
+        }
+        status = LOCKED_CALL(pFunc->nxnativeexternallink(pFunc->pNexusData, name, exfile, expath));
+        if(status != NX_OK){
+           return status;
+        }
+        return NX_OK;
+  }
+
+
   status = LOCKED_CALL(pFunc->nxmakedata64(pFunc->pNexusData, name, NX_CHAR, rank, dims));
   if(status != NX_OK){

trunk/src/napi4.c

@@ -1978 +1978 @@
       fHandle->nxinitattrdir=NX4initattrdir;
       fHandle->nxprintlink=NX4printlink;
+      fHandle->nxnativeexternallink=NULL;
 }
 

trunk/src/napi5.c

@@ -2012 +2012 @@
      }
 
-     iRet = H5Aclose(pFile->iCurrentA);
+     H5Aclose(pFile->iCurrentA);
 
      killAttVID(pFile,vid);
@@ -2081 +2081 @@
   }  
  
+  /* ------------------------------------------------------------------- */
+
+   NXstatus  NX5nativeexternallink(NXhandle fileid, const char* name, const char* externalfile, const char* remotetarget)
+  {
+     herr_t iRet;
+     pNexusFile5 pFile;
+
+     pFile = NXI5assert(fileid);
+     iRet = H5Lcreate_external(externalfile, remotetarget, pFile->iFID, name, H5P_DEFAULT, H5P_DEFAULT);
+     if (iRet < 0) {
+       NXReportError("ERROR: making external link failed");
+       return NX_ERROR;
+     }
+     return NX_OK;
+  }
   /* ------------------------------------------------------------------- */
 
@@ -2147 +2162 @@
       fHandle->nxinitattrdir=NX5initattrdir;
       fHandle->nxprintlink=NX5printlink;
+      fHandle->nxnativeexternallink=NX5nativeexternallink;
 }
 

trunk/src/nxxml.c

@@ -1968 +1968 @@
       fHandle->nxsetnumberformat=NXXsetnumberformat;
       fHandle->nxprintlink=NXXprintlink;
+      fHandle->nxnativeexternallink=NULL;
 }