[Fixes #13067] Thesaurus: improve management commands

Author: etj

geonode/base/admin.py

@@ -25,14 +25,14 @@
 from dal import autocomplete
 from taggit.forms import TagField
 from django.core.management import call_command
-from slugify import slugify
 from django.contrib import messages
 
 from treebeard.admin import TreeAdmin
 from treebeard.forms import movenodeform_factory
 
 from modeltranslation.admin import TabbedTranslationAdmin
 
+from geonode.base.management.commands.thesaurus_subcommands.load import ACTION_UPDATE
 from geonode.base.models import (
     TopicCategory,
     SpatialRepresentationType,
@@ -224,8 +224,7 @@ def import_rdf(self, request):
         if request.method == "POST":
             try:
                 rdf_file = request.FILES["rdf_file"]
-                name = slugify(rdf_file.name).removesuffix("-rdf")
-                call_command("load_thesaurus", file=rdf_file, name=name)
+                call_command("thesaurus", "load", action=ACTION_UPDATE, file=rdf_file)
                 self.message_user(request, "Your RDF file has been imported", messages.SUCCESS)
                 return redirect("..")
             except Exception as e:

geonode/base/management/command_utils.py

@@ -1,10 +1,14 @@
 import logging
+from logging import getLevelName
+
 from django.conf import settings
 
 DEFAULT_COMMAND_LOGGER_NAME = "geonode.commands"
 
 
-def setup_logger(logger_name=DEFAULT_COMMAND_LOGGER_NAME, formatter_name="command", handler_name="command"):
+def setup_logger(logger_name=DEFAULT_COMMAND_LOGGER_NAME, formatter_name="command", handler_name="command", level=logging.INFO):
+    logger = logging.getLogger(logger_name)
+
     if logger_name not in settings.LOGGING["loggers"]:
         format = "%(levelname)-7s %(asctime)s %(message)s"
 
@@ -18,17 +22,16 @@ def setup_logger(logger_name=DEFAULT_COMMAND_LOGGER_NAME, formatter_name="comman
         }
         settings.LOGGING["loggers"][logger_name] = {
             "handlers": [handler_name],
-            "level": "INFO",
+            "level": getLevelName(level),
             "propagate": False
         }
 
         handler = logging.StreamHandler()
         handler.setFormatter(logging.Formatter(fmt=format))
-        handler.setLevel(logging.DEBUG)
+        handler.setLevel(level)
 
-        logger = logging.getLogger(logger_name)
         logger.addHandler(handler)
-        logger.setLevel(logging.INFO)
+        logger.setLevel(level)
         logger.propagate = False
 
-        return logger
+    return logger