OAR: simplified previous commit

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

zUtil_OAR/gtBatch.m

@@ -88,34 +88,32 @@ function oarparams = gtBatchUpdate(oarparams, records)
 end
 
 function oarparams = gtBatchClean(oarparams)
-    if (~isempty(oarparams))
-        fnames = fieldnames(oarparams);
-        for fname = fnames'
-            funcRecord = oarparams.(fname{1});
-            arrayNames = fieldnames(funcRecord);
-            for arrayName = arrayNames'
-                arrayRecord = funcRecord.(arrayName{1});
-                for n = 1:numel(arrayRecord.job)
-                    jobs = arrayRecord.job(n);
-                    states = {jobs(:).state};
-                    codes = {jobs(:).exit_code};
-                    matchesStates = strcmp(states, 'Terminated');
-                    matchesCodes = strcmp(codes, '0 (0,0,0)');
-                    matches = matchesStates | matchesCodes;
-                    arrayRecord.job(n) = jobs(matches);
-                end
-                if (isempty(arrayRecord.job))
-                    funcRecord = rmfield(funcRecord, arrayName{1});
-                    fprintf('All the jobs from array %s are terminated with exit_code ''0 (0,0,0)''\n', ...
-                        arrayName{1}(6:end))
-                end
+    fnames = fieldnames(oarparams);
+    for fname = fnames'
+        funcRecord = oarparams.(fname{1});
+        arrayNames = fieldnames(funcRecord);
+        for arrayName = arrayNames'
+            arrayRecord = funcRecord.(arrayName{1});
+            for n = 1:numel(arrayRecord.job)
+                jobs = arrayRecord.job(n);
+                states = {jobs(:).state};
+                codes = {jobs(:).exit_code};
+                matchesStates = strcmp(states, 'Terminated');
+                matchesCodes = strcmp(codes, '0 (0,0,0)');
+                matches = matchesStates | matchesCodes;
+                arrayRecord.job(n) = jobs(matches);
             end
-            if (isempty(fieldnames(funcRecord)))
-                oarparams = rmfield(oarparams, fname{1});
-                fprintf('All arrays of function %s are terminated with exit_code ''0 (0,0,0)''\n', ...
-                    fname{1})
+            if (isempty(arrayRecord.job))
+                funcRecord = rmfield(funcRecord, arrayName{1});
+                fprintf('All the jobs from array %s are terminated with exit_code ''0 (0,0,0)''\n', ...
+                    arrayName{1}(6:end))
             end
         end
+        if (isempty(fieldnames(funcRecord)))
+            oarparams = rmfield(oarparams, fname{1});
+            fprintf('All arrays of function %s are terminated with exit_code ''0 (0,0,0)''\n', ...
+                fname{1})
+        end
     end
 end
 
@@ -216,17 +214,13 @@ function [records, selectionType] = getRecords(oarparams, args)
             gtError('gtBatch:wrong_argument', 'Too many arguments');
     end
 
-    if (~isempty(oarparams))
-        switch(lower(selectionType))
-            case 'name'
-                records = getJobRecordsByName(oarparams, selectionValue);
-            case 'array'
-                records = getJobRecordsByArrayIDs(oarparams, selectionValue);
-            case 'job'
-                records = getJobRecordsByJobIDs(oarparams, selectionValue);
-        end
-    else
-        records = makeEmptyRecord();
+    switch(lower(selectionType))
+        case 'name'
+            records = getJobRecordsByName(oarparams, selectionValue);
+        case 'array'
+            records = getJobRecordsByArrayIDs(oarparams, selectionValue);
+        case 'job'
+            records = getJobRecordsByJobIDs(oarparams, selectionValue);
     end
 end
 

zUtil_OAR/gtReadParamsOARfromXML.m

 function oarparams = gtReadParamsOARfromXML(filename)
     tree = xmlread(filename);
     oarElem = tree.getFirstChild();
-    oarparams = [];
+    oarparams = struct();
     funcElements = oarElem.getElementsByTagName('function');
     for numFunc = 1:funcElements.getLength()
         funcElem = funcElements.item(numFunc-1);

zUtil_OAR/gtWriteParamsOARtoXML.m

 function gtWriteParamsOARtoXML(filename, oarparams)
     docNode = com.mathworks.xml.XMLUtils.createDocument('oarparameters');
     docRootNode = docNode.getDocumentElement();
-    if (~isempty(oarparams))
-        funcNames = fieldnames(oarparams);
-        for funcName = funcNames'
-            funcElement = docNode.createElement('function');
-            funcElement.setAttribute('name', funcName{1});
-            func = oarparams.(funcName{1});
-            arrayNames = fieldnames(func);
-            for arrayName = arrayNames'
-                arrayElement = docNode.createElement('array');
-                arrayElement.setAttribute('id', arrayName{1}(6:end));
-                array = func.(arrayName{1});
-                for n = 1:numel(array.job)
-                    jobElement = docNode.createElement('job');
-                    jobElement.setAttribute('id', num2str(array.job(n).jobId));
+    funcNames = fieldnames(oarparams);
+    for funcName = funcNames'
+        funcElement = docNode.createElement('function');
+        funcElement.setAttribute('name', funcName{1});
+        func = oarparams.(funcName{1});
+        arrayNames = fieldnames(func);
+        for arrayName = arrayNames'
+            arrayElement = docNode.createElement('array');
+            arrayElement.setAttribute('id', arrayName{1}(6:end));
+            array = func.(arrayName{1});
+            for n = 1:numel(array.job)
+                jobElement = docNode.createElement('job');
+                jobElement.setAttribute('id', num2str(array.job(n).jobId));
 
-                    % Using reflection, but avoiding duplication of Job ID info
-                    fields = fieldnames(array.job(n));
-                    fields = setdiff(fields, {'jobId'});
-                    for field = fields'
-                        fieldElement = docNode.createElement(field{1});
-                        fieldElement.appendChild( ...
-                            docNode.createTextNode(array.job(n).(field{1})));
-                        jobElement.appendChild(fieldElement);
-                    end
-                    arrayElement.appendChild(jobElement);
+                % Using reflection, but avoiding duplication of Job ID info
+                fields = fieldnames(array.job(n));
+                fields = setdiff(fields, {'jobId'});
+                for field = fields'
+                    fieldElement = docNode.createElement(field{1});
+                    fieldElement.appendChild( ...
+                        docNode.createTextNode(array.job(n).(field{1})));
+                    jobElement.appendChild(fieldElement);
                 end
-                funcElement.appendChild(arrayElement);
+                arrayElement.appendChild(jobElement);
             end
-            docRootNode.appendChild(funcElement);
+            funcElement.appendChild(arrayElement);
         end
+        docRootNode.appendChild(funcElement);
     end
     xmlwrite(filename, docNode);
 end

zUtil_OAR/submitOar.m

@@ -61,7 +61,7 @@ try
     fprintf(' Done.\n')
 catch mexc
     gtPrintException(mexc)
-    oarparameters = [];
+    oarparameters = struct();
     fprintf(' it doesn''t exist! Creating a new one!\n')
 end
 

zUtil_OAR/updateOar.m

@@ -15,26 +15,25 @@ function updateOar(queryname, action)
 %[sub]- updateArray
 %
 
-if (~exist('queryname', 'var') || isempty(queryname))
-    queryname = 'gt*';
-end
-if (~exist('action', 'var') || isempty(action))
-    action = 'update';
-end
+    if (~exist('queryname', 'var') || isempty(queryname))
+        queryname = 'gt*';
+    end
+    if (~exist('action', 'var') || isempty(action))
+        action = 'update';
+    end
 
-oarparameters = gtOarLoadParameters('oarparameters');
-% Needed for compatibility with old files
-oarparameters = clean(oarparameters);
+    oarparameters = gtOarLoadParameters('oarparameters');
+    % Needed for compatibility with old files
+    oarparameters = clean(oarparameters);
 
-if ischar(queryname)
-    lookfunc = true;
-    funcname = queryname;
-else
-    lookfunc = false;
-    arrayid = queryname;
-end
+    if ischar(queryname)
+        lookfunc = true;
+        funcname = queryname;
+    else
+        lookfunc = false;
+        arrayid = queryname;
+    end
 
-if (~isempty(oarparameters) && ~isempty(fieldnames(oarparameters)))
     fnames = fieldnames(oarparameters);
 
     if (lookfunc)
@@ -131,10 +130,8 @@ if (~isempty(oarparameters) && ~isempty(fieldnames(oarparameters)))
             end % end for jj
         end
     end % end lookfunc
-end % end if
-
-gtOarSaveParameters('oarparameters', oarparameters);
 
+    gtOarSaveParameters('oarparameters', oarparameters);
 end % end of function
 
 % Sub-functions