--- a/buildout.cfg Tue Jun 06 17:20:00 2017 +0200
+++ b/buildout.cfg Tue Jun 06 17:22:24 2017 +0200
@@ -1,5 +1,7 @@
[buildout]
eggs-directory = /var/local/env/pyams/eggs
+extends = http://download.ztfy.org/pyams/pyams-dev.cfg
+find-links = http://download.ztfy.org/eggs
socket-timeout = 3
show-picked-versions = true
@@ -19,24 +21,28 @@
src = src
develop =
.
- /var/local/src/pyams/pyams_catalog
- /var/local/src/pyams/pyams_content
- /var/local/src/pyams/pyams_file
- /var/local/src/pyams/pyams_form
- /var/local/src/pyams/pyams_i18n
- /var/local/src/pyams/pyams_media
- /var/local/src/pyams/pyams_pagelet
- /var/local/src/pyams/pyams_security
- /var/local/src/pyams/pyams_sequence
- /var/local/src/pyams/pyams_skin
- /var/local/src/pyams/pyams_template
- /var/local/src/pyams/pyams_thesaurus
- /var/local/src/pyams/pyams_utils
- /var/local/src/pyams/pyams_viewlet
- /var/local/src/pyams/pyams_workflow
- /var/local/src/pyams/pyams_zmi
- /var/local/src/pyams/pyams_zmq
- /var/local/src/pyams/ext/lingua
+ ../pyams_catalog
+ ../pyams_content
+ ../pyams_default_theme
+ ../pyams_file
+ ../pyams_form
+ ../pyams_i18n
+ ../pyams_mail
+ ../pyams_media
+ ../pyams_pagelet
+ ../pyams_portal
+ ../pyams_security
+ ../pyams_sequence
+ ../pyams_skin
+ ../pyams_template
+ ../pyams_thesaurus
+ ../pyams_utils
+ ../pyams_viewlet
+ ../pyams_workflow
+ ../pyams_zmi
+ ../pyams_zmq
+ ../ext/lingua
+ ../ext/pyramid_es
parts =
package
@@ -47,6 +53,8 @@
[package]
recipe = zc.recipe.egg
eggs =
+ elasticsearch
+ elasticsearch-dsl
pyams_content_es
pyramid
pyramid_es
@@ -76,4 +84,4 @@
eggs = pyams_content_es [test]
[versions]
-pyams_content_es = 0.1.0
+pyams_content_es = 0.1.1
--- a/docs/HISTORY.txt Tue Jun 06 17:20:00 2017 +0200
+++ b/docs/HISTORY.txt Tue Jun 06 17:22:24 2017 +0200
@@ -1,6 +1,11 @@
History
=======
+0.1.1
+-----
+ - updated external files mapping for ingest-attachment plug-in
+ - imports cleanup
+
0.1.0
-----
- first development release
--- a/docs/README.txt Tue Jun 06 17:20:00 2017 +0200
+++ b/docs/README.txt Tue Jun 06 17:22:24 2017 +0200
@@ -0,0 +1,11 @@
+
+Liste des actions à effectuer
+=============================
+
+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/WfNewsEvent/_mapping -d @WfNewsEvent.json
+curl --noproxy localhost -XPUT http://localhost:9200/onf_website/WfBlogPost/_mapping -d @WfBlogPost.json
--- a/docs/WfBlogPost.json Tue Jun 06 17:20:00 2017 +0200
+++ b/docs/WfBlogPost.json Tue Jun 06 17:22:24 2017 +0200
@@ -95,17 +95,6 @@
"search_analyzer": "french_search"
}
}
- },
- "data": {
- "type": "object",
- "properties": {
- "en": {
- "type": "attachment"
- },
- "fr": {
- "type": "attachment"
- }
- }
}
}
},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/WfImageMap.json Tue Jun 06 17:22:24 2017 +0200
@@ -0,0 +1,72 @@
+{
+ "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": "string"
+ }
+ }
+ }
+ }
+ }
+}
--- a/docs/WfNewsEvent.json Tue Jun 06 17:20:00 2017 +0200
+++ b/docs/WfNewsEvent.json Tue Jun 06 17:22:24 2017 +0200
@@ -95,17 +95,6 @@
"search_analyzer": "french_search"
}
}
- },
- "data": {
- "type": "object",
- "properties": {
- "en": {
- "type": "attachment"
- },
- "fr": {
- "type": "attachment"
- }
- }
}
}
},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/attachment.json Tue Jun 06 17:22:24 2017 +0200
@@ -0,0 +1,17 @@
+{
+ "description": "Extract attachments informations",
+ "processors": [
+ {
+ "foreach": {
+ "field": "attachments",
+ "processor": {
+ "attachment": {
+ "field": "_ingest._value.content",
+ "target_field": "_ingest._value.attachment",
+ "ignore_missing": true
+ }
+ }
+ }
+ }
+ ]
+}
--- a/setup.py Tue Jun 06 17:20:00 2017 +0200
+++ b/setup.py Tue Jun 06 17:22:24 2017 +0200
@@ -22,7 +22,7 @@
README = os.path.join(DOCS, 'README.txt')
HISTORY = os.path.join(DOCS, 'HISTORY.txt')
-version = '0.1.0'
+version = '0.1.1'
long_description = open(README).read() + '\n\n' + open(HISTORY).read()
tests_require = []
@@ -57,11 +57,29 @@
install_requires=[
'setuptools',
# -*- Extra requirements: -*-
+ 'elasticsearch',
+ 'elasticsearch-dsl',
+ 'persistent',
'pyams_content',
+ 'pyams_form',
+ 'pyams_i18n',
+ 'pyams_pagelet',
+ 'pyams_sequence',
+ 'pyams_skin',
+ 'pyams_template',
+ 'pyams_utils',
+ 'pyams_viewlet',
+ 'pyams_workflow',
+ 'pyams_zmq',
'pyramid',
'pyramid_es',
'zope.component',
+ 'zope.container',
'zope.interface',
+ 'zope.intid',
+ 'zope.lifecycleevent',
+ 'zope.schema',
+ 'zope.site'
],
entry_points="""
# -*- Entry points: -*-
--- a/src/pyams_content_es.egg-info/PKG-INFO Tue Jun 06 17:20:00 2017 +0200
+++ b/src/pyams_content_es.egg-info/PKG-INFO Tue Jun 06 17:22:24 2017 +0200
@@ -1,16 +1,32 @@
Metadata-Version: 1.1
Name: pyams-content-es
-Version: 0.1.0
+Version: 0.1.1
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:
+ Liste des actions à effectuer
+ =============================
+
+ 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/WfNewsEvent/_mapping -d @WfNewsEvent.json
+ curl --noproxy localhost -XPUT http://localhost:9200/onf_website/WfBlogPost/_mapping -d @WfBlogPost.json
+
History
=======
+ 0.1.1
+ -----
+ - updated external files mapping for ingest-attachment plug-in
+ - imports cleanup
+
0.1.0
-----
- first development release
--- a/src/pyams_content_es.egg-info/SOURCES.txt Tue Jun 06 17:20:00 2017 +0200
+++ b/src/pyams_content_es.egg-info/SOURCES.txt Tue Jun 06 17:22:24 2017 +0200
@@ -2,7 +2,10 @@
setup.py
docs/HISTORY.txt
docs/README.txt
-docs/mappings.json
+docs/WfBlogPost.json
+docs/WfImageMap.json
+docs/WfNewsEvent.json
+docs/attachment.json
docs/settings.json
src/pyams_content_es/__init__.py
src/pyams_content_es/document.py
--- a/src/pyams_content_es.egg-info/requires.txt Tue Jun 06 17:20:00 2017 +0200
+++ b/src/pyams_content_es.egg-info/requires.txt Tue Jun 06 17:22:24 2017 +0200
@@ -1,8 +1,26 @@
-setuptools
+elasticsearch
+elasticsearch-dsl
+persistent
pyams_content
+pyams_form
+pyams_i18n
+pyams_pagelet
+pyams_sequence
+pyams_skin
+pyams_template
+pyams_utils
+pyams_viewlet
+pyams_workflow
+pyams_zmq
pyramid
pyramid_es
+setuptools
zope.component
+zope.container
zope.interface
+zope.intid
+zope.lifecycleevent
+zope.schema
+zope.site
[test]