Merge pull request #116 from opengisch/modification_baskets_datasets_followup

Implement delete basket method in Ili2dbUtils

Author: signedav

modelbaker/iliwrapper/ili2dbconfig.py

@@ -490,6 +490,7 @@ class DeleteConfiguration(Ili2DbCommandConfiguration):
     def __init__(self, other: Ili2DbCommandConfiguration = None):
         super().__init__(other)
         self.dataset = ""
+        self.baskets = ""
 
     def to_ili2db_args(self, extra_args=[], with_action=True):
         args = list()
@@ -499,7 +500,11 @@ def to_ili2db_args(self, extra_args=[], with_action=True):
 
         self.append_args(args, extra_args)
 
-        self.append_args(args, ["--dataset", self.dataset])
+        if self.dataset:
+            self.append_args(args, ["--dataset", self.dataset])
+
+        if self.baskets:
+            self.append_args(args, ["--baskets", self.baskets])
 
         self.append_args(args, Ili2DbCommandConfiguration.to_ili2db_args(self))
 

modelbaker/utils/ili2db_utils.py

@@ -40,9 +40,48 @@ def __init__(self):
 
         self._log = ""
 
+    def delete_baskets(
+        self, baskets: str, configuration: Ili2DbCommandConfiguration = None
+    ):
+        """
+        :param baskets: Semicolon-separated list of baskets to be deleted
+        :param configuration: Base Ili2DbCommandConfiguration object
+        :return: Tuple with boolean result and optional message
+        """
+        deleter = ilideleter.Deleter()
+        deleter.tool = configuration.tool
+        deleter.configuration = DeleteConfiguration(configuration)
+        deleter.configuration.baskets = baskets
+
+        with OverrideCursor(Qt.WaitCursor):
+            self._connect_ili_executable_signals(deleter)
+            self._log = ""
+
+            res = True
+            msg = self.tr("Basket(s) '{}' successfully deleted!").format(baskets)
+            try:
+                if deleter.run() != ilideleter.Deleter.SUCCESS:
+                    msg = self.tr(
+                        "An error occurred when deleting the basket(s) '{}' from the DB (check the QGIS log panel)."
+                    ).format(baskets)
+                    res = False
+                    self.log_on_error.emit(self._log)
+            except JavaNotFoundError as e:
+                msg = e.error_string
+                res = False
+
+            self._disconnect_ili_executable_signals(deleter)
+
+        return res, msg
+
     def delete_dataset(
         self, dataset: str, configuration: Ili2DbCommandConfiguration = None
     ):
+        """
+        :param dataset: Dataset id to be deleted
+        :param configuration: Base Ili2DbCommandConfiguration object
+        :return: Tuple with boolean result and optional message
+        """
         deleter = ilideleter.Deleter()
         deleter.tool = configuration.tool
         deleter.configuration = DeleteConfiguration(configuration)