Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc

.gitignore

-
+*/input/*
 */tmp/*
 */output/*
 !*/input/.gitkeep

hdoc_to_basex/hdoc_to_basex.ant

@@ -7,6 +7,7 @@
 		
 	<target name="convert">
 		<!-- Preparation for the file transformation : delete old folders and create new folders -->
+		<delete dir="${tmp}" failonerror="false"/>
 		<mkdir dir="${tmp}"/>
 		<delete dir="${out}" failonerror="false"/>
 		<mkdir dir="${out}"/>
@@ -37,7 +38,7 @@
 		</for>
 		
 		<!-- Clean-->
-		<!-- <delete dir="${tmp}" failonerror="false"/> -->
+		<delete dir="${tmp}" failonerror="false"/>
 	</target>
 
 

hdoc_to_mongo/run.sh

-#!/bin/sh
+#!/bin/bash
 lib="lib"
 ant="hdoc_to_mongo.ant"
 antparam="-Dprogram.param=$1"

hdoc_to_mongo/web/setup.sh

+#!/bin/bash
+npm link mongodb

hdoc_to_optim/input/sample/META-INF/container.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<container version="1.0" xmlns="urn:utc.fr:ics:hdoc:container">
+  <rootfiles>
+    <rootfile full-path="content.xml" media-type="text/xml" />
+  </rootfiles>
+</container>

hdoc_to_optim/input/sample/mimetype

+application/x-hdoc+zip
\ No newline at end of file

hdoc_to_pdf/xsl/last_transformer.xsl

@@ -5,7 +5,7 @@
   xpath-default-namespace="http://www.w3.org/1999/xhtml"
   xmlns="http://www.w3.org/1999/xhtml">
 
-  <xsl:output method="xml" indent="yes"/>
+  <xsl:output method="xml" indent="no"/>
 
   <xsl:template match="node()|@*">
     <xsl:copy>

mindmapping_to_opale/README.md

@@ -27,6 +27,10 @@ The project aims at converting Freemind files in Opale files. If you use another
 -------------------------------
 In dependence with mindmapping_to_hdoc and hdoc_to_opale
 
+##Installation
+-------------------------------
+* To get the tool, go to the page https://gitlab.utc.fr/crozatst/hdoc/tree/master4 and click the download icon on the right of the screen : you can get a .zip version of the project. For the git users, the clone link is available on the same site.
+
 ## User documentation
 -------------------------------
 
@@ -38,16 +42,13 @@ In dependence with mindmapping_to_hdoc and hdoc_to_opale
 	* On Windows : 'run.bat'
 If you want to convert one specific file that is in the input folder, use the parameters ' -DinputPath input/<yourFilename>' (ex : 'sh run.sh -DinputPath input/<yourFilename>')
 
+If the input folder happens to be missing, you should create your own input folder in the root of the mindmapping_to_opale folder, and add your own samples inside. 
+
 *You will find the result of the conversion in the folder mindmapping_to_opale/output*
 *You can find a sample file il the folder /samples.*
 
 ### Rules to follow
 
-You can use the native formating in order to complete your Module : 
-
-* By using the "Text Bold" option, you will get an emphasis.
-* By using the "Text Italic" option, you will get a quote. 
-
 You can use special rules in Freemind to personnalize your Scenari Module :
 
 * By default, a "Division" is created with the name of the main node of your MindMap
@@ -67,7 +68,7 @@ You can use special rules in Freemind to personnalize your Scenari Module :
 	* **#question** : a MCQ
 	* **#singlechoicequestion** : a QCU
 	* **#choice-qcu** : an answer within a QCU
-	* **#list** : a list, first node being the title and children being the content. 
+	* **#list** : a list inside a paragraph, first node being the title and children being the content. 
 	* **#solution** : a solution associated to a single choice within a QCU (matches an integer)
 	* **#choice-correct** : a correct answer within a MCQ
 	* **#choice-incorrect** : an incorrect answer within a MCQ
@@ -83,11 +84,12 @@ You can use special rules in Freemind to personnalize your Scenari Module :
 
 ## Known bugs
 
-* Current xsl cant handle anything else than a hierarchy of nodes named "nodes". It should be investigated in order to be able to use other types of children, in order to work with native mindmap formatting, as bold or italic. 
+* Currently, the xsl is lacking : there is no support for childs of nodes who are not named "nodes" themselves. The bug has been investigated and is therefore non trivial, and should be solved in order to handle functionnalities outside of the special rules formatting. 
 
 ## TODO
 
-* Develop new hashtags to create other type of Opale contents (such as self-evaluation, exercices other than QCM or QCU,  etc.)
+* Develop new hashtags to create other type of Opale contents (such as new exercises types, self-evaluation etc.)
+* Explore native freemind functionalities to allow a more user friendly formatting : using the bold and italic formatting was tried but failed due to a xsl malfunction.
 
 ## Technicals notes
 
@@ -100,7 +102,7 @@ This converter is using standard NF29 conversion project structure : a main ANT
 This ant file is called by a script (run.sh or run.bat), with ou without parameters.
 
 ### Hdoc files
-During the conversion process, the converter is using the converter mindmapping_to_hdoc. The result of this conversion is also available in the folder output.
+During the conversion process, the converter is using the converter mindmapping_to_hodc. The result of this conversion is also available in the folder output.
 
 ### What does the main ANT file do ?
 
@@ -113,4 +115,6 @@ During the conversion process, the converter is using the converter mindmapping_
 * Copy the results of the conversion in the folder /output/scar
 * Finally, clean temporary files
 
-## Capitalization
\ No newline at end of file
+## 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.

opale_to_basex/opale_to_basex.ant

@@ -2,9 +2,12 @@
     <property file="build.properties"/>
 	
     <target name="AllFiles">
-    	<delete>
+
+    	<delete dir="${outputPath}" failonerror="false"/>
+		<mkdir dir="${outputPath}"/>
+    	<!-- <delete>
     		<fileset dir="${outputPath}" />
-    	</delete>
+    	</delete> -->
 		
 		<!-- Copy input files into input folder of project opale_to_hdoc and execute it -->
 		<copy todir="${inputOpaleToHdoc}">

opale_to_elasticSearch/README.md

@@ -31,9 +31,9 @@ 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 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
 - 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}/
 
@@ -42,5 +42,6 @@ Etapes :
 - 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
 - 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

opale_to_mongo/run.sh

-#!/bin/sh
+#!/bin/bash
 lib="lib"
 ant="opale_to_mongo.ant"
 antparam="-Dprogram.param=$1"