# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1499862386 -7200
# Node ID 4d9c23cdfa8203cfee2252b46ed6384002284f97
# Parent  e5add18ddc339e20a440cd67902f004b26868919
Version 0.1.2

diff -r e5add18ddc33 -r 4d9c23cdfa82 buildout.cfg
--- a/buildout.cfg	Wed Jul 12 12:03:17 2017 +0200
+++ b/buildout.cfg	Wed Jul 12 14:26:26 2017 +0200
@@ -84,4 +84,4 @@
 eggs = pyams_content_es [test]
 
 [versions]
-pyams_content_es = 0.1.1
+pyams_content_es = 0.1.2
diff -r e5add18ddc33 -r 4d9c23cdfa82 docs/HISTORY.txt
--- a/docs/HISTORY.txt	Wed Jul 12 12:03:17 2017 +0200
+++ b/docs/HISTORY.txt	Wed Jul 12 14:26:26 2017 +0200
@@ -1,6 +1,14 @@
 History
 =======
 
+0.1.2
+-----
+ - added View content adapter to build queries based on Elasticsearch index
+ - use "keyword" type for mapping of content type, internal ID, workflow status, location attributes and themes
+ - update test query to use Elasticsearch-DSL package
+ - updated Elasticsearch mappings
+ - updated workflow properties index
+
 0.1.1
 -----
  - updated external files mapping for ingest-attachment plug-in
diff -r e5add18ddc33 -r 4d9c23cdfa82 docs/WfBlogPost.json
--- a/docs/WfBlogPost.json	Wed Jul 12 12:03:17 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-{
-	"WfBlogPost": {
-		"properties": {
-			"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"
-					}
-				}
-			},
-			"workflow": {
-				"type": "object",
-				"properties": {
-					"name": {
-						"type": "string"
-					},
-					"date": {
-						"type": "date"
-					},
-					"status": {
-						"type": "keyword"
-					}
-				}
-			},
-			"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"
-					}
-				}
-			},
-			"themes": {
-				"type": "object"
-			}
-		}
-	}
-}
diff -r e5add18ddc33 -r 4d9c23cdfa82 docs/WfImageMap.json
--- a/docs/WfImageMap.json	Wed Jul 12 12:03:17 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-{
-	"WfImageMap": {
-		"properties": {
-			"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"
-					}
-				}
-			},
-			"workflow": {
-				"type": "object",
-				"properties": {
-					"name": {
-						"type": "string"
-					},
-					"date": {
-						"type": "date"
-					},
-					"status": {
-						"type": "keyword"
-					}
-				}
-			}
-		}
-	}
-}
diff -r e5add18ddc33 -r 4d9c23cdfa82 docs/WfNewsEvent.json
--- a/docs/WfNewsEvent.json	Wed Jul 12 12:03:17 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-{
-	"WfNewsEvent": {
-		"properties": {
-			"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"
-					}
-				}
-			},
-			"workflow": {
-				"type": "object",
-				"properties": {
-					"name": {
-						"type": "string"
-					},
-					"date": {
-						"type": "date"
-					},
-					"status": {
-						"type": "keyword"
-					}
-				}
-			},
-			"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"
-					}
-				}
-			},
-			"themes": {
-				"type": "object"
-			}
-		}
-	}
-}
diff -r e5add18ddc33 -r 4d9c23cdfa82 docs/attachment.json
--- a/docs/attachment.json	Wed Jul 12 12:03:17 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-{
-	"description": "Extract attachments informations",
-	"processors": [
-		{
-			"foreach": {
-				"field": "attachments",
-				"processor": {
-					"attachment": {
-						"field": "_ingest._value.content",
-						"target_field": "_ingest._value.attachment",
-						"ignore_missing": true
-					}
-				}
-			}
-		}
-	]
-}
diff -r e5add18ddc33 -r 4d9c23cdfa82 docs/settings.json
--- a/docs/settings.json	Wed Jul 12 12:03:17 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-{
-	"settings": {
-		"analysis": {
-			"tokenizer": {
-				"nGram": {
-					"type": "nGram",
-					"min_gram": 3,
-					"max_gram": 20
-				}
-			},
-			"filter": {
-				"snowball_fr": {
-					"type": "snowball",
-					"language": "French"
-				},
-				"elision_fr": {
-					"type": "elision",
-					"articles": [
-						"l",
-						"m",
-						"t",
-						"qu",
-						"n",
-						"s",
-						"j",
-						"d",
-						"c",
-						"jusqu",
-						"quoiqu",
-						"lorsqu",
-						"puisqu"
-					]
-				},
-				"stop_fr": {
-					"type": "stop",
-					"stopwords": "_french_",
-					"ignore_case": true
-				},
-				"stemmer_fr": {
-					"type": "stemmer",
-					"language": "light_french"
-				}
-			},
-			"analyzer": {
-				"french": {
-					"type": "custom",
-					"tokenizer": "nGram",
-					"filter": [
-						"stop_fr",
-						"asciifolding",
-						"lowercase",
-						"snowball_fr",
-						"elision_fr",
-						"stemmer_fr",
-						"word_delimiter"
-					]
-				},
-				"french_search": {
-					"type": "custom",
-					"tokenizer": "standard",
-					"filter": [
-						"stop_fr",
-						"asciifolding",
-						"lowercase",
-						"snowball_fr",
-						"elision_fr",
-						"stemmer_fr",
-						"word_delimiter"
-					]
-				}
-			}
-		}
-	}
-}
diff -r e5add18ddc33 -r 4d9c23cdfa82 setup.py
--- a/setup.py	Wed Jul 12 12:03:17 2017 +0200
+++ b/setup.py	Wed Jul 12 14:26:26 2017 +0200
@@ -22,7 +22,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.1.1'
+version = '0.1.2'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = []
diff -r e5add18ddc33 -r 4d9c23cdfa82 src/pyams_content_es.egg-info/PKG-INFO
--- a/src/pyams_content_es.egg-info/PKG-INFO	Wed Jul 12 12:03:17 2017 +0200
+++ b/src/pyams_content_es.egg-info/PKG-INFO	Wed Jul 12 14:26:26 2017 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyams-content-es
-Version: 0.1.1
+Version: 0.1.2
 Summary: PyAMS content interfaces and classes for ElasticSearch indexation
 Home-page: http://hg.ztfy.org/pyams/pyams_content_es
 Author: Thierry Florac
@@ -22,6 +22,14 @@
         History
         =======
         
+        0.1.2
+        -----
+         - added View content adapter to build queries based on Elasticsearch index
+         - use "keyword" type for mapping of content type, internal ID, workflow status, location attributes and themes
+         - update test query to use Elasticsearch-DSL package
+         - updated Elasticsearch mappings
+         - updated workflow properties index
+        
         0.1.1
         -----
          - updated external files mapping for ingest-attachment plug-in
diff -r e5add18ddc33 -r 4d9c23cdfa82 src/pyams_content_es.egg-info/SOURCES.txt
--- a/src/pyams_content_es.egg-info/SOURCES.txt	Wed Jul 12 12:03:17 2017 +0200
+++ b/src/pyams_content_es.egg-info/SOURCES.txt	Wed Jul 12 14:26:26 2017 +0200
@@ -2,11 +2,11 @@
 setup.py
 docs/HISTORY.txt
 docs/README.txt
-docs/WfBlogPost.json
-docs/WfImageMap.json
-docs/WfNewsEvent.json
-docs/attachment.json
-docs/settings.json
+docs/mappings/attachment-pipeline.json
+docs/mappings/index-settings.json
+docs/mappings/mappings/WfBlogPost.json
+docs/mappings/mappings/WfImageMap.json
+docs/mappings/mappings/WfNewsEvent.json
 src/pyams_content_es/__init__.py
 src/pyams_content_es/document.py
 src/pyams_content_es/include.py
@@ -27,6 +27,7 @@
 src/pyams_content_es/component/gallery.py
 src/pyams_content_es/component/paragraph.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