Changeset 1741 for trunk

Timestamp:

07/11/11 16:47:20 (7 months ago)

Author:

Tobias Richter

Message:

refs #290, #299

Create link in the right place. The test creates it in the root
and that is where it always ended up by accident anyway.

fixes inquirefile tests on c
No idea what is going on in the C++ world. Should be simpler there, but not for me.

Location:

trunk

Files:

• src/napi5.c (modified) (7 diffs)
• test/napi_test.c (modified) (5 diffs)
• test/napi_test_cpp.cxx (modified) (3 diffs)

trunk/src/napi5.c

@@ -381 +381 @@
     pFile = NXI5assert (fid);
     /* create and configure the group */
-    if (pFile->iCurrentG==0)
-    {
-       iRet = H5Gcreate(pFile->iFID,(const char*)name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (pFile->iCurrentG==0) {
        snprintf(pBuffer,1023,"/%s",name);
-    } else
-    {
+    } else {
        snprintf(pBuffer,1023,"/%s/%s",pFile->name_ref,name);
-       iRet = H5Gcreate(pFile->iFID,(const char*)pBuffer, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     }   
+    iRet = H5Gcreate(pFile->iFID,(const char*)pBuffer, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (iRet < 0) {
       NXReportError( "ERROR: could not create Group");
@@ -399 +396 @@
     H5Tset_size(aid1, strlen(nxclass));
     attr1= H5Acreate(iVID, "NX_class", aid1, aid2, H5P_DEFAULT, H5P_DEFAULT);
-    if (attr1 < 0)
-       {
+    if (attr1 < 0) {
        NXReportError( "ERROR: failed to store class name");
        return NX_ERROR;
-       }
-    if (H5Awrite(attr1, aid1, (char*)nxclass) < 0)
-      {
+    }
+    if (H5Awrite(attr1, aid1, (char*)nxclass) < 0) {
       NXReportError( "ERROR: failed to store class name");
       return NX_ERROR;
-      }
+    }
     /* close group */
     iRet=H5Sclose(aid2);
@@ -452 +447 @@
     strcpy(pFile->name_ref,pBuffer);
 
-    if ((nxclass != NULL) && (strcmp(nxclass, NX_UNKNOWN_GROUP) != 0))
-    {
+    if ((nxclass != NULL) && (strcmp(nxclass, NX_UNKNOWN_GROUP) != 0)) {
         /* check group attribute */
         iRet=H5Aiterate(pFile->iCurrentG,H5_INDEX_CRT_ORDER,H5_ITER_INC,0,attr_check,NULL);
@@ -468 +462 @@
         /* check contents of group attribute */
         attr1 = H5Aopen_by_name(pFile->iCurrentG, ".", "NX_class", H5P_DEFAULT, H5P_DEFAULT);
-        if (attr1 < 0)
-        {
+        if (attr1 < 0) {
               NXReportError( "ERROR: opening NX_class group attribute");
               return NX_ERROR; 
@@ -562 +555 @@
 {
   hid_t type;
-    if (datatype == NX_CHAR)
-    {
+    if (datatype == NX_CHAR) {
         type=H5T_C_S1;
-    }
-    else if (datatype == NX_INT8)
-    {
+    } else if (datatype == NX_INT8) {
         type=H5T_NATIVE_CHAR;
-    }
-    else if (datatype == NX_UINT8)
-    {
+    } else if (datatype == NX_UINT8) {
         type=H5T_NATIVE_UCHAR;
-    }
-    else if (datatype == NX_INT16)
-    {
+    } else if (datatype == NX_INT16) {
         type=H5T_NATIVE_SHORT;
-    }
-    else if (datatype == NX_UINT16)
-    {
+    } else if (datatype == NX_UINT16) {
         type=H5T_NATIVE_USHORT;
-    }
-    else if (datatype == NX_INT32)
-    {
+    } else if (datatype == NX_INT32) {
         type=H5T_NATIVE_INT;
-    }
-    else if (datatype == NX_UINT32)
-    {
+    } else if (datatype == NX_UINT32) {
         type=H5T_NATIVE_UINT;
-    }
-    else if (datatype == NX_INT64)
-    {
+    } else if (datatype == NX_INT64) {
         type = H5T_NATIVE_INT64;
-    }
-    else if (datatype == NX_UINT64)
-    {
+    } else if (datatype == NX_UINT64) {
         type = H5T_NATIVE_UINT64;
-    }
-    else if (datatype == NX_FLOAT32)
-    {
+    } else if (datatype == NX_FLOAT32) {
         type=H5T_NATIVE_FLOAT;
-    }
-    else if (datatype == NX_FLOAT64)
-    {
+    } else if (datatype == NX_FLOAT64) {
         type=H5T_NATIVE_DOUBLE;
-    }
-    else
-    {
+    } else {
       NXReportError( "ERROR: nxToHDF5Type: unknown type");
       type = -1;
@@ -2113 +2083 @@
      herr_t iRet;
      pNexusFile5 pFile;
-     /* char pBuffer[256]; */
+     char pBuffer[256]; 
+     hid_t openwhere;
 
      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);
+          openwhere = pFile->iFID;
+      } else {
+          openwhere = pFile->iCurrentG;
+      }
+
+     iRet = H5Lcreate_external(externalfile, remotetarget, openwhere, name, H5P_DEFAULT, H5P_DEFAULT);
      if (iRet < 0) {
        NXReportError("ERROR: making external link failed");
@@ -2141 +2112 @@
       if (pFile->iCurrentD > 0) {
           openthing = pFile->iCurrentD;
-      } else if (pFile->iCurrentG) {
+      } else if (pFile->iCurrentG > 0) {
           openthing = pFile->iCurrentG;
       } else {

trunk/test/napi_test.c

@@ -28 +28 @@
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "napi.h"
 #include "napiconfig.h"
@@ -34 +35 @@
 static int testLoadPath();
 static int testExternal(char *progName);
+
+char *relativePathOf(const char* filename) {
+  char cwd[1024];
+  char *pointer;
+
+  getcwd(cwd, sizeof(cwd));
+  
+  if (strncmp(filename, cwd, strlen(cwd)) == 0) {
+        return filename+strlen(cwd)+1;
+  }
+  return filename;
+}
 
 int main (int argc, char *argv[])
@@ -221 +234 @@
     return 1;
   }
-  printf("NXinquirefile found: %s\n", filename);
+  printf("NXinquirefile found: %s\n", relativePathOf(filename));
   NXgetattrinfo (fileid, &i);
   if (i > 0) {
@@ -537 +550 @@
     return 1;
   }
-  printf("NXinquirefile found: %s\n", filename);
+  printf("NXinquirefile found: %s\n", relativePathOf(filename));
 
   if(NXopenpath(hfil,"/entry2/sample/sample_name") != NX_OK){
@@ -550 +563 @@
     return 1;
   }
-  printf("NXinquirefile found: %s\n", filename);
+  printf("NXinquirefile found: %s\n", relativePathOf(filename));
 
   if(NXopenpath(hfil,"/entry2/start_time") != NX_OK){

trunk/test/napi_test_cpp.cxx

@@ -16 +16 @@
 using std::string;
 using std::vector;
+
+char *relativePathOf(std::string filenamestr) {
+  char cwd[1024];
+  char *filename;
+
+  filename = strdup(filenamestr.c_str());
+
+  getcwd(cwd, sizeof(cwd));
+  
+//fprintf(stderr, "filename %s cwd %s\n", filename, cwd);
+  if (strncmp(filename, cwd, strlen(cwd)) == 0) {
+        return filename + strlen(cwd) + 1;
+  }
+  return filename;
+}
 
 int writeTest(const string& filename, NXaccess create_code) {
@@ -212 +227 @@
   // top level file information
   NeXus::File file(filename);
-  cout << "NXinquirefile found: " << file.inquireFile() << endl;
+  cout << "NXinquirefile found: " << relativePathOf(file.inquireFile()) << endl;
   vector<NeXus::AttrInfo> attr_infos = file.getAttrInfos();
   cout << "Number of global attributes: " << attr_infos.size() << endl;
@@ -475 +490 @@
   filein.openPath("/entry1/start_time");
   cout << "First file time: " << filein.getStrData() << endl;
-  cout << "NXinquirefile found: " << filein.inquireFile() << endl;
+  cout << "NXinquirefile found: " << relativePathOf(filein.inquireFile()) << endl;
   filein.openPath("/entry2/sample/sample_name");
   cout << "Second file sample: " << filein.getStrData() << endl;
-  cout << "NXinquirefile found: " << filein.inquireFile() << endl;
+  cout << "NXinquirefile found: " << relativePathOf(filein.inquireFile()) << endl;
   filein.openPath("/entry2/start_time");
   cout << "Second file time: " << filein.getStrData() << endl;