Improve logging

rdmorganiser · Mar 21, 2018 · eba712a · eba712a
1 parent dfbe207
commit eba712a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/rdmo/conditions/imports.py b/rdmo/conditions/imports.py
@@ -11,7 +11,7 @@
 
 
 def import_conditions(conditions_node):
-    log.info("Importing conditions")
+    log.info('Importing conditions')
     nsmap = get_ns_map(conditions_node.getroot())
 
     for condition_node in conditions_node.findall('condition'):
@@ -21,9 +21,9 @@ def import_conditions(conditions_node):
             condition = Condition.objects.get(uri=condition_uri)
         except Condition.DoesNotExist:
             condition = Condition()
-            log.info('Condition not in db. Created new one with uri ' + condition_uri)
+            log.info('Condition not in db. Created with uri ' + condition_uri)
         else:
-            log.info('Condition does exist. It was loaded from uri  ' + condition_uri)
+            log.info('Condition does exist. Loaded from uri ' + condition_uri)
 
         condition.uri_prefix = condition_uri.split('/conditions/')[0]
         condition.key = condition_uri.split('/')[-1]

diff --git a/rdmo/domain/imports.py b/rdmo/domain/imports.py
@@ -25,10 +25,10 @@ def import_attribute_entity(entity_node, nsmap, parent=None):
     try:
         entity = AttributeEntity.objects.get(uri=uri, parent=parent)
     except AttributeEntity.DoesNotExist:
-        log.info('Entity not in db. Created new one with uri ' + str(uri))
         entity = AttributeEntity()
+        log.info('Entity not in db. Created with uri ' + str(uri))
     else:
-        log.info('Entity does exist. It was loaded from uri  ' + str(uri))
+        log.info('Entity does exist. Loaded from uri ' + str(uri))
 
     entity.parent = parent
     entity.uri_prefix = uri.split('/domain/')[0]
@@ -65,11 +65,11 @@ def import_attribute(attribute_node, nsmap, parent=None):
         attribute = Attribute.objects.get(uri=uri)
         attribute.key
     except Attribute.DoesNotExist:
-        log.info('Attribute not in db. Created new one with uri ' + str(uri))
+        log.info('Attribute not in db. Created with uri ' + str(uri))
         attribute = Attribute()
         pass
     else:
-        log.info('Attribute does exist. It was loaded from uri  ' + str(uri))
+        log.info('Attribute does exist. Loaded from uri ' + str(uri))
 
     attribute.parent = parent
     attribute.uri_prefix = uri.split('/domain/')[0]
@@ -116,8 +116,8 @@ def import_verbose_name(verbosename_node, entity):
             setattr(verbosename, 'name_' + element.get('lang'), element.text)
         for element in verbosename_node.findall('name_plural'):
             setattr(verbosename, 'name_plural_' + element.get('lang'), element.text)
-        log.info('Saving verbosename ' + str(verbosename))
+        log.info('Verbosename saving ' + str(verbosename))
         verbosename.save()
     except Exception as e:
-        log.info('An exception occured: ' + str(e))
+        log.info('Verbosename, an exception occured: ' + str(e))
         pass
diff --git a/rdmo/options/imports.py b/rdmo/options/imports.py
@@ -10,7 +10,7 @@
 
 
 def import_options(optionsets_node):
-    log.info("Importing options")
+    log.info('Importing options')
 
     nsmap = get_ns_map(optionsets_node.getroot())
 
@@ -20,17 +20,18 @@ def import_options(optionsets_node):
         try:
             optionset = OptionSet.objects.get(uri=uri)
         except OptionSet.DoesNotExist:
-            log.info(OptionSet.DoesNotExist)
             optionset = OptionSet()
+            log.info('Optionset not in db. Created with uri ' + str(uri))
+        else:
+            log.info('Optionset does exist. Loaded from uri ' + str(uri))
 
         optionset.uri_prefix = uri.split('/options/')[0]
         optionset.key = uri.split('/')[-1]
         optionset.comment = get_value_from_xml_node(optionset_node, get_ns_tag('dc:comment', nsmap))
         optionset.order = get_value_from_xml_node(optionset_node, 'order')
-        log.info('Saving optionset ' + str(optionset))
+        log.info('Optionset saving to "' + str(uri) + '"')
         optionset.save()
 
-        # for option_node in optionset_node.options.iterchildren():
         for options_node in optionset_node.findall('options'):
             for option_node in options_node.findall('option'):
                 uri = option_node.find(get_ns_tag('dc:uri', nsmap)).text
@@ -45,10 +46,9 @@ def import_options(optionsets_node):
                 option.uri_prefix = uri.split('/options/')[0]
                 option.key = uri.split('/')[-1]
                 option.comment = get_value_from_xml_node(option_node, get_ns_tag('dc:comment', nsmap))
-                log.info(get_value_from_xml_node(option_node, get_ns_tag('dc:comment', nsmap)))
                 option.order = get_value_from_xml_node(option_node, 'order')
                 for element in option_node.findall('text'):
                     setattr(option, 'text_' + element.get('lang'), element.text)
                 option.additional_input = utf8_to_bool(get_value_from_xml_node(option_node, 'additional_input'))
-                log.info('Saving option ' + str(option))
+                log.info('Option saving to "' + str(uri) + '"')
                 option.save()
diff --git a/rdmo/projects/imports.py b/rdmo/projects/imports.py
@@ -20,14 +20,15 @@ def import_project(project_node, user):
 
     try:
         project = Project.objects.get(title=project_title, user=user)
-        log.info('Skipping existing project "%s".' % project_title)
+        log.info('Project exists. Skipping "' % project_title + '".')
         return
     except Project.DoesNotExist:
         log.error(str(Project.DoesNotExist))
+        log.info('Project not in db. Created.')
         project = Project(title=project_title)
 
     try:
-        project_catalog = project_node.find("catalog")
+        project_catalog = project_node.find('catalog')
         catalog_uri = project_catalog.get(get_ns_tag('dc:uri', nsmap))
         project.catalog = Catalog.objects.get(uri=catalog_uri)
     except Catalog.DoesNotExist:
@@ -40,6 +41,7 @@ def import_project(project_node, user):
         project.description = ''
 
     project.created = project_created
+    log.info('Project saving with title "' + str(project_title) + '"')
     project.save()
 
     # add user to project

diff --git a/rdmo/tasks/imports.py b/rdmo/tasks/imports.py
@@ -20,9 +20,9 @@ def import_tasks(tasks_node):
             task = Task.objects.get(uri=task_uri)
         except Task.DoesNotExist:
             task = Task()
-            log.info('Task not in db. Created new one with uri ' + task_uri)
+            log.info('Task not in db. Created with uri ' + task_uri)
         else:
-            log.info('Task does exist. It was loaded from uri  ' + task_uri)
+            log.info('Task does exist. Loaded from uri ' + task_uri)
 
         task.uri_prefix = task_uri.split('/tasks/')[0]
         task.key = task_uri.split('/')[-1]