apply fixes in loadjson/savejson to loadubjson and saveubjson

git-svn-id: http://svn.code.sf.net/p/iso2mesh/code/trunk/jsonlab@488 786e58fb-9377-0410-9ff7-e4ac0ac0635c

Author: fangq

loadubjson.m

@@ -312,7 +312,7 @@ function parse_char(c)
 %%-------------------------------------------------------------------------
 
 function num = parse_number(varargin)
-    global pos inStr len isoct fileendian systemendian
+    global pos inStr isoct fileendian systemendian
     id=strfind('iUIlLdD',inStr(pos));
     if(isempty(id))
         error_pos('expecting a number at position %d');
@@ -335,7 +335,6 @@ function parse_char(c)
 
 function val = parse_value(varargin)
     global pos inStr len
-    true = 1; false = 0;
 
     switch(inStr(pos))
         case {'S','C','H'}

saveubjson.m

@@ -180,32 +180,33 @@
     dim=size(item);
 end
 len=numel(item);
+forcearray= (len>1 || (jsonopt('NoRowBracket',1,varargin{:})==0 && level>0));
 
 if(~isempty(name)) 
-    if(len>1) txt=[N_(checkname(name,varargin{:})) '[']; end
+    if(forcearray) txt=[N_(checkname(name,varargin{:})) '[']; end
 else
-    if(len>1) txt='['; end
+    if(forcearray) txt='['; end
 end
 for j=1:dim(2)
   if(dim(1)>1) txt=[txt '[']; end
   for i=1:dim(1)
      names = fieldnames(item(i,j));
-     if(~isempty(name) && len==1)
+     if(~isempty(name) && len==1 && ~forcearray)
         txt=[txt N_(checkname(name,varargin{:})) '{']; 
      else
         txt=[txt '{']; 
      end
      if(~isempty(names))
        for e=1:length(names)
 	     txt=[txt obj2ubjson(names{e},getfield(item(i,j),...
-             names{e}),level+(dim(1)>1)+1+(len>1),varargin{:})];
+             names{e}),level+(dim(1)>1)+1+forcearray,varargin{:})];
        end
      end
      txt=[txt '}'];
   end
   if(dim(1)>1) txt=[txt ']']; end
 end
-if(len>1) txt=[txt ']']; end
+if(forcearray) txt=[txt ']']; end
 
 %%-------------------------------------------------------------------------
 function txt=str2ubjson(name,item,level,varargin)
@@ -241,7 +242,7 @@
 end
 
 if(length(size(item))>2 || issparse(item) || ~isreal(item) || ...
-   isempty(item) || jsonopt('ArrayToStruct',0,varargin{:}))
+   (isempty(item) && any(size(item))) ||jsonopt('ArrayToStruct',0,varargin{:}))
       cid=I_(uint32(max(size(item))));
       if(isempty(name))
     	txt=['{' N_('_ArrayType_'),S_(class(item)),N_('_ArraySize_'),I_a(size(item),cid(1)) ];