Changeset 1807

Timestamp:

23/01/12 12:57:07 (4 months ago)

Author:

Freddie Akeroyd

Message:

Trap non-printable characters in conversion to definition. Refs #320

File:

• trunk/applications/NXconvert/nxconvert_common.cpp (modified) (2 diffs)

trunk/applications/NXconvert/nxconvert_common.cpp

@@ -187 +187 @@
 { 
   
-   int i, status, dataType, dataRank, dataDimensions[NX_MAXRANK];     
+   int i, n, 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 */
@@ -229 +229 @@
                     if (NXmalloc (&dataBuffer, dataRank, dataDimensions, dataType) != NX_OK) return NX_ERROR;
                     if (NXgetdata (inId, dataBuffer)  != NX_OK) return NX_ERROR;
+                    /* fix potential non-UTF8 character issue */
+                    if (is_definition && dataType == NX_CHAR)
+                    {
+                        n = 1;
+                        for(i=0; i<dataRank; ++i)
+                        {
+                            n *= dataDimensions[i];
+                        }
+                        for(i=0; i<n; ++i)
+                        {
+                            if (!isprint(((const unsigned char*)dataBuffer)[i]))
+                            {
+                                ((char*)dataBuffer)[i] = '?';
+                            }
+                        }
+                    }
                     if (NXputdata (outId, dataBuffer) != NX_OK) return NX_ERROR;
                 }