Changeset 1809

Timestamp:

26/01/12 18:44:27 (4 months ago)

Author:

Freddie Akeroyd

Message:

Also trap non-printable characters in attributes when converting to definition.
Refs #320

File:

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

trunk/applications/NXconvert/nxconvert_common.cpp

@@ -42 +42 @@
 static int WriteGroup (int is_definition);
 static int WriteAttributes (int is_definition, int is_group);
+
+static void clean_string(void* dataBuffer, int dataRank, int dataDimensions[])
+{
+        int i, 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] = '?';
+            }
+        }
+}
 
 struct link_to_make
@@ -187 +203 @@
 { 
   
-   int i, n, 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 */
@@ -232 +248 @@
                     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] = '?';
-                            }
-                        }
+                        clean_string(dataBuffer, dataRank, dataDimensions);
                     }
                     if (NXputdata (outId, dataBuffer) != NX_OK) return NX_ERROR;
@@ -334 +339 @@
             if (NXmalloc((void**)&attrBuffer, 1, &attrLen, attrType) != NX_OK) return NX_ERROR;
             if (NXgetattr (inId, attrName, attrBuffer, &attrLen , &attrType) != NX_OK) return NX_ERROR;
+            if (is_definition && attrType == NX_CHAR)
+            {
+                clean_string(attrBuffer, 1, &attrLen);
+            }
             if (NXputattr (outId, attrName, attrBuffer, attrLen , attrType) != NX_OK) return NX_ERROR;
             if (NXfree((void**)&attrBuffer) != NX_OK) return NX_ERROR;