Changeset 1730

Timestamp:

02/11/11 18:05:29 (7 months ago)

Author:

Tobias Richter

Message:

refs #290

external linking works fine now

Only the reporting NXinquirefile and NXisexternalgroup need to be
tweaked to report correctly with external links.

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/napi5.c (modified) (1 diff)
• test/napi_test.c (modified) (1 diff)
• test/napi_test_cpp.cxx (modified) (1 diff)

trunk/NEWS

@@ +1 @@
+Version 4.3.0
+=============
+
+If creating an external link you are no longer supposed to create the group 
+beforehand. As HDF5 can handle groups natively, that is counterproductive 
+and we would have to remove the empty group again (hoping that it is actually 
+empty that is). It is easier to create the group in the API if required.
+
 Version 4.2.0
 =============

trunk/src/napi5.c

@@ -2169 +2169 @@
       fHandle->nxinitattrdir=NX5initattrdir;
       fHandle->nxprintlink=NX5printlink;
-//      fHandle->nxnativeexternallink=NX5nativeexternallink;
-      fHandle->nxnativeexternallink=NULL;
+      fHandle->nxnativeexternallink=NX5nativeexternallink;
+//      fHandle->nxnativeexternallink=NULL;
 }
 

trunk/test/napi_test.c

@@ -486 +486 @@
     return 1;
   }
-  if(NXmakegroup(hfil,"entry1","NXentry") != NX_OK){
-    return 1;
-  }
+  /*if(NXmakegroup(hfil,"entry1","NXentry") != NX_OK){
+    return 1;
+  }*/
   sprintf(nxfile,"nxfile://data/dmc01.%s#/entry1",ext);
   if(NXlinkexternal(hfil,"entry1","NXentry",nxfile) != NX_OK){
     return 1;
   }
-  if(NXmakegroup(hfil,"entry2","NXentry") != NX_OK){
-    return 1;
-  }
+  /*if(NXmakegroup(hfil,"entry2","NXentry") != NX_OK){
+    return 1;
+  }*/
   sprintf(nxfile,"nxfile://data/dmc02.%s#/entry1",ext);
   if(NXlinkexternal(hfil,"entry2","NXentry",nxfile) != NX_OK){

trunk/test/napi_test_cpp.cxx

@@ -467 +467 @@
   // create the external link
   NeXus::File fileout(filename, create_code);
-  fileout.makeGroup("entry1", "NXentry");
   fileout.linkExternal("entry1", "NXentry", exturl1);
-  fileout.makeGroup("entry2", "NXentry");
   fileout.linkExternal("entry2", "NXentry", exturl2);
   fileout.close();