From efb90fc7d1acb22ec952b49f46dcc0335391b965 Mon Sep 17 00:00:00 2001
From: Takuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Date: Wed, 22 Apr 2015 18:32:01 +0900
Subject: [PATCH] Modified: dmInfo 	Assign array of UInt2 as string of
 UTF-16

---
 src/Objects/DataManip/dmFile/src/dmFileInfo.c | 27 ++++++++++++++++---------
 src/Objects/DataManip/dmFile/src/dmFileUtil.c | 29 +++++++++++++++++----------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/Objects/DataManip/dmFile/src/dmFileInfo.c b/src/Objects/DataManip/dmFile/src/dmFileInfo.c
index 292fdb71c9..3868b13403 100644
--- a/src/Objects/DataManip/dmFile/src/dmFileInfo.c
+++ b/src/Objects/DataManip/dmFile/src/dmFileInfo.c
@@ -11,9 +11,11 @@
 */
 static char __sccs_id[] = "%Z%dmFileInfo ver%I%; Date:%D% %Z%";
 #include <string.h>
+#include <wchar.h>
 
 #undef DEBUG
 #include "genUtil.h"
+#include "Memory.h"
 #include "../inc/dmFile.h"
 
 void
@@ -173,7 +175,7 @@ dmFile3TagInfo(FILE* fpt, dmFile3Tag tag, int layer, int mode)
 							offset = 0;
 							for(i=0; i<tag.info[3]; i++) {
 								fprintf(fpt, "%sStructDataValue-%d: ", nest, i);
-								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], MIN(5, tag.info[5+2*tag.info[3]]));
+								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], tag.info[5+2*tag.info[3]]);
 								offset += tag.info[3]*__dmFileTagDataTypeSize[tag.info[5+i*2]];
 							}
 							break;
@@ -181,10 +183,13 @@ dmFile3TagInfo(FILE* fpt, dmFile3Tag tag, int layer, int mode)
 						default: { // Simple Array
 							fprintf(fpt, "%sArrayDataType: %s\n", nest, __dmFileTagDataTypeChar[tag.info[1]]);
 							fprintf(fpt, "%sArrayDataNum: %d\n", nest, tag.info[2]);
+							fprintf(fpt, "%sDataValue: ", nest);
 							if(0<tag.info[2]) {
-								fprintf(fpt, "%sDataValue: ", nest);
-								dmFileValuePrint(fpt, tag.value, tag.info[1], MIN(5, tag.info[2]));
+								dmFileValuePrint(fpt, tag.value, tag.info[1], tag.info[2]);
+							} else {
+								fprintf(fpt, "\n");
 							}
+
 							break;
 						}
 					}
@@ -217,7 +222,7 @@ dmFile3TagInfo(FILE* fpt, dmFile3Tag tag, int layer, int mode)
 							offset = 0;
 							for(i=0; i<tag.info[3]; i++) {
 								fprintf(fpt, "%s%s-%d[%d](%s): ", nest, tag.tagName, i, tag.info[5+2*tag.info[3]], __dmFileTagDataTypeChar[tag.info[5+i*2]]);
-								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], MIN(5, tag.info[5+2*tag.info[3]]));
+								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], tag.info[5+2*tag.info[3]]);
 								offset += tag.info[3]*__dmFileTagDataTypeSize[tag.info[5+i*2]];
 							}
 							break;
@@ -225,7 +230,7 @@ dmFile3TagInfo(FILE* fpt, dmFile3Tag tag, int layer, int mode)
 						default: { // Simple Array
 							fprintf(fpt, "%s%s[%d](%s): ", nest, tag.tagName, tag.info[2],  __dmFileTagDataTypeChar[tag.info[1]]);
 							if(0<tag.info[2]) {
-								dmFileValuePrint(fpt, tag.value, tag.info[1], MIN(5, tag.info[2]));
+								dmFileValuePrint(fpt, tag.value, tag.info[1], tag.info[2]);
 							} else {
 								fprintf(fpt, "null\n");
 							}
@@ -366,7 +371,7 @@ dmFile4TagInfo(FILE* fpt, dmFile4Tag tag, int layer, int mode)
 							offset = 0;
 							for(i=0; i<tag.info[3]; i++) {
 								fprintf(fpt, "%sStructDataValue-%d: ", nest, i);
-								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], MIN(5, tag.info[5+2*tag.info[3]]));
+								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], tag.info[5+2*tag.info[3]]);
 								offset += tag.info[3]*__dmFileTagDataTypeSize[tag.info[5+i*2]];
 							}
 							break;
@@ -374,9 +379,11 @@ dmFile4TagInfo(FILE* fpt, dmFile4Tag tag, int layer, int mode)
 						default: { // Simple Array
 							fprintf(fpt, "%sArrayDataType: %s\n", nest, __dmFileTagDataTypeChar[tag.info[1]]);
 							fprintf(fpt, "%sArrayDataNum: %lld\n", nest, tag.info[2]);
+							fprintf(fpt, "%sDataValue: ", nest);
 							if(0<tag.info[2]) {
-								fprintf(fpt, "%sDataValue: ", nest);
-								dmFileValuePrint(fpt, tag.value, tag.info[1], MIN(5, tag.info[2]));
+								dmFileValuePrint(fpt, tag.value, tag.info[1], tag.info[2]);
+							} else {
+								fprintf(fpt, "\n");
 							}
 							break;
 						}
@@ -411,7 +418,7 @@ dmFile4TagInfo(FILE* fpt, dmFile4Tag tag, int layer, int mode)
 							offset = 0;
 							for(i=0; i<tag.info[3]; i++) {
 								fprintf(fpt, "%s%s-%d[%lld](%s): ", nest, tag.tagName, i, tag.info[5+2*tag.info[3]], __dmFileTagDataTypeChar[tag.info[5+i*2]]);
-								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], MIN(5, tag.info[5+2*tag.info[3]]));
+								dmFileValuePrint(fpt, (char*)(tag.value3)+offset, tag.info[5+i*2], tag.info[5+2*tag.info[3]]);
 								offset += tag.info[3]*__dmFileTagDataTypeSize[tag.info[5+i*2]];
 							}
 							break;
@@ -419,7 +426,7 @@ dmFile4TagInfo(FILE* fpt, dmFile4Tag tag, int layer, int mode)
 						default: { // Simple Array
 							fprintf(fpt, "%s%s[%lld](%s): ", nest, tag.tagName, tag.info[2],  __dmFileTagDataTypeChar[tag.info[1]]);
 							if(0<tag.info[2]) {
-								dmFileValuePrint(fpt, tag.value, tag.info[1], MIN(5, tag.info[2]));
+								dmFileValuePrint(fpt, tag.value, tag.info[1], tag.info[2]);
 							} else {
 								fprintf(fpt, "\n");
 							}
diff --git a/src/Objects/DataManip/dmFile/src/dmFileUtil.c b/src/Objects/DataManip/dmFile/src/dmFileUtil.c
index a6d5412ec1..2043bc3962 100644
--- a/src/Objects/DataManip/dmFile/src/dmFileUtil.c
+++ b/src/Objects/DataManip/dmFile/src/dmFileUtil.c
@@ -10,6 +10,8 @@
 #%Z%
 */
 static char __sccs_id[] = "%Z%dmFileUtil ver%I%; Date:%D% %Z%";
+#include <locale.h>
+#include <wchar.h>
 #include <stdlib.h>
 
 #define DEBUG
@@ -23,6 +25,9 @@ dmFileValuePrint(FILE* fpt, void* value, dmFileTagDataType valueType, int n)
 {
 	int i;
 	char format[100];
+	int max;
+	
+	max = MIN(5, n);
 
 	strncpy(format,  __dmFileTagDataTypeFormat[valueType], 99);  
 	strcat(format, " ");
@@ -30,67 +35,69 @@ dmFileValuePrint(FILE* fpt, void* value, dmFileTagDataType valueType, int n)
 	DEBUGPRINT1("valueType: %x in dmFileValuePrint\n", valueType);
 	switch(valueType) {
 		case dmFileTagDataTypeInt2: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((dmFileInteger2*)value)[i]);
 			}
 			break;
 		}
   		case dmFileTagDataTypeInt4: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((dmFileInteger4*)value)[i]);
 			}
 			break;
 		}
 		case dmFileTagDataTypeUInt2: {
+			setlocale(LC_ALL, ".1200");
 			for(i=0; i<n; i++) {
-				fprintf(fpt, format, ((dmFileInteger2*)value)[i]);
+				fputwc(((dmFileInteger2*)value)[i], fpt);
+				//fprintf(fpt, format, ((dmFileInteger2*)value)[i]);
 			}
 			break;
 		}
 		case dmFileTagDataTypeUInt4: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((dmFileInteger4*)value)[i]);
 			}
 			break;
 		}
 	 	case dmFileTagDataTypeReal4: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((float*)value)[i]);
 			}
 			break;
 		}
 		case dmFileTagDataTypeReal8: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((double*)value)[i]);
 			}
 			break;
 		}
 	   	case dmFileTagDataTypeBool1: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((char*)value)[i]);
 			}
 			break;
 		}
 		case dmFileTagDataTypeChar1: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((char*)value)[i]);
 			}
 			break;
 		}
 		case dmFileTagDataTypeInt1: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((char*)value)[i]);
 			}
 			break;
 		}
 		case dmFileTagDataTypeInt8: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((dmFileInteger8*)value)[i]);
 			}
 			break;
 		}
 		case dmFileTagDataTypeUInt8: {
-			for(i=0; i<n; i++) {
+			for(i=0; i<max; i++) {
 				fprintf(fpt, format, ((dmFileInteger8*)value)[i]);
 			}
 			break;
-- 
2.11.0