Changeset 10352

Timestamp:

10/28/11 13:36:59 (13 years ago)

Author:

seroussi

Message:

minor

File:

• issm/trunk/src/m/utils/consistency/checkfield.m (modified) (1 diff)

issm/trunk/src/m/utils/consistency/checkfield.m

@@ -98 +98 @@
         fieldvalues=getfieldvalue(options,'values');
         if iscell(fieldvalues), %strings
-                if ischar(field),
-                        if any(~ismember(field,fieldvalues)),
-                                if length(fieldvalues)==1
-                                        checkmessage(getfieldvalue(options,'message',...
-                                                ['field ''' fieldname ''' value should be ' fieldvalues{1} ]));
-                                elseif length(fieldvalues)==2
-                                        checkmessage(getfieldvalue(options,'message',...
-                                                ['field ''' fieldname ''' values should be ' fieldvalues{1} ' or ' fieldvalues{2} ]));
-                                else
-                                        checkmessage(getfieldvalue(options,'message',...
-                                                ['field ''' fieldname ''' should have values in ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
-                                end
+        if ischar(field) | iscell(fieldvalues),
+                if any(~ismember(field,fieldvalues)),
+                        if length(fieldvalues)==1
+                                checkmessage(getfieldvalue(options,'message',...
+                                        ['field ''' fieldname ''' value should be ' fieldvalues{1} ]));
+                        elseif length(fieldvalues)==2
+                                checkmessage(getfieldvalue(options,'message',...
+                                        ['field ''' fieldname ''' values should be ' fieldvalues{1} ' or ' fieldvalues{2} ]));
+                        else
+                                checkmessage(getfieldvalue(options,'message',...
+                                        ['field ''' fieldname ''' should have values in ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
                         end
-                else
-                        checkmessage(getfieldvalue(options,'message',...
-                                ['field ''' fieldname ''' should be one of the following strings: ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
                 end
         else
-                field2=reshape(field,prod(size(field)),1);
-                if isnumeric(field),
-                        if any(~ismember(field2,fieldvalues)),
-                                checkmessage(getfieldvalue(options,'message',...
-                                        ['field ''' fieldname ''' should have values in [' num2str(fieldvalues) ']']));
-                        end
-                else
+                checkmessage(getfieldvalue(options,'message',...
+                        ['field ''' fieldname ''' should be one of the following strings: ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
+        end
+else
+        field2=reshape(field,prod(size(field)),1);
+        if isnumeric(field),
+                if any(~ismember(field2,fieldvalues)),
                         checkmessage(getfieldvalue(options,'message',...
-                                ['field ''' fieldname ''' should be a number in [' num2str(fieldvalues) ']']));
+                                ['field ''' fieldname ''' should have values in [' num2str(fieldvalues) ']']));
                 end
+        else
+                checkmessage(getfieldvalue(options,'message',...
+                        ['field ''' fieldname ''' should be a number in [' num2str(fieldvalues) ']']));
+        end
         end
 end