revert changes when dealing with local status.db before

Author: phylsix

workflowmonit/workflowCollector.py

@@ -72,26 +72,6 @@ def invalidate_caches(cacheDir=None):
         pass
 
 
-def _get_workflow_from_status(path):
-    '''
-    get a dict of :py:class:`WorkflowInfo` objects by parsing the statuses.json file given the path.
-    {'workflow' : WorkflowInfo}
-
-    :param str path: path of statuses.json
-    :returns: dict of :py:class:`WorkflowInfo` with its string as key
-
-    :rtype: dict
-    '''
-
-    wf_dict = {}
-
-    wfs = errorutils.get_workflow_list_from_location(path)
-    if wfs:
-        wf_dict = {wf: workflowinfo.WorkflowInfo(wf) for wf in wfs}
-
-    return wf_dict
-
-
 def get_workflowlist_from_db(config, queryCmd):
     '''
     get a list of workflows from oracle db from a config dictionary which has a ``oracle`` key.

workflowwebtools/errorutils.py

@@ -41,14 +41,14 @@ def errors_from_list(workflows):
     return indict
 
 
-def get_workflow_list_from_location(data_location):
+def open_location(data_location):
     """
     This function assumes that the contents of the location is in JSON format.
-    It opens the data location and returns the list of workflows.
+    It opens the data location and returns the dictionary.
 
     :param str data_location: The location of the file or url
-    :returns: workflow list
-    :rtype: list
+    :returns: information in the JSON file
+    :rtype: dict
     """
     config_dict = serverconfig.config_dict()
 
@@ -60,7 +60,7 @@ def get_workflow_list_from_location(data_location):
         wkfs = [row for row, in oracle_cursor]
         oracle_db_conn.close()
         cherrypy.log('Number of workflows from database: %i' % len(wkfs))
-        return wkfs
+        return errors_from_list(wkfs)
 
     raw = None
 
@@ -87,27 +87,10 @@ def get_workflow_list_from_location(data_location):
     if not (keys and isinstance(raw[keys[0]], list)):
         return raw
 
-    return [
+    return errors_from_list([
         workflow for workflow, statuses in raw.iteritems()
         if True in ['manual' in status for status in statuses]
-    ]
-
-
-def open_location(data_location):
-    """
-    This function assumes that the contents of the location is in JSON format.
-    It opens the data location and returns the dictionary.
-
-    :param str data_location: The location of the file or url
-    :returns: information in the JSON file
-    :rtype: dict
-    """
-    wkfs = get_workflow_list_from_location(data_location)
-    
-    if wkfs:
-        return errors_from_list(wkfs)
-    else:
-        return None
+    ])
 
 
 def get_list_info(status_list):