--- a/buildout.cfg Fri Jan 26 16:46:11 2018 +0100
+++ b/buildout.cfg Fri Jan 26 17:23:06 2018 +0100
@@ -84,4 +84,4 @@
eggs = pyams_content_es [test]
[versions]
-pyams_content_es = 0.1.7
+pyams_content_es = 0.1.8
--- a/docs/HISTORY.txt Fri Jan 26 16:46:11 2018 +0100
+++ b/docs/HISTORY.txt Fri Jan 26 17:23:06 2018 +0100
@@ -1,6 +1,11 @@
History
=======
+0.1.8
+-----
+ - updated Elasticsearch mappings
+ - use ZODBConnection as context manager when starting indexer process
+
0.1.7
-----
- use ZODBConnection class instead of ZEOConnection to handle any ZODB storage for content indexer
--- a/docs/mappings/mappings/WfBlogPost.json Fri Jan 26 16:46:11 2018 +0100
+++ b/docs/mappings/mappings/WfBlogPost.json Fri Jan 26 17:23:06 2018 +0100
@@ -162,22 +162,19 @@
"location": {
"type": "object",
"properties": {
- "city": {
- "type": "string"
- },
"coords": {
"type": "geo_point"
},
- "countries": {
+ "forests": {
+ "type": "keyword"
+ },
+ "cities": {
"type": "keyword"
},
"departments": {
"type": "keyword"
},
- "forests": {
- "type": "keyword"
- },
- "postal_code": {
+ "countries": {
"type": "keyword"
},
"structures": {
@@ -191,6 +188,24 @@
"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"
},
--- a/docs/mappings/mappings/WfNewsEvent.json Fri Jan 26 16:46:11 2018 +0100
+++ b/docs/mappings/mappings/WfNewsEvent.json Fri Jan 26 17:23:06 2018 +0100
@@ -162,22 +162,19 @@
"location": {
"type": "object",
"properties": {
- "city": {
- "type": "string"
- },
"coords": {
"type": "geo_point"
},
- "countries": {
+ "forests": {
+ "type": "keyword"
+ },
+ "cities": {
"type": "keyword"
},
"departments": {
"type": "keyword"
},
- "forests": {
- "type": "keyword"
- },
- "postal_code": {
+ "countries": {
"type": "keyword"
},
"structures": {
@@ -191,6 +188,24 @@
"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"
},
--- a/docs/mappings/mappings/WfTopic.json Fri Jan 26 16:46:11 2018 +0100
+++ b/docs/mappings/mappings/WfTopic.json Fri Jan 26 17:23:06 2018 +0100
@@ -162,22 +162,19 @@
"location": {
"type": "object",
"properties": {
- "city": {
- "type": "string"
- },
"coords": {
"type": "geo_point"
},
- "countries": {
+ "forests": {
+ "type": "keyword"
+ },
+ "cities": {
"type": "keyword"
},
"departments": {
"type": "keyword"
},
- "forests": {
- "type": "keyword"
- },
- "postal_code": {
+ "countries": {
"type": "keyword"
},
"structures": {
@@ -191,6 +188,24 @@
"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"
},
--- a/setup.py Fri Jan 26 16:46:11 2018 +0100
+++ b/setup.py Fri Jan 26 17:23:06 2018 +0100
@@ -22,7 +22,7 @@
README = os.path.join(DOCS, 'README.txt')
HISTORY = os.path.join(DOCS, 'HISTORY.txt')
-version = '0.1.7'
+version = '0.1.8'
long_description = open(README).read() + '\n\n' + open(HISTORY).read()
tests_require = []
--- a/src/pyams_content_es.egg-info/PKG-INFO Fri Jan 26 16:46:11 2018 +0100
+++ b/src/pyams_content_es.egg-info/PKG-INFO Fri Jan 26 17:23:06 2018 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pyams-content-es
-Version: 0.1.7
+Version: 0.1.8
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,11 @@
History
=======
+ 0.1.8
+ -----
+ - updated Elasticsearch mappings
+ - use ZODBConnection as context manager when starting indexer process
+
0.1.7
-----
- use ZODBConnection class instead of ZEOConnection to handle any ZODB storage for content indexer