Implements _LeObject.hierarchy_del() and LeType.del_superior()

leobject/datasources/dummy.py

@@ -54,7 +54,7 @@ class DummyDatasource(object):
     
     ## @brief Add a superior to a LeObject
     # @note in the MySQL version the method will have a depth=None argument to allow reccursive calls to add all the path to the root with corresponding depth
-    # @param lesup LeType : superior LeType child class instance
+    # @param lesup LeType | LeRoot : superior LeType child class instance or @ref
     # @param lesub LeType : subordinate LeType child class instance
     # @param nature str : A relation nature @ref EditorialModel.classtypesa
     # @param rank int : The rank of this relation
@@ -85,6 +85,7 @@ class DummyDatasource(object):
     def get_subordinates(self, lesup, nature):
         pass
 
+
     ## @brief Make a relation between 2 LeType
     # @note rel2type relations. Superior is the LeType from the EmClass and subordinate the LeType for the EmType
     # @param lesup LeType : LeType child class instance that is from the EmClass containing the rel2type field

leobject/leobject.py

@@ -264,7 +264,30 @@ class _LeObject(object):
                 raise RuntimeError("Unable to delete the previous superior")
 
         return self._datasource.add_superior(lesup, lesub, nature, rank)
-        
+    
+    ## @brief Delete a hierarchy link between two LeObject
+    # @param lesup LeType | LeRoot : LeType child class or hierarchy root
+    # @param lesub LeType : LeType child class
+    # @param nature str : The nature of the relation @ref EditorialModel.classtypes
+    # @return True if deletion done successfully
+    # @throw ValueError when bad arguments given
+    @classmethod
+    def hierarchy_del(cls, lesup, lesub, nature):
+        if nature not in EditorialModel.classtypes.EmClassType.natures(lesub._classtype):
+            raise ValueError("Invalid nature '%s' for %s"%(nature, lesup.__class__.__name__))
+
+        if not cls.leo_is_root(lesup):
+            if nature not in EditorialModel.classtypes.EmClassType.natures(lesup._classtype):
+                raise ValueError("Invalid nature '%s' for %s"%(nature, lesup.__class__.__name__))
+            if lesup.__class__ not in lesub._superiors[nature]:
+                raise ValueError("%s is not a valid superior for %s"%(lesup.__class__, lesub.__class__))
+        superiors = cls.hierarchy_get(lesub, nature, leo_is_sup = False)
+        res = True
+        for _lesup in superiors:
+            if not cls._datasource.del_superior(_lesup, lesub, nature):
+                #How to handler this ?
+                res = False
+        return res
 
     ## @brief Prepare a field_list
     # @param field_list list : List of string representing fields

leobject/letype.py

@@ -167,6 +167,13 @@ class LeType(object):
     # @return The relation ID or False if fails
     def add_superior(self, leo, nature, rank = 'last', replace_if_exists = False):
         return leobject.lefactory.LeFactory.leobj_from_name('LeObject').hierarchy_add(leo, self, nature, rank, replace_if_exists)
+
+    ## @brief Delete a superior given a relation's natue
+    # @param leo LeType | LeRoot : The superior to delete
+    # @param nature str : The nature of the relation @ref EditorialModel.classtypes
+    # @return True if deletion is a success
+    def del_superior(self, leo, nature):
+        return leobject.lefactory.leobj_from_name('LeObject').hierarchy_del(leo, self, nature)
         
     
     ## @brief Delete a LeType from the datasource