Browse Source

Modified LeObject adding a _datasource_name attribute

The _datasource_name attribute replace the old _datasource attribute. The goal of the modification is to maintain easyly accessible datasource UID
Yann Weber 9 years ago
parent
commit
616acd387d
2 changed files with 7 additions and 6 deletions
  1. 2
    1
      lodel/leapi/lefactory.py
  2. 5
    5
      lodel/leapi/leobject.py

+ 2
- 1
lodel/leapi/lefactory.py View File

115
     _abstract = {abstract}
115
     _abstract = {abstract}
116
     _fields = None
116
     _fields = None
117
     _uid = {uid_list}
117
     _uid = {uid_list}
118
-    _datasource = {datasource_name}
118
+    _datasource = None
119
+    _datasource_name = {datasource_name}
119
 
120
 
120
 """.format(
121
 """.format(
121
     clsname = LeObject.name2objname(em_class.uid),
122
     clsname = LeObject.name2objname(em_class.uid),

+ 5
- 5
lodel/leapi/leobject.py View File

192
     @classmethod
192
     @classmethod
193
     def _init_datasource(cls):
193
     def _init_datasource(cls):
194
         expt_msg = "In LeAPI class '%s' " % cls.__name__
194
         expt_msg = "In LeAPI class '%s' " % cls.__name__
195
-        datasource_orig_name = cls._datasource
196
-        if cls._datasource not in Settings.datasources._fields:
195
+        datasource_orig_name = cls._datasource_name
196
+        if cls._datasource_name not in Settings.datasources._fields:
197
             expt_msg += "Unknow or unconfigured datasource %s"
197
             expt_msg += "Unknow or unconfigured datasource %s"
198
-            expt_msg %= (cls._datasource, cls.__name__)
198
+            expt_msg %= (cls._datasource_name, cls.__name__)
199
             raise SettingsError(expt_msg)
199
             raise SettingsError(expt_msg)
200
         
200
         
201
-        ds_identifier = getattr(Settings.datasources, cls._datasource)
201
+        ds_identifier = getattr(Settings.datasources, cls._datasource_name)
202
         try:
202
         try:
203
             ds_identifier = getattr(ds_identifier, 'identifier')
203
             ds_identifier = getattr(ds_identifier, 'identifier')
204
         except NameError:
204
         except NameError:
205
             expt_msg += "Datasource %s is missconfigured, missing identifier."
205
             expt_msg += "Datasource %s is missconfigured, missing identifier."
206
-            expt_msg %= cls._datasource
206
+            expt_msg %= cls._datasource_name
207
             raise SettingsError(expt_msg)
207
             raise SettingsError(expt_msg)
208
 
208
 
209
         ds_plugin, ds_name = ds_identifier.split('.')
209
         ds_plugin, ds_name = ds_identifier.split('.')

Loading…
Cancel
Save