Multiple bugfixes + create_instance.sh script update

- Add an update feature to create_instance.sh script
- Updated webui plugin load instruction (running loader.start() in run)
- Updated the way EmCmponents handles EmGroup
- Updated the way EmFields handles EmClass
- Updated xmlfile translator according to EmComponent modification

install/loader.py

@@ -14,7 +14,6 @@ except ImportError:
     print("Unable to load lodel module. exiting...")
     exit(1)
 
-
 #
 # Loading settings
 #
@@ -29,16 +28,19 @@ from lodel.plugin import core_hooks
 
 def start():
     #Load plugins
+    from lodel import logger
     from lodel.plugin import Plugin
+    logger.debug("Loader.start() called")
     Plugin.load_all()
 
     LodelHook.call_hook('lodel2_bootstraped', '__main__', None)
 
 
 if __name__ == '__main__':
-    start()
 
+    start()
     if Settings.runtest:
+        start()
         import unittest
         import tests
         loader = unittest.TestLoader()
@@ -52,6 +54,7 @@ if __name__ == '__main__':
         exit()
 
     LodelHook.call_hook('lodel2_loader_main', '__main__', None)
+
     #Run interative python
     import code
     print("""

lodel/editorial_model/components.py

@@ -170,7 +170,6 @@ class EmClass(EmComponent):
             if not emfield.data_handler_instance.can_override(parent_field.data_handler_instance):
                 raise AttributeError("'%s' field override a parent field, but data_handles are not compatible" % emfield.uid)
         self.__fields[emfield.uid] = emfield
-        emfield._emclass = self
         return emfield
     
     ##@brief Create a new EmField and add it to the EmClass
@@ -179,7 +178,7 @@ class EmClass(EmComponent):
     # @param **field_kwargs :  EmField constructor parameters ( see @ref EmField.__init__() ) 
     def new_field(self, uid, data_handler, **field_kwargs):
         assert_edit()
-        return self.add_field(EmField(uid, data_handler, **field_kwargs))
+        return self.add_field(EmField(uid, data_handler, self, **field_kwargs))
 
     def d_hash(self):
         m = hashlib.md5()
@@ -216,7 +215,7 @@ class EmField(EmComponent):
     # @param help_text MlString|str|dict : help text
     # @param group EmGroup :
     # @param **handler_kwargs : data handler arguments
-    def __init__(self, uid, data_handler, display_name = None, help_text = None, group = None, **handler_kwargs):
+    def __init__(self, uid, data_handler, em_class = None, display_name = None, help_text = None, group = None, **handler_kwargs):
         from lodel.leapi.datahandlers.base_classes import DataHandler
         super().__init__(uid, display_name, help_text, group)
         ##@brief The data handler name
@@ -228,9 +227,11 @@ class EmField(EmComponent):
         ##@brief Stores data handler instanciation options
         self.data_handler_options = handler_kwargs
         ##@brief Stores the emclass that contains this field (set by EmClass.add_field() method)
-        self._emclass = None
+        self._emclass = em_class
+        if self._emclass is None:
+            warnings.warn("No EmClass for field %s" %uid)
         if group is None:
-            warnings.warn("NO GROUP FOR FIELD %s" % uid)
+            warnings.warn("No EmGroup for field  %s" % uid)
         else:
             group.add_components([self])
 
@@ -343,7 +344,9 @@ class EmGroup(object):
         for component in components:
             if isinstance(component, EmField):
                 if component._emclass is None:
-                    warnings.warn("Adding an orphan EmField to an EmGroup")
+                    msg = "Adding an orphan EmField '%s' to EmGroup '%s'"
+                    msg %= (component, self)
+                    warnings.warn(msg)
             elif not isinstance(component, EmClass):
                 raise EditorialModelError("Expecting components to be a list of EmComponent, but %s found in the list" % type(component))
         self.__components |= set(components)

lodel/editorial_model/translator/xmlfile.py

@@ -316,7 +316,7 @@ def load_class_xml(model, elem):
         
     fields = elem.find('fields')
     for field in fields:
-        emfield = load_field_xml(model, field)
+        emfield = load_field_xml(model, field, emclass)
         l_emfields = emclass.fields()
         incls = False
         for emf in l_emfields:
@@ -329,10 +329,11 @@ def load_class_xml(model, elem):
     return emclass
     
 ##@brief Creates a EmField from a xml description
-# @param elem : the element which represents the EmField
-# @param model  : the model which will contain the new field
-# @return a new EmField object
-def load_field_xml(model, elem):
+#@param elem : the element which represents the EmField
+#@param model  : the model which will contain the new field
+#@param emclass EmClass : the EmClass of the field
+#@return a new EmField object
+def load_field_xml(model, elem, emclass):
     uid = elem.find('uid').text
     if elem.find('display_name').text is None:
         name = None
@@ -354,16 +355,13 @@ def load_field_xml(model, elem):
         group = None
         
     dhdl = elem.find('datahandler_name')
+    dhdl_opts = {}
     if dhdl.text is not None:
         dhdl_opts = elem.find('datahandler_options')
-
         if dhdl_opts is not None:
             dhdl_options = load_dhdl_options_xml(model, dhdl_opts) 
-            emfield = EmField(uid, dhdl.text, name, help_text, group, **dhdl_options)
-        else:
-            emfield = EmField(uid, dhdl.text, name, help_text, group)
-    else:
-        emfield = EmField(uid, dhdl.text, name, help_text, group)
+    emfield = EmField(
+        uid, dhdl.text, emclass, name, help_text, group, **dhdl_options)
     
     return emfield
 

lodel/leapi/leobject.py

@@ -242,14 +242,24 @@ class LeObject(object):
             ro_ds, rw_ds = cls._datasource_name
         #Read only datasource initialisation
         cls._ro_datasource = cls._init_datasource(ro_ds, True)
-        log_msg = "Read only datasource %s initialized for LeObject %s"
-        log_msg %= (ro_ds, cls.__name__)
-        logger.debug(log_msg)
+        if cls._ro_datasource is None:
+            log_msg = "No read only datasource set for LeObject %s"
+            log_msg %= cls.__name__
+            logger.debug(log_msg)
+        else:
+            log_msg = "Read only datasource '%s' initialized for LeObject %s"
+            log_msg %= (ro_ds, cls.__name__)
+            logger.debug(log_msg)
         #Read write datasource initialisation
         cls._rw_datasource = cls._init_datasource(rw_ds, False)
-        log_msg = "Read&write only datasource %s initialized for LeObject %s"
-        log_msg %= (rw_ds, cls.__name__)
-        logger.debug(log_msg)
+        if cls._ro_datasource is None:
+            log_msg = "No read/write datasource set for LeObject %s"
+            log_msg %= cls.__name__
+            logger.debug(log_msg)
+        else:
+            log_msg = "Read/write datasource '%s' initialized for LeObject %s"
+            log_msg %= (ro_ds, cls.__name__)
+            logger.debug(log_msg)
         
 
     ##@brief Replace the _datasource attribute value by a datasource instance

lodel/leapi/query.py

@@ -333,7 +333,7 @@ field to use for the relational filter"
                 res_filters.append((field,operator, value))
         
         if len(err_l) > 0:
-            raise LeApiDataCheckError(
+            raise LeApiDataCheckErrors(
                                         "Error while preparing filters : ",
                                         err_l)
         return (res_filters, rel_filters)

scripts/create_instance.sh

@@ -1,10 +1,18 @@
 #!/bin/bash
 
 usage() {
-	echo "Usage : $0 instance_name instance_dir [lodel_libdir]" 1>&2
+	echo -e "Usage : $0 instance_name (instance_dir|-u) [lodel_libdir]" 1>&2
+	echo -e "\n\tIf -u given as first argument update instance's loader.py" 1>&2
 	exit 1
 }
 
+cp_loader() {
+	cp -Rv $libdir/install/loader.py $instdir/
+	# Adding lib path to loader
+	sed -i -E "s#^(LODEL2_LIB_ABS_PATH = )None#\1'$libdir'#" "$loader"
+}
+
+
 if [ $# -lt 2 ]
 then
 	echo "Not enough arguments" 1>&2
@@ -12,6 +20,7 @@ then
 fi
 
 
+
 name="$1"
 instdir="$2"
 
@@ -21,6 +30,13 @@ libdir="${libdir:=$(realpath $(dirname $0)/..)}/"
 loader="$instdir/loader.py"
 conf="$instdir/conf.d/lodel2.ini"
 
+if [ $1 = '-u' ]
+then
+	#Update instance
+	cp_loader
+	exit 0
+fi
+
 if [ -e "$instdir" ]
 then
 	echo "Abording... "$instdir" exists" 1>&2
@@ -34,19 +50,15 @@ chmod 700 "$instdir/sessions"
 
 #cp -Rv $libdir/install/* $instdir
 cp -Rv $libdir/install/conf.d $instdir/
-cp -Rv $libdir/install/loader.py $instdir/
 cp -Rv $libdir/examples/em_test.pickle $instdir/editorial_model.pickle
 ln -sv $libdir/install/Makefile $instdir/Makefile
 ln -sv $libdir/install/lodel_admin.py $instdir/lodel_admin.py
 ln -sv $libdir/plugins $instdir/plugins
-
-
-
-# Adding lib path to loader
-sed -i -E "s#^(LODEL2_LIB_ABS_PATH = )None#\1'$libdir'#" "$loader"
+cp_loader
 # Adding instance name to conf
 sed -i -E "s#^sitename = noname#sitename = $name#" "$conf"
 
+
 echo -e "\nInstance successfully created in $instdir"
 echo -e "============================\n"
 echo "Now you should edit files in '${instdir}/conf.d/' and then run : cd $instdir && make dyncode"

tests/leapi/query/test_filtered.py

@@ -3,7 +3,7 @@ import unittest
 import tests.loader_utils
 from tests.leapi.query.utils import dyncode_module as dyncode
 
-from lodel.leapi.exceptions import LeApiDataCheckError
+from lodel.leapi.exceptions import *
 from lodel.leapi.query import LeDeleteQuery, LeUpdateQuery, LeGetQuery
 
 class LeFilteredQueryTestCase(unittest.TestCase):
@@ -53,7 +53,7 @@ class LeFilteredQueryTestCase(unittest.TestCase):
         )
         for invalid_filter in invalid_filters:
             for q_class in self.q_classes:
-                with self.assertRaises( LeApiDataCheckError,
+                with self.assertRaises( LeApiDataCheckErrors,
                                         msg="for filter '%s'" % (invalid_filter,)):
                     q_class(dyncode.Publication, invalid_filter)