diff --git a/em_test.py b/em_test.py index c2ce9fd..36146fb 100644 --- a/em_test.py +++ b/em_test.py @@ -1,7 +1,9 @@ +#!/usr/bin/python3 #-*- coding: utf-8 -*- -from lodel.settings.settings import Settings as SettingsHandler -SettingsHandler('globconf.d') +from lodel.settings.settings import Settings as settings +settings('globconf.d') +from lodel.settings import Settings from lodel.editorial_model.components import * from lodel.editorial_model.exceptions import * @@ -204,14 +206,14 @@ section.new_field( 'childs', display_name = 'Next section', group = editorial_group, data_handler = 'hierarch', - allowed_class = [subsection], + allowed_classes = [subsection], back_reference = ('subsection', 'parent')) subsection.new_field( 'parent', display_name = 'Parent', group = editorial_group, data_handler = 'link', - allowed_class = [section]) + allowed_classes = [section]) ##################### # Persons & authors # @@ -286,4 +288,5 @@ text.new_field( 'linked_persons', group = editorial_person_group, ) +#em.save('xmlfile', filename = 'examples/em_test.xml') em.save('picklefile', filename = 'examples/em_test.pickle') diff --git a/examples/em_test.pickle b/examples/em_test.pickle index 26ebfe6..d504bbf 100644 Binary files a/examples/em_test.pickle and b/examples/em_test.pickle differ diff --git a/globconf.d/global.ini b/globconf.d/global.ini deleted file mode 100644 index 406f000..0000000 --- a/globconf.d/global.ini +++ /dev/null @@ -1,10 +0,0 @@ -[lodel2] -plugins_path = plugins - -[lodel2.editorialmodel] -emfile = examples/em_test.pickle -emtranslator = picklefile -dyncode = lodel/leapi/dyncode.py -editormode = True -groups = - diff --git a/globconf.d/lodel2.ini b/globconf.d/lodel2.ini new file mode 100644 index 0000000..932addf --- /dev/null +++ b/globconf.d/lodel2.ini @@ -0,0 +1,17 @@ +[lodel2] +debug = False +sitename = noname +plugins_path = plugins +plugins = dummy, webui + +[lodel2.logging.stderr] +level = DEBUG +filename = - +context = True + +[lodel2.editorialmodel] +groups = +emfile = examples/em_test.pickle +dyncode = leapi_dyncode.py +editormode = True + diff --git a/globconf.d/loggers.ini b/globconf.d/loggers.ini deleted file mode 100644 index 0972d68..0000000 --- a/globconf.d/loggers.ini +++ /dev/null @@ -1,10 +0,0 @@ -[lodel2.logging.stderr] -level = INFO -context = False - -[lodel2.logging.logfile] -level = DEBUG -context = True -filename = /tmp/lodel2.log -maxbytes = 4096 -backupcount = 1 diff --git a/tests/editorial_model.pickle b/tests/editorial_model.pickle new file mode 100644 index 0000000..8c394c0 Binary files /dev/null and b/tests/editorial_model.pickle differ diff --git a/tests/tests_conf.d/lodel2.ini b/tests/tests_conf.d/lodel2.ini new file mode 100644 index 0000000..b96df34 --- /dev/null +++ b/tests/tests_conf.d/lodel2.ini @@ -0,0 +1,17 @@ +[lodel2] +debug = False +sitename = noname +plugins_path = plugins +plugins = dummy, webui + +[lodel2.logging.stderr] +level = DEBUG +filename = - +context = True + +[lodel2.editorialmodel] +groups = +emfile = editorial_model.pickle +dyncode = leapi_dyncode.py +editormode = True +