# HG changeset patch # User Thierry Florac # Date 1543585598 -3600 # Node ID 0baf6315d8387724e85fcfa60289f904975364f3 # Parent 88ef502db9b11a7bec1dbf170632aabb3e79018e Version 0.1.17 diff -r 88ef502db9b1 -r 0baf6315d838 buildout.cfg --- a/buildout.cfg Fri Nov 30 14:36:43 2018 +0100 +++ b/buildout.cfg Fri Nov 30 14:46:38 2018 +0100 @@ -84,4 +84,4 @@ eggs = pyams_content_es [test] [versions] -pyams_content_es = 0.1.16.1 +pyams_content_es = 0.1.17 diff -r 88ef502db9b1 -r 0baf6315d838 docs/HISTORY.txt --- a/docs/HISTORY.txt Fri Nov 30 14:36:43 2018 +0100 +++ b/docs/HISTORY.txt Fri Nov 30 14:46:38 2018 +0100 @@ -1,6 +1,12 @@ History ======= +0.1.17 +------ + - added header to document index + - added "parent_ids" index attribute and query params + - use iterators to get query params + 0.1.16.1 -------- - use commits (after 10 documents) instead of savepoints when re-indexing the whole site to avoid ES timeouts diff -r 88ef502db9b1 -r 0baf6315d838 docs/README.txt --- a/docs/README.txt Fri Nov 30 14:36:43 2018 +0100 +++ b/docs/README.txt Fri Nov 30 14:46:38 2018 +0100 @@ -10,3 +10,33 @@ curl --noproxy localhost -XPUT http://localhost:9200/onf_website/WfNewsEvent/_mapping -d @mappings/WfNewsEvent.json curl --noproxy localhost -XPUT http://localhost:9200/onf_website/WfTopic/_mapping -d @mappings/WfTopic.json curl --noproxy localhost -XPUT http://localhost:9200/onf_website/WfBlogPost/_mapping -d @mappings/WfBlogPost.json + + +PUT /onf_website/_mapping/PyAMS_document +{ + "properties": { + "header": { + "type": "object", + "properties": { + "en": { + "type": "text" + }, + "fr": { + "type": "text", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + } + } +} + + +PUT /onf_website/_mapping/PyAMS_document +{ + "properties": { + "parent_ids": { + "type": "keyword" + } + } +} diff -r 88ef502db9b1 -r 0baf6315d838 docs/mappings/index-settings.json --- a/docs/mappings/index-settings.json Fri Nov 30 14:36:43 2018 +0100 +++ b/docs/mappings/index-settings.json Fri Nov 30 14:46:38 2018 +0100 @@ -74,7 +74,7 @@ } }, "mappings": { - "_default_": { + "PyAMS_document": { "properties": { "internal_id": { "type": "keyword" @@ -82,6 +82,9 @@ "reference_id": { "type": "keyword" }, + "parent_ids": { + "type": "keyword" + }, "content_type": { "type": "keyword" }, @@ -111,6 +114,19 @@ } } }, + "header": { + "type": "object", + "properties": { + "en": { + "type": "text" + }, + "fr": { + "type": "text", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + }, "description": { "type": "object", "properties": { diff -r 88ef502db9b1 -r 0baf6315d838 setup.py --- a/setup.py Fri Nov 30 14:36:43 2018 +0100 +++ b/setup.py Fri Nov 30 14:46:38 2018 +0100 @@ -22,7 +22,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.16.1' +version = '0.1.17' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] diff -r 88ef502db9b1 -r 0baf6315d838 src/pyams_content_es.egg-info/PKG-INFO --- a/src/pyams_content_es.egg-info/PKG-INFO Fri Nov 30 14:36:43 2018 +0100 +++ b/src/pyams_content_es.egg-info/PKG-INFO Fri Nov 30 14:46:38 2018 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyams-content-es -Version: 0.1.16.1 +Version: 0.1.17 Summary: PyAMS content interfaces and classes for ElasticSearch indexation Home-page: http://hg.ztfy.org/pyams/pyams_content_es Author: Thierry Florac @@ -20,9 +20,45 @@ curl --noproxy localhost -XPUT http://localhost:9200/onf_website/WfBlogPost/_mapping -d @mappings/WfBlogPost.json + PUT /onf_website/_mapping/PyAMS_document + { + "properties": { + "header": { + "type": "object", + "properties": { + "en": { + "type": "text" + }, + "fr": { + "type": "text", + "analyzer": "french", + "search_analyzer": "french_search" + } + } + } + } + } + + + PUT /onf_website/_mapping/PyAMS_document + { + "properties": { + "parent_ids": { + "type": "keyword" + } + } + } + + History ======= + 0.1.17 + ------ + - added header to document index + - added "parent_ids" index attribute and query params + - use iterators to get query params + 0.1.16.1 -------- - use commits (after 10 documents) instead of savepoints when re-indexing the whole site to avoid ES timeouts