Changeset 1797 for trunk

Timestamp:

16/01/12 10:06:47 (4 months ago)

Author:

Freddie Akeroyd

Message:

• Fix issue of only writing links to output HDF5 files
• Also speed up conversion to definition by using NXgetslab/NXputslab

Refs #320,#321

Location:

trunk

Files:

• applications/NXconvert/nxconvert_common.cpp (modified) (4 diffs)
• include/napi.h (modified) (2 diffs)
• src/napi.c (modified) (3 diffs)

trunk/applications/NXconvert/nxconvert_common.cpp

@@ -150 +150 @@
         return NX_ERROR;
    }
-   if (nx_format != NXACC_CREATE && nx_format != NXACC_CREATE4)
-   {
 /* now create any required links */
        for(size_t i=0; i<links_to_make.size(); i++)
@@ -177 +175 @@
             }
         }
-   }
 /* Close the input and output files */
    if (NXclose (&outId) != NX_OK)
@@ -190 +187 @@
 { 
   
-   int status, dataType, dataRank, dataDimensions[NX_MAXRANK];     
+   int i, status, dataType, dataRank, dataDimensions[NX_MAXRANK];     
+   static const int slab_start[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+   static const int MAX_DEF_ARRAY_ELEMENTS_PER_DIM = 3; /* doesn't work yet - only 1 element is written */
    NXname name, nxclass;
    void *dataBuffer;
@@ -211 +210 @@
             {
                 if (NXgetinfo (inId, &dataRank, dataDimensions, &dataType) != NX_OK) return NX_ERROR;
-                if (NXmalloc (&dataBuffer, dataRank, dataDimensions, dataType) != NX_OK) return NX_ERROR;
-                if (NXgetdata (inId, dataBuffer)  != NX_OK) return NX_ERROR;
                 if (NXmakedata (outId, name, dataType, dataRank, dataDimensions) != NX_OK) return NX_ERROR;
                 if (NXopendata (outId, name) != NX_OK) return NX_ERROR;
+                if ( is_definition && (dataType != NX_CHAR) )
+                {
+                    for(i=0; i<dataRank; ++i)
+                    {
+                        if (dataDimensions[i] > MAX_DEF_ARRAY_ELEMENTS_PER_DIM)
+                        {
+                            dataDimensions[i] = MAX_DEF_ARRAY_ELEMENTS_PER_DIM;
+                        }
+                    }
+                    if (NXmalloc (&dataBuffer, dataRank, dataDimensions, dataType) != NX_OK) return NX_ERROR;
+                    if (NXgetslab (inId, dataBuffer, slab_start, dataDimensions)  != NX_OK) return NX_ERROR;
+                    if (NXputslab (outId, dataBuffer, slab_start, dataDimensions) != NX_OK) return NX_ERROR;
+                }
+                else
+                {
+                    if (NXmalloc (&dataBuffer, dataRank, dataDimensions, dataType) != NX_OK) return NX_ERROR;
+                    if (NXgetdata (inId, dataBuffer)  != NX_OK) return NX_ERROR;
+                    if (NXputdata (outId, dataBuffer) != NX_OK) return NX_ERROR;
+                }
                 if (WriteAttributes (is_definition, 0) != NX_OK) return NX_ERROR;
-                if (NXputdata (outId, dataBuffer) != NX_OK) return NX_ERROR;
+                if (NXclosedata (outId) != NX_OK) return NX_ERROR;
                 if (NXfree((void**)&dataBuffer) != NX_OK) return NX_ERROR;
-                if (NXclosedata (outId) != NX_OK) return NX_ERROR;
                 remove_path(name);
             }

trunk/include/napi.h

@@ -593 +593 @@
    * \ingroup c_readwrite
    */
-extern  NXstatus  NXgetslab(NXhandle handle, void* data, int start[], int size[]);
+extern  NXstatus  NXgetslab(NXhandle handle, void* data, const int start[], const int size[]);
 
 
@@ -773 +773 @@
    * \ingroup c_memory
    */ 
-extern  NXstatus  NXmalloc(void** data, int rank, int dimensions[], int datatype);
+extern  NXstatus  NXmalloc(void** data, int rank, const int dimensions[], int datatype);
 
   /**
    * @copydoc NXmalloc()
    */ 
-extern  NXstatus  NXmalloc64(void** data, int rank, int64_t dimensions[], int datatype);
+extern  NXstatus  NXmalloc64(void** data, int rank, const int64_t dimensions[], int datatype);
 
 

trunk/src/napi.c

@@ -1092 +1092 @@
   
   NXstatus  NXmalloc (void** data, int rank, 
-                                   int dimensions[], int datatype)
+                                   const int dimensions[], int datatype)
   {
           int status;
@@ -1102 +1102 @@
 
   NXstatus  NXmalloc64 (void** data, int rank, 
-                                   int64_t dimensions[], int datatype)
+                                   const int64_t dimensions[], int datatype)
   {
     int i;
@@ -1293 +1293 @@
 
   NXstatus  NXgetslab (NXhandle fid, void *data, 
-                                    int iStart[], int iSize[])
+                                    const int iStart[], const int iSize[])
   {
           int i, iType, rank;