# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1512730721 -3600
# Node ID 6bb958e6e26a34dbc0b2570752b4c2da5a04c904
# Parent  26ff0b922ab0cf885d854f30a664ee1ed38ea0da
Version 0.1.6

diff -r 26ff0b922ab0 -r 6bb958e6e26a buildout.cfg
--- a/buildout.cfg	Fri Dec 08 11:22:31 2017 +0100
+++ b/buildout.cfg	Fri Dec 08 11:58:41 2017 +0100
@@ -84,4 +84,4 @@
 eggs = pyams_content_es [test]
 
 [versions]
-pyams_content_es = 0.1.5
+pyams_content_es = 0.1.6
diff -r 26ff0b922ab0 -r 6bb958e6e26a docs/HISTORY.txt
--- a/docs/HISTORY.txt	Fri Dec 08 11:22:31 2017 +0100
+++ b/docs/HISTORY.txt	Fri Dec 08 11:58:41 2017 +0100
@@ -1,6 +1,10 @@
 History
 =======
 
+0.1.6
+-----
+ - updated external files and paragraphs index adapters
+
 0.1.5
 -----
  - updated paragraphs index adapters
diff -r 26ff0b922ab0 -r 6bb958e6e26a docs/README.txt
--- a/docs/README.txt	Fri Dec 08 11:22:31 2017 +0100
+++ b/docs/README.txt	Fri Dec 08 11:58:41 2017 +0100
@@ -5,7 +5,8 @@
 curl --noproxy localhost -XPUT    http://localhost:9200/_ingest/pipeline/attachment -d @attachment.json
 
 curl --noproxy localhost -XDELETE http://localhost:9200/onf_website
-curl --noproxy localhost -XPUT    http://localhost:9200/onf_website -d @settings.json
+curl --noproxy localhost -XPUT    http://localhost:9200/onf_website -d @index-settings.json
 
-curl --noproxy localhost -XPUT    http://localhost:9200/onf_website/WfNewsEvent/_mapping -d @WfNewsEvent.json
-curl --noproxy localhost -XPUT    http://localhost:9200/onf_website/WfBlogPost/_mapping -d @WfBlogPost.json
+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
diff -r 26ff0b922ab0 -r 6bb958e6e26a docs/mappings/mappings/WfNewsEvent.json
--- a/docs/mappings/mappings/WfNewsEvent.json	Fri Dec 08 11:22:31 2017 +0100
+++ b/docs/mappings/mappings/WfNewsEvent.json	Fri Dec 08 11:58:41 2017 +0100
@@ -163,7 +163,7 @@
 				"type": "object",
 				"properties": {
 					"city": {
-						"type": "keyword"
+						"type": "string"
 					},
 					"coords": {
 						"type": "geo_point"
diff -r 26ff0b922ab0 -r 6bb958e6e26a docs/mappings/mappings/WfTopic.json
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/mappings/mappings/WfTopic.json	Fri Dec 08 11:58:41 2017 +0100
@@ -0,0 +1,221 @@
+{
+	"WfTopic": {
+		"properties": {
+			"internal_id": {
+				"type": "keyword"
+			},
+			"content_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": {
+					"city": {
+						"type": "string"
+					},
+					"coords": {
+						"type": "geo_point"
+					},
+					"countries": {
+						"type": "keyword"
+					},
+					"departments": {
+						"type": "keyword"
+					},
+					"forests": {
+						"type": "keyword"
+					},
+					"postal_code": {
+						"type": "keyword"
+					},
+					"structures": {
+						"type": "keyword"
+					}
+				}
+			},
+			"hearing": {
+				"type": "object",
+				"properties": {
+					"targets": {
+						"type": "keyword"
+					},
+					"source_site": {
+						"type": "keyword"
+					},
+					"diffusion_sites": {
+						"type": "keyword"
+					}
+				}
+			},
+			"themes": {
+				"type": "object",
+				"properties": {
+					"terms": {
+						"type": "keyword"
+					},
+					"synonyms": {
+						"type": "keyword"
+					},
+					"parents": {
+						"type": "keyword"
+					},
+					"associations": {
+						"type": "keyword"
+					}
+				}
+			}
+		}
+	}
+}
diff -r 26ff0b922ab0 -r 6bb958e6e26a setup.py
--- a/setup.py	Fri Dec 08 11:22:31 2017 +0100
+++ b/setup.py	Fri Dec 08 11:58:41 2017 +0100
@@ -22,7 +22,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.1.5'
+version = '0.1.6'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = []
diff -r 26ff0b922ab0 -r 6bb958e6e26a src/pyams_content_es.egg-info/PKG-INFO
--- a/src/pyams_content_es.egg-info/PKG-INFO	Fri Dec 08 11:22:31 2017 +0100
+++ b/src/pyams_content_es.egg-info/PKG-INFO	Fri Dec 08 11:58:41 2017 +0100
@@ -1,11 +1,12 @@
 Metadata-Version: 1.1
 Name: pyams-content-es
-Version: 0.1.5
+Version: 0.1.6
 Summary: PyAMS content interfaces and classes for ElasticSearch indexation
 Home-page: http://hg.ztfy.org/pyams/pyams_content_es
 Author: Thierry Florac
 Author-email: tflorac@ulthar.net
 License: ZPL
+Description-Content-Type: UNKNOWN
 Description: 
         Liste des actions à effectuer
         =============================
@@ -13,15 +14,20 @@
         curl --noproxy localhost -XPUT    http://localhost:9200/_ingest/pipeline/attachment -d @attachment.json
         
         curl --noproxy localhost -XDELETE http://localhost:9200/onf_website
-        curl --noproxy localhost -XPUT    http://localhost:9200/onf_website -d @settings.json
+        curl --noproxy localhost -XPUT    http://localhost:9200/onf_website -d @index-settings.json
         
-        curl --noproxy localhost -XPUT    http://localhost:9200/onf_website/WfNewsEvent/_mapping -d @WfNewsEvent.json
-        curl --noproxy localhost -XPUT    http://localhost:9200/onf_website/WfBlogPost/_mapping -d @WfBlogPost.json
+        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
         
         
         History
         =======
         
+        0.1.6
+        -----
+         - updated external files and paragraphs index adapters
+        
         0.1.5
         -----
          - updated paragraphs index adapters
diff -r 26ff0b922ab0 -r 6bb958e6e26a src/pyams_content_es.egg-info/SOURCES.txt
--- a/src/pyams_content_es.egg-info/SOURCES.txt	Fri Dec 08 11:22:31 2017 +0100
+++ b/src/pyams_content_es.egg-info/SOURCES.txt	Fri Dec 08 11:58:41 2017 +0100
@@ -7,6 +7,7 @@
 docs/mappings/mappings/WfBlogPost.json
 docs/mappings/mappings/WfImageMap.json
 docs/mappings/mappings/WfNewsEvent.json
+docs/mappings/mappings/WfTopic.json
 src/pyams_content_es/__init__.py
 src/pyams_content_es/document.py
 src/pyams_content_es/include.py