diff --git a/framapad_to_hdoc/xsl/html2xhtmlv1.xsl b/framapad_to_hdoc/xsl/html2xhtmlv1.xsl
index 580dff23c9de2933d1588f3336869d438cc310a2..b713508a59ad79a1725eea1f87206005f3d16fb3 100644
--- a/framapad_to_hdoc/xsl/html2xhtmlv1.xsl
+++ b/framapad_to_hdoc/xsl/html2xhtmlv1.xsl
@@ -18,7 +18,15 @@
-
+
+ Code (non pris en compte pour l'instant) :
+
+
+
+
+
+
+
diff --git a/framapad_to_hdoc/xsl/html2xhtmlv2.xsl b/framapad_to_hdoc/xsl/html2xhtmlv2.xsl
index 511ea035ddd319fc1a6d6455d62648bdf29e0de7..569796d8f26f8bb3872b41882da17cd25fb77ca0 100644
--- a/framapad_to_hdoc/xsl/html2xhtmlv2.xsl
+++ b/framapad_to_hdoc/xsl/html2xhtmlv2.xsl
@@ -52,10 +52,7 @@
Titre (non pris en compte pour l'instant) :
-
- Code (non pris en compte pour l'instant) :
-
-
+
diff --git a/framapad_to_opale/run.sh b/framapad_to_opale/run.sh
old mode 100644
new mode 100755
diff --git a/hdoc_to_basex/README.md b/hdoc_to_basex/README.md
index e438a252cfd0a80058a4cff8fdd1ddc69518ca31..916035248b2c381e5c0fbac7ee666170fd2137e9 100644
--- a/hdoc_to_basex/README.md
+++ b/hdoc_to_basex/README.md
@@ -54,7 +54,8 @@ Step by step :
* searchDocByAuthor.xqm
* searchDocByTitle.xqm
* searchSectionByTitle.xqm
-
+
+ P.S. the symbols "(: :)" are used for adding comments in xQuery files
TODO List
------------------
diff --git a/hdoc_to_canoprof/xsl/transformation2.xsl b/hdoc_to_canoprof/xsl/transformation2.xsl
index a64047b1dbc70bddd84e1601e88cfc55f09d4dd9..0e0667f2f3dfdf93472569995245a6a684111e42 100644
--- a/hdoc_to_canoprof/xsl/transformation2.xsl
+++ b/hdoc_to_canoprof/xsl/transformation2.xsl
@@ -547,6 +547,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hdoc_to_mongo/README.md b/hdoc_to_mongo/README.md
index 13bdde2f99e4bb6a866e49822681bd202d1f282e..27d2c49feb12f7dc2dd02f1594e2147ad2b8d432 100644
--- a/hdoc_to_mongo/README.md
+++ b/hdoc_to_mongo/README.md
@@ -12,16 +12,29 @@ Kapilraj Thangeswaran
This module is able to extract data from a file in Hdoc format and insert them into MongoDB.
## Dependencies
-In order to work properly this module needs
-- In order to make this module work you have to download and install Node.js from the [Node.js download page](https://nodejs.org/en/).
-- If needed, download and install MongoDB from the [MongoDB download page](https://www.mongodb.com/download-center#community).
+In order to work properly this module needs :
+- to download and install Node.js
+ For windows :
+ - from the [Node.js download page](https://nodejs.org/en/)
+ For linux (instruction for debian 8, may vary depending on your distrbution) execute the followings commands :
+ - `su`
+ - `apt install nodejs`
+ - `apt install node`
+ - `apt install npm`
+
+- to download and install MongoDB
+ For Windows :
+ - from the [MongoDB download page](https://www.mongodb.com/download-center#community)
+ For linux :
+ - `su & apt install mongodb`
## Instructions
1. Install dependencies
2. Add all your hdoc documents in an "input" folder
3. Add or edit "config.xml" file in "input" folder (for more details, please check "Input configuration")
4. Edit "config.json" file from "mongo" folder (for more details, please check "Mongo configuration")
-5. Execute run.bat or run.sh
+5. Make sure that MongoDB is running (`mongod.exe --rest --jsonp` command from "MongoDB/Server/3.2/bin" folder)
+6. Execute run.bat or chmod +x run.sh & ./run.sh
## Web
This module provides a Web application to access MongoDB and execute simples requests.
diff --git a/hdoc_to_mongo/hdoc_to_mongo.ant b/hdoc_to_mongo/hdoc_to_mongo.ant
index e108f377e135abf45664cbf0247fad4e0979a73d..4992f39e9b3d60358b3cac9a7a0e45dd69152474 100644
--- a/hdoc_to_mongo/hdoc_to_mongo.ant
+++ b/hdoc_to_mongo/hdoc_to_mongo.ant
@@ -58,9 +58,27 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ End
+
\ No newline at end of file
diff --git a/hdoc_to_mongo/mongo/main.js b/hdoc_to_mongo/mongo/main.js
index 49984d9112c3437ffd0f8b362766737531580592..b938c016ff944607755d68bfa9c0877974db3b83 100644
--- a/hdoc_to_mongo/mongo/main.js
+++ b/hdoc_to_mongo/mongo/main.js
@@ -42,8 +42,8 @@ var removeDocument = function(db, collection, json) {
MongoClient.connect(url, function(err, db) {
assert.equal(null, err);
- fs.readdir(outputFolder, (err, files) => {
- files.forEach(file => {
+ fs.readdir(outputFolder, function(err, files) {
+ files.forEach(function(file) {
var json = JSON.parse(fs.readFileSync(outputFolder + "/" + file));
if(config.request === 'insert') {
insertDocument(db, config.collection, json);
diff --git a/hdoc_to_mongo/run.sh b/hdoc_to_mongo/run.sh
index 783d31c6fc1ff83681e55864b4ffe0b295c2e723..e434a70f0c73684aa35005f6310163f06120cac8 100644
--- a/hdoc_to_mongo/run.sh
+++ b/hdoc_to_mongo/run.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
lib="lib"
ant="hdoc_to_mongo.ant"
antparam="-Dprogram.param=$1"
diff --git a/hdoc_to_mongo/web/setup.sh b/hdoc_to_mongo/web/setup.sh
new file mode 100644
index 0000000000000000000000000000000000000000..a4eb5890e14cc872eb19738cf0ffd2bc3c590729
--- /dev/null
+++ b/hdoc_to_mongo/web/setup.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+npm link mongodb
diff --git a/hdoc_to_mongo/xsl/subroutines/exercise.xsl b/hdoc_to_mongo/xsl/subroutines/exercise.xsl
index 8a41f6e8204138e9cde258edbd083a9699c589c5..de352b28341fa846c046dd99b44f8edf8ecfd0d3 100644
--- a/hdoc_to_mongo/xsl/subroutines/exercise.xsl
+++ b/hdoc_to_mongo/xsl/subroutines/exercise.xsl
@@ -29,7 +29,7 @@
}
-
+
{
diff --git a/hdoc_to_neo4j/README.md b/hdoc_to_neo4j/README.md
index 8390475b7104aed58065758118e14f2f71ce2bc3..660eb26e7d374657f8b644bd9f7760bf575ebda4 100644
--- a/hdoc_to_neo4j/README.md
+++ b/hdoc_to_neo4j/README.md
@@ -24,6 +24,13 @@ Dependance
This project can be used alone if you only want to convert an HDOC into a Neo4j requests file or directly insert data in neo4j local database.
+WARNINGS:
+
+1) If you want to insert data automatically in a database, you need to have nodeJS installed!
+ Windows: https://nodejs.org/en/ and download + install the last stable version
+ Linux: install with your distribution's package manager
+
+2) You need to configure the node/config.json file properly to fit with the parameters of the dabase you want to insert in. (host, db and password).
User documentation
------------------
@@ -42,7 +49,8 @@ You have to respect the following steps :
Unsupported
-----------
-
+There is no shared public database for now.
+The "References" links are not fully supported yet. The opale_to_hdoc part is done, but needs an implementation in hdoc_to_neo4j.
Known bugs
----------
diff --git a/hdoc_to_neo4j/input/.gitkeep b/hdoc_to_neo4j/input/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/hdoc_to_pdf/hdoc_to_pdf.ant b/hdoc_to_pdf/hdoc_to_pdf.ant
index 2d9b23bf590c75e60b22138b391ad4065cc3a254..9596943b700a80c62de89c8121b6d73bcd2e892c 100644
--- a/hdoc_to_pdf/hdoc_to_pdf.ant
+++ b/hdoc_to_pdf/hdoc_to_pdf.ant
@@ -73,10 +73,10 @@
- Validation container.xml ok !
+ container.xml is valid
- Validation failed
+ Warning : Validation for container.xml failed
diff --git a/hdoc_to_pdf/xsl/find_content.xsl b/hdoc_to_pdf/xsl/find_content.xsl
index d75e8962bf17d2cc999b7b164270c0958257d722..60454ec841c062c033023de8be9c47ec5ca9c90a 100644
--- a/hdoc_to_pdf/xsl/find_content.xsl
+++ b/hdoc_to_pdf/xsl/find_content.xsl
@@ -51,10 +51,10 @@
- Validation content.xml ok !
+ content.xml is valid
- Validation failed
+ Warning : Validation for content.xml failed
diff --git a/mindmapping_to_hdoc/input/.gitkeep b/mindmapping_to_hdoc/input/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/mindmapping_to_opale/README.md b/mindmapping_to_opale/README.md
index 2922ebdfe3ccb19cfe81f30b9187c9de0f7e9642..a2e6c3768af0b989bbacc1de74fa5dbf5ecd392f 100644
--- a/mindmapping_to_opale/README.md
+++ b/mindmapping_to_opale/README.md
@@ -118,3 +118,5 @@ During the conversion process, the converter is using the converter mindmapping_
## Capitalization
* Concerning the xsl malfunction, we know that the issue comes from a mispriority between nodes without childs and nodes with childs who aren't named "nodes". There is a confusion between the two because previous implementation didn't take the seconds into account. We didnt manage to find a way to force the xsl to recognize those nodes, but this is where you should look if you happen to need to fix the issue. A simple but time consuming fix would be to rewrite the xsl with the functionnality in mind, but we didn't took that option as we lacked time. The problematic functions are at the root of the xsl transformation, and therefore a simple fix hasn't been found yet.
+* There's post on the Scenari forum to explain what has been achieved so far with the mindmapping_to_opale project. Here is the link to the post : https://forums.scenari.org/t/transformation-dune-framindmap-en-module-opale/1079
+
diff --git a/mindmapping_to_opale/input/.gitkeep b/mindmapping_to_opale/input/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/mindmapping_to_opale/input/sample.mm b/mindmapping_to_opale/input/sample.mm
new file mode 100644
index 0000000000000000000000000000000000000000..68e81de4877f06b932f35418941de016ed13344a
--- /dev/null
+++ b/mindmapping_to_opale/input/sample.mm
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/opale_to_basex/README.md b/opale_to_basex/README.md
index 7165cf9feff2bd0bc31b7dedef326695747b143c..434904d7f81bbc0720105d81a0cd9bbb3ea50c72 100644
--- a/opale_to_basex/README.md
+++ b/opale_to_basex/README.md
@@ -54,4 +54,6 @@ Step by step :
Available library modules :
* searchDocByAuthor.xqm
* searchDocByTitle.xqm
- * searchSectionByTitle.xqm
\ No newline at end of file
+ * searchSectionByTitle.xqm
+
+ P.S. the symbols "(: :)" are used for adding comments in xQuery files
\ No newline at end of file
diff --git a/opale_to_elasticSearch/README.md b/opale_to_elasticSearch/README.md
index 5b2d77a05e1fd4ad3f0e4bc1c9a83ab9be6352e3..56957019b0e72445f3d9cb82f50a773ec40c5931 100644
--- a/opale_to_elasticSearch/README.md
+++ b/opale_to_elasticSearch/README.md
@@ -31,16 +31,19 @@ A savoir que les contenus opale de plusieurs machines/utilisateurs peuvent être
##Utilisation
-------------
L'utilisation complète d'opale_to_elasticSearch nécessite l'utilisation de la stack ELK (ElasticSearch, Logstash, Kibana).
-- Télécharger ElasticSearch : https://www.elastic.co/fr/downloads/elasticsearch
-- Télécharger Logstash : https://www.elastic.co/fr/downloads/logstash
-- Télécharger Kibana : https://www.elastic.co/fr/downloads/kibana
-- Télécharger le fichier de conf de Logstash : https://www.dropbox.com/s/lkz3dgmto2d378m/esconf.conf?dl=0
-- Mettre le fichier téléchargé dans %{dossier_installation_logstash}/
+- Télécharger ElasticSearch : https://www.elastic.co/fr/downloads/elasticsearch et extraire l'archive
+- Télécharger Logstash : https://www.elastic.co/fr/downloads/logstash et extraire l'archive
+- Télécharger Kibana : https://www.elastic.co/fr/downloads/kibana et extraire l'archive
+- Mettre le fichier esconf.conf situé dans opale_to_elasticSearch/logstash/conf/ dans %{dossier_installation_logstash}/
+- Editer le fichier esconf.conf : ligne 11, remplacez "path => ["/opale_to_elasticSearch/logstash/input/*.json"]" par "path => ["%{votreCheminAbsolu}/opale_to_elasticSearch/logstash/input/*.json"]"
+- Sauvegarder les modifications.
Etapes :
- aller dans votre dossier d'installation d'elasticsearch et lancer bin/elasticsearch
- aller dans votre dossier d'installation de kibana et lancer bin/kibana
- aller dans votre dossier d'installation de logstash et lancer bin/logstash - f esconf.conf
+- Attendre les messages de logstash qui indiquent le lancement sans problème.
- lancer la transformation opale_to_elasticsearch en mettant d'abord les *.scar dans opale_to_elasticsearch/input
+- Le dossier de sortie n'est pas le classique opale_to_elasticsearch/output mais opale_to_elasticsearch/logstash/input afin de faire directement le lien avec Logstash
- Normalement les log de logstash indique l'insertion des sorties de la transformation, il arrive pour le moment qu'il ne le fasse qu'au moment où logstash s'arrête, l'arrêter alors.
-- aller sur http://localhost:5601/app/kibana#/dashboard/NF29_DATA_DASHBOARD?_g=(filters%3A!()%2CrefreshInterval%3A(display%3AOff%2Cpause%3A!f%2Cvalue%3A0)%2Ctime%3A(from%3Anow%2Fy%2Cmode%3Aquick%2Cto%3Anow%2Fy))
\ No newline at end of file
+- aller sur http://localhost:5601/app/kibana#/dashboard/NF29_DATA_DASHBOARD?_g=(filters%3A!()%2CrefreshInterval%3A(display%3AOff%2Cpause%3A!f%2Cvalue%3A0)%2Ctime%3A(from%3Anow%2Fy%2Cmode%3Aquick%2Cto%3Anow%2Fy))
diff --git a/opale_to_elasticSearch/logstash/conf/esconf.conf b/opale_to_elasticSearch/logstash/conf/esconf.conf
new file mode 100644
index 0000000000000000000000000000000000000000..db913c6435636349a49cb8e546bd23ca2bc3e15e
--- /dev/null
+++ b/opale_to_elasticSearch/logstash/conf/esconf.conf
@@ -0,0 +1,36 @@
+input
+{
+ file
+ {
+ codec => multiline
+ {
+ pattern => '^\{'
+ negate => true
+ what => previous
+ }
+ path => ["/elasticSearch/logstash/input/*.json"]
+ start_position => "beginning"
+ sincedb_path => "/dev/null"
+ exclude => "*.gz"
+ }
+}
+
+filter
+{
+ mutate
+ {
+ replace => [ "message", "%{message}" ]
+ gsub => [ 'message','\n','']
+ }
+ if [message] =~ /^{.*}$/
+ {
+ json { source => message }
+ }
+
+}
+
+output
+{
+ stdout {}
+ elasticsearch { "hosts" => ["localhost:9200"] }
+}
diff --git a/opale_to_hdoc/xsl/opale_to_hdoc_regle2.xsl b/opale_to_hdoc/xsl/opale_to_hdoc_regle2.xsl
index a825ceca9fd5e4dc45c366022d791ba78312cd1a..d7f5d0ce67b4b814f57b0d1b22fdc281cf7057ea 100644
--- a/opale_to_hdoc/xsl/opale_to_hdoc_regle2.xsl
+++ b/opale_to_hdoc/xsl/opale_to_hdoc_regle2.xsl
@@ -32,6 +32,14 @@
+
+
+ Liste des grains liés
+
+
+
+
+