Changeset 1737

Timestamp:

07/11/11 12:48:50 (7 months ago)

Author:

Tobias Richter

Message:

refs #290

inquirefile works now but it it reports the absolute path
so the tests still fail. Not sure I want to fix that because
it reporting the file it actually found is a bad thing.
Might rather tweak the test to allow for that.

File:

• trunk/src/napi5.c (modified) (6 diffs)

trunk/src/napi5.c

@@ -611 +611 @@
 
       pFile = NXI5assert (fid);
-      if (pFile->iCurrentG <= 0)
-      {
-          sprintf (pBuffer, "ERROR: no group open for makedata on %s",
-              name);
+      if (pFile->iCurrentG <= 0) {
+          sprintf(pBuffer, "ERROR: no group open for makedata on %s", name);
           NXReportError( pBuffer);
           return NX_ERROR;
       }
 
-      if (rank <= 0) 
-      {
-          sprintf (pBuffer, "ERROR: invalid rank specified %s",
-              name);
+      if (rank <= 0) {
+          sprintf (pBuffer, "ERROR: invalid rank specified %s", name);
           NXReportError( pBuffer);
           return NX_ERROR;
@@ -716 +712 @@
           }
           H5Pset_deflate(cparms,compress_level); 
-          iRet = H5Dcreate (pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT);   
+          iRet = H5Dcreate(pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT);   
       } 
       else if (compress_type == NX_COMP_NONE) 
@@ -729 +725 @@
                   return NX_ERROR;
               }
-              iRet = H5Dcreate (pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT);   
+              iRet = H5Dcreate(pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT);   
           } 
           else 
           {
-              iRet = H5Dcreate (pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+              iRet = H5Dcreate(pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
           }               
       } 
@@ -742 +738 @@
           if (iNew < 0) 
           {
-              NXReportError( "ERROR: size of chunks could not be set");
+              NXReportError("ERROR: size of chunks could not be set");
               return NX_ERROR;
           }
-          iRet = H5Dcreate (pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT);
+          iRet = H5Dcreate(pFile->iCurrentG, (char*)name, datatype1, dataspace, H5P_DEFAULT, cparms, H5P_DEFAULT);
 
       } 
@@ -2093 +2089 @@
      herr_t iRet;
      pNexusFile5 pFile;
+     /* char pBuffer[256]; */
 
      pFile = NXI5assert(fileid);
+/*
+      if (pFile->iCurrentG <= 0) {
+          sprintf(pBuffer, "ERROR: no group open for making external link on %s", name);
+          NXReportError(pBuffer);
+          return NX_ERROR;
+      }
+*/
      iRet = H5Lcreate_external(externalfile, remotetarget, pFile->iFID, name, H5P_DEFAULT, H5P_DEFAULT);
      if (iRet < 0) {
@@ -2108 +2112 @@
      pNexusFile5 pFile;
      ssize_t name_size;
+     hid_t openthing;
 
      pFile = NXI5assert(fileid);
-
-     name_size = H5Fget_name(pFile->iFID, externalfile, filenamelen);
+      if (pFile->iCurrentD > 0) {
+          openthing = pFile->iCurrentD;
+      } else if (pFile->iCurrentG) {
+          openthing = pFile->iCurrentG;
+      } else {
+          openthing = pFile->iFID;
+      }
+
+     name_size = H5Fget_name(openthing, externalfile, filenamelen);
 
      // Check for failure again