New constants in EditorialModel.classtypes

EditorialModel/classtypes.py

@@ -1,17 +1,25 @@
 # -*- coding: utf-8 -*-
 
+object_uid = 'lodel_id'
+object_em_class_id = 'class_id'
+object_em_type_id = 'type_id'
+
+relation_uid = 'id_relation'
+relation_superior = 'superior'
+relation_subordinate = 'subordinate'
+
 
 common_fields = {
-    'lodel_id': {
+    object_uid: {
         'fieldtype': 'pk',
         'internal': 'autosql',
     },
-    'class_id': {
+    object_em_class_id : {
         'fieldtype': 'emuid',
         'is_id_class': True,
         'internal': 'automatic',
     },
-    'type_id': {
+    object_em_type_id : {
         'fieldtype': 'emuid',
         'is_id_class': False,
         'internal': 'automatic',
@@ -36,7 +44,7 @@ common_fields = {
 }
 
 relations_common_fields = {
-    'id_relation': {
+    relation_uid: {
         'fieldtype': 'pk',
         'internal': 'autosql',
     },
@@ -51,11 +59,11 @@ relations_common_fields = {
         'fieldtype': 'rank',
         'internal': 'automatic',
     },
-    'superior': {
+    relation_superior : {
         'fieldtype': 'leo',
         'superior': True,
     },
-    'subordinate': {
+    relation_subordinate: {
         'fieldtype': 'leo',
         'superior': False,
     }

leapi/lecrud.py

@@ -4,6 +4,7 @@
 # @brief This package contains the abstract class representing Lodel Editorial components
 #
 
+import copy
 import warnings
 import importlib
 import re
@@ -151,9 +152,7 @@ class _LeCrud(object):
     # @todo test for abstract method !!!
     @classmethod
     def uidname(cls):
-        if cls._uid_fieldtype is None or len(cls._uid_fieldtype) == 0:
-            raise NotImplementedError("Abstract method uid_name for %s!"%cls.__name__)
-        return list(cls._uid_fieldtype.keys())[0]
+        raise NotImplementedError("Abstract method uid_name for %s!"%cls.__name__)
     
     ## @return maybe Bool: True if cls implements LeType
     # @param cls Class: a Class or instanciated object
@@ -461,10 +460,10 @@ class _LeCrud(object):
     # @todo Decide wether or not the datas are modifed inplace or returned in a new dict (second solution for the moment)
     @classmethod
     def _construct_datas(cls, datas):
-        res_datas = dict()
+        res_datas = copy.copy(datas)
         for fname, ftype in cls.fieldtypes().items():
             if not ftype.is_internal() or ftype.internal != 'autosql':
-                res_datas[fname] = ftype.construct_data(cls, fname, datas)
+                res_datas[fname] = ftype.construct_data(cls, fname, res_datas)
         return res_datas
     ## @brief Check datas consistency
     # 

leapi/lefactory.py

@@ -5,6 +5,7 @@ import copy
 import os.path
 
 import EditorialModel
+from EditorialModel import classtypes
 from EditorialModel.model import Model
 from EditorialModel.fieldtypes.generic import GenericFieldType
 from leapi.lecrud import _LeCrud
@@ -196,25 +197,6 @@ import %s
         (leobj_uid_fieldtype, leobj_fieldtypes) = self.concret_fieldtypes(EditorialModel.classtypes.common_fields)
         #Building the fieldtypes dict for LeRelation
         (lerel_uid_fieldtype, lerel_fieldtypes) = self.concret_fieldtypes(EditorialModel.classtypes.relations_common_fields)
-        # Fetching superior and subordinate fieldname for LeRelation
-        lesup = None
-        lesub = None
-        for fname, finfo in EditorialModel.classtypes.relations_common_fields.items():
-            if finfo['fieldtype'] == 'leo':
-                if finfo['superior']:
-                    lesup = fname
-                else:
-                    lesub = fname
-        # Fetch class_id and type_id fieldnames for LeObject
-        class_id = None
-        type_id = None
-        for fname, finfo in EditorialModel.classtypes.common_fields.items():
-            if finfo['fieldtype'] == 'emuid':
-                if finfo['is_id_class']:
-                    class_id = fname
-                else:
-                    type_id = fname
-        # TEST IF SOME OF THE ARE NONE !!!
 
         result += """
 ## @brief _LeCrud concret class
@@ -236,7 +218,9 @@ class LeObject(LeCrud, leapi.leobject._LeObject):
 class LeRelation(LeCrud, leapi.lerelation._LeRelation):
     _uid_fieldtype = {lerel_uid_fieldtype}
     _rel_fieldtypes = {lerel_fieldtypes}
+    ## WARNING !!!! OBSOLETE ! DON'T USE IT
     _superior_field_name = {lesup_name}
+    ## WARNING !!!! OBSOLETE ! DON'T USE IT
     _subordinate_field_name = {lesub_name}
 
 class LeHierarch(LeRelation, leapi.lerelation._LeHierarch):
@@ -258,10 +242,10 @@ class LeType(LeClass, _LeType):
             leo_fieldtypes = '{\n\t' + (',\n\t'.join(leobj_fieldtypes))+ '\n\t}',
             lerel_fieldtypes = '{\n\t' + (',\n\t'.join(lerel_fieldtypes))+ '\n\t}',
             lerel_uid_fieldtype = lerel_uid_fieldtype,
-            lesup_name = repr(lesup),
-            lesub_name = repr(lesub),
-            class_id = repr(class_id),
-            type_id = repr(type_id),
+            lesup_name = repr(classtypes.relation_superior),
+            lesub_name = repr(classtypes.relation_subordinate),
+            class_id = repr(classtypes.object_em_class_id),
+            type_id = repr(classtypes.object_em_type_id),
         )
 
         emclass_l = model.components(EditorialModel.classes.EmClass)

leapi/leobject.py

@@ -59,6 +59,11 @@ class _LeObject(_LeCrud):
     def __repr__(self):
         return self.__str__()
     
+    ## @brief Returns the name of the uid field
+    @classmethod
+    def uidname(cls):
+        return EditorialModel.classtypes.object_uid
+
     ## @brief Given a ME uid return the corresponding LeClass or LeType class
     # @return a LeType or LeClass child class
     # @throw KeyError if no corresponding child classes

leapi/lerelation.py

@@ -33,6 +33,12 @@ class _LeRelation(lecrud._LeCrud):
         if isinstance(leo, leobject._LeObject):
             return (self._subordinate_field_name, '=', leo)
 
+    
+    ## @return The name of the uniq id field
+    @classmethod
+    def uidname(cls):
+        return EditorialModel.classtypes.relation_uid
+
     ## @return a dict with field name as key and fieldtype instance as value
     @classmethod
     def fieldtypes(cls):