# HG changeset patch # User Thierry Florac # Date 1532084330 -7200 # Node ID 8bd665f8baabf7d49535310b368e74d88001c0f9 # Parent 43a9b140bc89d17ae39c98a578104e4cad6ac2ab Version 0.1.13 diff -r 43a9b140bc89 -r 8bd665f8baab docs/HISTORY.txt --- a/docs/HISTORY.txt Tue Jul 17 18:02:12 2018 +0200 +++ b/docs/HISTORY.txt Fri Jul 20 12:58:50 2018 +0200 @@ -1,6 +1,13 @@ History ======= +0.1.13 +------ + - added tags and collections support + - added typed content support + - updated views interface + - reorganized package + 0.1.12 ------ - updated video paragraph index info diff -r 43a9b140bc89 -r 8bd665f8baab docs/mappings/mappings/WfBlogPost.json --- a/docs/mappings/mappings/WfBlogPost.json Tue Jul 17 18:02:12 2018 +0200 +++ b/docs/mappings/mappings/WfBlogPost.json Fri Jul 20 12:58:50 2018 +0200 @@ -214,6 +214,9 @@ } } }, + "tags": { + "type": "keyword" + }, "themes": { "type": "object", "properties": { @@ -230,6 +233,9 @@ "type": "keyword" } } + }, + "collections": { + "type": "keyword" } } } diff -r 43a9b140bc89 -r 8bd665f8baab docs/mappings/mappings/WfNewsEvent.json --- a/docs/mappings/mappings/WfNewsEvent.json Tue Jul 17 18:02:12 2018 +0200 +++ b/docs/mappings/mappings/WfNewsEvent.json Fri Jul 20 12:58:50 2018 +0200 @@ -214,6 +214,9 @@ } } }, + "tags": { + "type": "keyword" + }, "themes": { "type": "object", "properties": { @@ -230,6 +233,9 @@ "type": "keyword" } } + }, + "collections": { + "type": "keyword" } } } diff -r 43a9b140bc89 -r 8bd665f8baab docs/mappings/mappings/WfReport.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/mappings/mappings/WfReport.json Fri Jul 20 12:58:50 2018 +0200 @@ -0,0 +1,245 @@ +{ + "WfReport": { + "properties": { + "internal_id": { + "type": "keyword" + }, + "content_type": { + "type": "keyword" + }, + "data_type": { + "type": "keyword" + }, + "title": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + }, + "short_name": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + }, + "description": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + }, + "body": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + }, + "keywords": { + "type": "keyword" + }, + "workflow": { + "type": "object", + "properties": { + "name": { + "type": "keyword" + }, + "date": { + "type": "date" + }, + "status": { + "type": "keyword" + }, + "created_date": { + "type": "date" + }, + "modified_date": { + "type": "date" + }, + "publication_date": { + "type": "date" + }, + "effective_date": { + "type": "date" + }, + "push_end_date": { + "type": "date" + }, + "expiration_date": { + "type": "date" + }, + "first_publication_date": { + "type": "date" + } + } + }, + "extfile": { + "type": "object", + "properties": { + "title": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + }, + "description": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + } + } + }, + "gallery": { + "type": "object", + "properties": { + "title": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + }, + "description": { + "type": "object", + "properties": { + "en": { + "type": "string" + }, + "fr": { + "type": "string", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + } + } + }, + "location": { + "type": "object", + "properties": { + "coords": { + "type": "geo_point" + }, + "forests": { + "type": "keyword" + }, + "cities": { + "type": "keyword" + }, + "departments": { + "type": "keyword" + }, + "countries": { + "type": "keyword" + }, + "structures": { + "type": "keyword" + } + } + }, + "hearing": { + "type": "object", + "properties": { + "targets": { + "type": "keyword" + }, + "national_scope": { + "type": "boolean" + }, + "forests": { + "type": "keyword" + }, + "cities": { + "type": "keyword" + }, + "departments": { + "type": "keyword" + }, + "countries": { + "type": "keyword" + }, + "structures": { + "type": "keyword" + }, + "source_site": { + "type": "keyword" + }, + "diffusion_sites": { + "type": "keyword" + } + } + }, + "tags": { + "type": "keyword" + }, + "themes": { + "type": "object", + "properties": { + "terms": { + "type": "keyword" + }, + "synonyms": { + "type": "keyword" + }, + "parents": { + "type": "keyword" + }, + "associations": { + "type": "keyword" + } + } + }, + "collections": { + "type": "keyword" + } + } + } +} diff -r 43a9b140bc89 -r 8bd665f8baab docs/mappings/mappings/WfTopic.json --- a/docs/mappings/mappings/WfTopic.json Tue Jul 17 18:02:12 2018 +0200 +++ b/docs/mappings/mappings/WfTopic.json Fri Jul 20 12:58:50 2018 +0200 @@ -214,6 +214,9 @@ } } }, + "tags": { + "type": "keyword" + }, "themes": { "type": "object", "properties": { @@ -230,6 +233,9 @@ "type": "keyword" } } + }, + "collections": { + "type": "keyword" } } } diff -r 43a9b140bc89 -r 8bd665f8baab src/pyams_content_es.egg-info/PKG-INFO --- a/src/pyams_content_es.egg-info/PKG-INFO Tue Jul 17 18:02:12 2018 +0200 +++ b/src/pyams_content_es.egg-info/PKG-INFO Fri Jul 20 12:58:50 2018 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyams-content-es -Version: 0.1.12 +Version: 0.1.13 Summary: PyAMS content interfaces and classes for ElasticSearch indexation Home-page: http://hg.ztfy.org/pyams/pyams_content_es Author: Thierry Florac @@ -24,6 +24,13 @@ History ======= + 0.1.13 + ------ + - added tags and collections support + - added typed content support + - updated views interface + - reorganized package + 0.1.12 ------ - updated video paragraph index info diff -r 43a9b140bc89 -r 8bd665f8baab src/pyams_content_es.egg-info/SOURCES.txt --- a/src/pyams_content_es.egg-info/SOURCES.txt Tue Jul 17 18:02:12 2018 +0200 +++ b/src/pyams_content_es.egg-info/SOURCES.txt Fri Jul 20 12:58:50 2018 +0200 @@ -6,6 +6,7 @@ docs/mappings/index-settings.json docs/mappings/mappings/WfBlogPost.json docs/mappings/mappings/WfNewsEvent.json +docs/mappings/mappings/WfReport.json docs/mappings/mappings/WfTopic.json src/pyams_content_es/__init__.py src/pyams_content_es/document.py @@ -26,9 +27,7 @@ src/pyams_content_es/component/extfile.py src/pyams_content_es/component/gallery.py src/pyams_content_es/component/paragraph.py -src/pyams_content_es/component/reference.py src/pyams_content_es/component/theme.py -src/pyams_content_es/component/view.py src/pyams_content_es/component/workflow.py src/pyams_content_es/doctests/README.txt src/pyams_content_es/interfaces/__init__.py @@ -37,6 +36,9 @@ src/pyams_content_es/locales/fr/LC_MESSAGES/pyams_content_es.po src/pyams_content_es/scripts/__init__.py src/pyams_content_es/scripts/index.py +src/pyams_content_es/shared/__init__.py +src/pyams_content_es/shared/view/__init__.py +src/pyams_content_es/shared/view/reference.py src/pyams_content_es/tests/__init__.py src/pyams_content_es/tests/test_utilsdocs.py src/pyams_content_es/tests/test_utilsdocstrings.py