Changeset 1615

Timestamp:

20/07/11 21:48:16 (10 months ago)

Author:

Tobias Richter

Message:

add tests for external linking to data sets

refs #274

Location:

trunk

Files:

• src/napi.c (modified) (1 diff)
• test/data/dmc01.h5 (modified) (previous)
• test/data/dmc01.xml (modified) (previous)
• test/data/dmc02.xml (modified) (previous)
• test/napi_test.c (modified) (5 diffs)
• test/testsuite.at (modified) (7 diffs)

trunk/src/napi.c

@@ -735 +735 @@
       }
       status = NXopenpath(fid,expath);
-      NXgetgroupID(fid,&breakID);
+      NXgetdataID(fid,&breakID);
       setCloseID(fileStack,breakID);
     }

trunk/test/napi_test.c

@@ -2 +2 @@
   NeXus - Neutron & X-ray Common Data Format
   
-  Test program for C API (HDF4 Version)
+  Test program for C API 
   
-  Copyright (C) 1997-2002 Freddie Akeroyd
+  Copyright (C) 1997-2011 Freddie Akeroyd
   
   This library is free software; you can redistribute it and/or
@@ -460 +460 @@
   int create;
   NXhandle hfil;
+  int dummylen = 1;
+  float dummyfloat = 1;
+  float temperature;
 
   if(strstr(progName,"hdf4") != NULL){
@@ -497 +500 @@
     return 1;
   }
+  if(NXmakegroup(hfil,"entry3","NXentry") != NX_OK){
+    return 1;
+  }
+  if(NXopengroup(hfil,"entry3","NXentry") != NX_OK){
+    return 1;
+  }
+  if (NXmakedata (hfil, "extlinkdata", NX_FLOAT32, 1, &dummylen) != NX_OK) return 1;
+  if (NXopendata (hfil, "extlinkdata") != NX_OK) return 1;
+  if (NXputdata (hfil, &dummyfloat) != NX_OK) return 1;
+  sprintf(nxfile,"nxfile://data/dmc01.%s#/entry1/sample/temperature_mean",ext);
+  if(NXputattr(hfil,"napimount",nxfile,strlen(nxfile), NX_CHAR) != NX_OK) return 1;
   if(NXclose(&hfil) != NX_OK){
     return 1;
@@ -507 +521 @@
     return 1;
   }
-
   if(NXopenpath(hfil,"/entry1/start_time") != NX_OK){
     return 1;
@@ -549 +562 @@
     printf("entry1 external URL = %s\n", filename);
   }
+
+  printf("testing link to external data set\n");
+  if(NXopenpath(hfil,"/entry3") != NX_OK){
+    return 1;
+  }
+  if (NXopendata (hfil, "extlinkdata") != NX_OK) return 1;
+  memset(&temperature,0,4);
+  if(NXgetdata(hfil,&temperature) != NX_OK){
+    return 1;
+  }
+  printf("value retrieved: %4.2f\n", temperature);
 
   NXclose(&hfil);

trunk/test/testsuite.at

@@ -78 +78 @@
 Second file time: 2005-05-27 05:48:56
 entry1 external URL = nxfile://data/dmc01.hdf#/entry1
+testing link to external data set
+value retrieved: 4.00
 External File Linking tested OK
 ]])
@@ -135 +137 @@
 Second file time: 2005-05-27 05:48:56
 entry1 external URL = nxfile://data/dmc01.h5#/entry1
+testing link to external data set
+value retrieved: 4.00
 External File Linking tested OK
 ]])
@@ -190 +194 @@
 Second file time: 2005-05-27 05:48:56
 entry1 external URL = nxfile://data/dmc01.hdf#/entry1
+testing link to external data set
+value retrieved: 4.00
 External File Linking tested OK
 ]])
@@ -247 +253 @@
 Second file time: 2005-05-27 05:48:56
 entry1 external URL = nxfile://data/dmc01.h5#/entry1
+testing link to external data set
+value retrieved: 4.00
 External File Linking tested OK
 ]])
@@ -307 +315 @@
 Second file time: 2005-05-27 05:48:56
 entry1 external URL = nxfile://data/dmc01.xml#/entry1
+testing link to external data set
+value retrieved: 4.00
 External File Linking tested OK
 ]])
@@ -367 +377 @@
 Second file time: 2005-05-27 05:48:56
 entry1 external URL = nxfile://data/dmc01.xml#/entry1
+testing link to external data set
+value retrieved: 4.00
 External File Linking tested OK
 ]])
@@ -427 +439 @@
 Second file time: 2005-05-27 05:48:56
 entry1 external URL = nxfile://data/dmc01.xml#/entry1
+testing link to external data set
+value retrieved: 4.00
 External File Linking tested OK
 ]])