Autotools adaptation for new directories

configure.ac

@@ -12,6 +12,8 @@ AC_CONFIG_FILES([Makefile \
 		lodel/leapi/datahandlers/Makefile \
 	lodel/plugin/Makefile \
 	lodel/settings/Makefile \
+	lodel/validator/Makefile \
+	lodel/mlnamedobject/Makefile \
 	lodel/utils/Makefile \
 	progs/Makefile \
 	progs/slim/Makefile \

lodel/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS=auth editorial_model leapi plugin settings utils plugins
+SUBDIRS=auth editorial_model leapi plugin settings utils plugins validator mlnamedobject
 EXTRA_DIST = plugins
 lodel_PYTHON = *.py
 CLEANFILES = buildconf.py

lodel/leapi/datahandlers/base_classes.py

@@ -254,17 +254,19 @@ class DataHandler(MlNamedObject):
         return all_handlers[name]
 
     # @brief List all datahandlers
-    # @return
+    # @return a dict with, display_name for keys, and a dict for value 
     @classmethod
     def list_data_handlers(cls):
         cls.load_base_handlers()
         all_handlers = dict(cls._base_handlers, **cls.__custom_handlers)
         list_dh = dict()
         for hdl in all_handlers:
-            list_dh[hdl] = (display_name=hdl.display_name, \
-                            help_text=hdl.help_text, nullable=hdl.nullable, \
-                            internal=hdl.internal, immutable=hdl.immutable, \
-                            primary_key=hdl.primary_key, options=self.options_spec)
+            list_dh[hdl.display_name] = {'help_text' : hdl.help_text,
+                            'nullable' : hdl.nullable, \
+                            'internal' : hdl.internal,
+                            'immutable' : hdl.immutable, \
+                            'primary_key' : hdl.primary_key, \
+                            'options' : self.options_spec}
 
         return list_dh
 

lodel/mlnamedobject/Makefile.am

@@ -0,0 +1,2 @@
+mlnamedobject_PYTHON= *.py
+mlnamedobjectdir=$(pkgpythondir)/mlnamedobject

lodel/settings/settings_loader.py

@@ -8,8 +8,7 @@ from lodel.context import LodelContext
 
 LodelContext.expose_modules(globals(), {
     'lodel.logger': 'logger',
-    'lodel.settings.utils': ['SettingsError', 'SettingsErrors'],
-    'lodel.validator.validator': ['ValidationError']})
+    'lodel.settings.utils': ['SettingsError', 'SettingsErrors']})
 
 ##@brief Merges and loads configuration files
 class SettingsLoader(object):
@@ -104,7 +103,7 @@ class SettingsLoader(object):
                                     key_id=section+'.'+keyname)
                 self.__errors_list.append(expt)
             else:
-                expt = ValidationError("For %s.%s : %s" % (section, keyname, e))
+                #expt = ValidationError("For %s.%s : %s" % (section, keyname, e))
                 expt2 = SettingsError(msg=str(expt), \
                                         key_id=section+'.'+keyname, \
                                         filename=sec[keyname]['file'])

lodel/validator/Makefile.am

@@ -0,0 +1,2 @@
+validator_PYTHON=*.py
+validatordir=$(pkgpythondir)/validator