Skip to content
GitLab
Commit 306c906e authored by Ivan D'halluin's avatar Ivan D'halluin
Browse files

beginning of the antce architecture, almost working, missing zip

parent 1982bbec
Expand all Hide whitespace changes
Inline Side-by-side
optim_to_hdoc/input/.wspmeta 0 → 100644
View file @ 306c906e
This diff is collapsed.
optim_to_hdoc/myantce.ant 0 → 100644
View file @ 306c906e
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." name="myantce">
<property name="in" location="${basedir}/input"/>
<property name="out" location="${basedir}/output"/>
<property name="tmp" location="${basedir}/tmp"/>
<property name="xsl" location="${basedir}/xsl"/>
<property name="lib" location="${basedir}/lib"/>
<property name="log" location="${basedir}/log"/>
<delete dir="${tmp}" failonerror="false"/>
<mkdir dir="${tmp}"/>
<delete dir="${out}" failonerror="false"/>
<mkdir dir="${out}"/>
<delete dir="${log}" failonerror="false"/>
<mkdir dir="${log}"/>
<mkdir dir="${tmp}/extract"/>
<mkdir dir="${tmp}/internationalisation"/>
<echo message="Extract files..."/>
<unzip dest="${tmp}/extract">
<fileset dir="${in}">
<include name="**/*.scar"/>
</fileset>
</unzip>
<echo message="Internationalize files..."/>
<xslt useImplicitFileset="false" destdir="${tmp}/internationalisation" style="${xsl}/internalisation.xsl">
<param name="currentDir" expression="${basedir}"/>
<fileset dir="${tmp}/extract">
<include name="*/*"/> <!-- only converting the root files, not the ressources of subfolders -->
</fileset>
</xslt>
<echo message="Convert to hdoc..."/>
<xslt basedir="${tmp}/internationalisation" destdir="${out}" style="${xsl}/optim_to_hdoc.xsl"/>
<echo message="Copy ressources files..."/>
<copy todir="${out}">
<fileset dir="${tmp}/extract">
<exclude name="*/*"/> <!-- only copying resources files -->
</fileset>
</copy>
<echo message="Zip result..."/>
<antcall target="createApplicationDAA"/>
<target name="createApplicationDAA">
<for param="folder">
<path>
<fileset dir="${out}/*"/>
</path>
<sequential>
<echo>@{folder}</echo>
<zip basedir="${folder}" destfile="${folder}.zip">
</zip>
</sequential>
</for>
</target>
</project>
\ No newline at end of file
optim_to_hdoc/optim_to_hdoc.ant 0 → 100644
View file @ 306c906e
<?xml version="1.0" encoding="UTF-8"?>
<project default="convert_to_hdoc">
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="${basedir}/lib/ant-contrib-0.6.jar"/>
</classpath>
</taskdef>
<target name="convert_to_hdoc" depends="preparation">
<unzip src="${InputPath}" dest="${InputPath}_FILES"/>
<fileset id="rootFiles" dir="${InputPath}_FILES" includes="*.paper | *.section | *.website | *.slideshow | *.webpage"/>
<property name="prop.rootFiles" refid="rootFiles"/>
<property name="currentdir" value="${InputPath}_FILES"/>
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" ! CHECKING FOR ITEM FILE IN ROOT DIRECTORY !"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<antcall target="direct_conversion"/>
<antcall target="finde_file"/>
</target>
<target name="preparation">
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" !!!!!!! DEBUT PREPARATION !!!!!!!"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<delete dir="${InputPath}_HDOC"></delete>
<delete dir="${InputPath}_FILES"></delete>
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" !!!!!!!! FIN PREPARATION !!!!!!!!"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
</target>
<target name="file_null">
<condition property="file.null" else="false">
<equals arg1="${prop.rootFiles}" arg2=""/>
</condition>
<echo message="Root file missing ? ${file.null}"/>
</target>
<target name="finde_file" if="${file.null}" depends="file_null">
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" ! NO ITEM FILE FOUND IN ROOT DIRECTORY !"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" ! CHECKING FOR ITEM FILE IN SUB DIRECTORIES !"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<foreach target="finde_file_subdir" param="worksheet" inheritall="true">
<path>
<dirset dir="${InputPath}_FILES">
<include name="*"/>
</dirset>
</path>
</foreach>
</target>
<target name="finde_file_subdir">
<echo message="finde_file_subdir called with dir : ${worksheet}"/>
<fileset id="file" dir="${worksheet}" includes="*.paper | *.section | *.website | *.slideshow | *.webpage"/>
<property name="testfile" refid="file"/>
<basename property="dir.name" file="${worksheet}"/>
<if>
<equals arg1="${testfile}" arg2="" />
<then>
</then>
<else>
<antcall target="conversion">
<param name="rootfile" value="${worksheet}/${testfile}"/>
<param name="currentDir" value="${dir.name}"/>
</antcall>
</else>
</if>
</target>
<target name="direct_conversion" unless="${file.null}" depends="file_null">
<antcall target="conversion">
<param name="rootfile" value="${InputPath}_FILES/${prop.rootFiles}"/>
<param name="currentDir" value=""/>
</antcall>
</target>
<target name="conversion">
<echo message="conversion called with rootfile : ${rootfile} and currentDir : ${currentDir}"/>
<copy todir="${InputPath}_HDOC">
<fileset dir="hdoc"/>
</copy>
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" !!!!! DEBUT INTERNALISATION !!!!!"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<xslt in="${rootfile}" out="${InputPath}_FILES/content1.xml" style="xsl/internalisation.xsl">
<param name="currentDir" expression="${currentDir}"/>
</xslt>
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" !!!!!! FIN INTERNALISATION !!!!!!"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" !!!!!!!! DEBUT CONVERSION !!!!!!!"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<xslt in="${InputPath}_FILES/content1.xml" out="${InputPath}_HDOC/content.xml" style="xsl/optim_to_hdoc.xsl"/>
<echo message=" "/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" !!!!!!!!! FIN CONVERSION !!!!!!!!"/>
<echo message=" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"/>
<echo message=" "/>
<copy todir="${InputPath}_HDOC/optim">
<fileset dir="${InputPath}_FILES"/>
</copy>
<zip basedir="${InputPath}_HDOC" destfile="${OutputPath}"></zip>
<delete dir="${InputPath}_HDOC"></delete>
<delete dir="${InputPath}_FILES"></delete>
</target>
</project>
\ No newline at end of file
optim_to_hdoc/output/.wspmeta 0 → 100644
View file @ 306c906e
This diff is collapsed.
optim_to_hdoc/output/02hdocConverterPortal/demo.html 0 → 100644
View file @ 306c906e
<?xml version="1.0" encoding="UTF-8"?>
<?oxygen RNGSchema="http://scenari.utc.fr/hdoc/schemas/xhtml/hdoc1-xhtml.rng" type="xml"
?>
<html xmlns:of="scpf.org:office"
xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive"
xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"
xmlns="http://www.utc.fr/ics/hdoc/xhtml">
<head>
<title>Hdoc Converter Portal (v0.2) Demo</title>
<meta charset="utf-8"/>
<meta name="author" content=""/>
</head>
<body>
<div>
<h6>Hdoc Converter Portal (v0.2) Demo </h6>
<img src="optim//home/ivan/Downloads/projets/hdoc/optim_to_hdoc/re/screen1.png/screen1.png"
alt=""/>
<img src="optim//home/ivan/Downloads/projets/hdoc/optim_to_hdoc/re/screen2.png/screen2.png"
alt=""/>
</div>
</body>
</html>
optim_to_hdoc/output/02hdocConverterPortal/hdocConverter.html 0 → 100644
View file @ 306c906e
<?xml version="1.0" encoding="UTF-8"?>
<?oxygen RNGSchema="http://scenari.utc.fr/hdoc/schemas/xhtml/hdoc1-xhtml.rng" type="xml"
?>
<html xmlns:of="scpf.org:office"
xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive"
xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"
xmlns="http://www.utc.fr/ics/hdoc/xhtml">
<head>
<title>Hdoc Converter Portal</title>
<meta charset="utf-8"/>
<meta name="author" content=""/>
</head>
<body>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Hdoc Converter Portal </h1>
</header>
<div>
<p>Hdoc Converter Portal is a web platform designed to convert as many types of files to and from the <em>hdoc</em> format. The main program is in<em> javascript/php</em> and it calls <em>ANT</em> scripts that, eventually, perform each conversion.</p>
</div>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Demo </h1>
</header>
<div>
<h6>Hdoc Converter Portal (v0.2) Demo </h6>
<img src="optim//home/ivan/Downloads/projets/hdoc/optim_to_hdoc/re/screen1.png/screen1.png"
alt=""/>
<img src="optim//home/ivan/Downloads/projets/hdoc/optim_to_hdoc/re/screen2.png/screen2.png"
alt=""/>
</div>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Download </h1>
</header>
<div>
<h6>Code </h6>
<p>
<a href="optim//home/ivan/Downloads/projets/hdoc/optim_to_hdoc/re/hdoc_converter.zip/hdoc_converter.zip">hdoc_converter.zip</a>
</p>
</div>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>User documentation </h1>
</header>
<div>
<h6>Purpose </h6>
<p>You should keep in mind the purpose of this tool, which is to allow you converting files from and to hdoc. Even if it offers options for file storage and organization, a good use of it is still to upload, convert, download and delete.</p>
</div>
<div>
<h6>How to </h6>
<p>In order to get you file into an other format, you'll need to upload it on the server. To do so, just select a file using the right-top form and click "<em>upload</em>". The file will be uploaded on the server and the program will ask for a format. Just type the format name in uppercase and click "<em>ok</em>". Your file will be added to the list and will be considered as being formatted as you typed.</p>
<p>When your file is on the server, you can select it. Its background will change color, indicating it is actually selected. You can select multiple files by pressing Ctrl while clicking. Pressing Ctrl will also allow you to deselect an item.</p>
<p>You can now click on "<em>convert</em>". It will open a new list of selectable item. Select all the format you need (you should not need this functionality but it exists) and then click on "<em>run conversion</em>".</p>
<p>The created files will be automatically added in the list.</p>
<p>When you're done converting, you can use the "<em>Download</em>" menu to get all the selected files and then use the "<em>Delete</em>" menu to free the server' space.</p>
</div>
<div>
<h6>Good uses </h6>
<p>Try not to download file with the same name and not the same content. Don't be greedy and do each operation one at a time, thinking to delete the files you're done with.</p>
<p>If you don't want to get lost with all the files that have the same name and not the same format, download them and remove them from the server. It takes a certain time but it's much simpler.</p>
</div>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Techical documentation </h1>
</header>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Client side (Javascript) </h1>
</header>
<div>
<p>A huge part of the code is client sided. The interface itself, in its organization, has a meaning in the actual processing of the pieces of data it represents. There are two main files for the javascript code :</p>
<p>- <em>menu.js</em> that contains all the behaviors for buttons.</p>
<p>-<em> file.js</em> that define all the file-oriented functions.</p>
</div>
<div>
<h6>menu.js </h6>
<p>Each function in menu.js start with the "menu_" prefix, making them easy to recognize.</p>
<p>
<em>menu_setup</em>() : This function is called in the index file. It will prepare the interface (mainly its jquery stuffs initializing).</p>
<p>
<em>menu_setupDelete</em>() : A sub function called by menu_setup() that focus on the Delete menu. </p>
<p>
<em>menu_setupDownload</em>() : A sub function called by menu_setup() that focus on the Dowload menu.</p>
<p>
<em>menu_setupConvert</em>() : A sub function called by menu_setup() that focus on the Convert menu (not yet ready).</p>
<p>
<em>menu_log</em>(message, type, color) : A function to push log in the new log area (just under the upload form). It write a tag with "type" as content and then the message in the given color (usually red or green).</p>
<p>var <em>known_formats</em> : This global variable is a list of couples like ["FORMAT","extension"] that describes all the known format (those are printed in the "meta/formatmeta.inf" file.</p>
</div>
<div>
<h6>file.js </h6>
<p>Each function in the file.js file also start with a "file_" prefix.</p>
<p>
<em>file_setup</em>() : This function is called in the index file. It will load the file list from the server and setup the upload form.</p>
<p>
<em>file_removeFileBloc</em>(fb) : Remove a filebloc from the file list. It will only erase the metadata. This function is always call after an actual file deletion.</p>
<p>
<em>file_checkMetaInf</em>() : Checks for each file if the metadata they have are still true (by checking for each file if it still exists).</p>
<p>
<em>file_getSelected</em>() : Returns an array of each selected file in the list.</p>
<p>
<em>file_loadUploadedFiles</em>() : Loads the list of already uploaded files (it is called in the file_setup() function).</p>
<p>
<em>file_fileExists</em>(file) : Asks the server for the existence of the given file. Returns true or false.</p>
<p>
<em>file_updateMetaInf</em>() : Quite the opposite of "file_checkMetaInf", this function will replace the current server metadata with the client metadata. This function is called after a successful file add or removal.</p>
<p>
<em>file_setUploadedFileFormat</em>(format) : This function is called when a file has succesfully been uploaded and needs to be assigned to a format. It will tell the server which format the user chose and the server will move the file in the right folder.</p>
<p>
<em>file_addFile</em>(name,formats) : Add a file to the list. If a filebloc with the given name already exists, the formats will be added to this bloc, if not a new bloc is created.</p>
<p>
<em>file_uploadingSetup</em>() : Sets up the uploading forms. Called in the file_setup().</p>
<p>There is also a class File.</p>
<p>The meta-datas are stored as JSON arrays in the file.</p>
</div>
<div>
<h6>About the css </h6>
<p>The css code is also separated in both file and menu files. There is however a specific class that is constantly used all over the javascript code, its the "activated" class. This is involved in the button behavior and the menus visibility. </p>
</div>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Server side (Php) </h1>
</header>
<div>
<p>On php side you'll find several files specialized in some requests. All the php scripts are called by Ajax.</p>
<p>The upload.php file can store a file in the "Unknown" directory and then move it to a new directory when called with a "setFormat" request. The "check_file" function is designed to determine automatically the file format. If several format are possible, the program will ask the user for choosing.</p>
<p>The scandir.php reads the uploads directory and can also check the existence of a file if the action field is defined to "exists".</p>
<p>The delete.php allows to remove a file from the server.</p>
<p>The download.php file allows to download files from the server. You must pass a "mode" field with "zip" or "single". The single mode means each selected file will be downloaded separately whereas the zip mode will make an archive with the selection.</p>
<p>The convert.php file is the core of the conversion program. It receive a list of files and formats (names "targets") and will call the "convert_file" function for each couple.</p>
<p>The uploadmeta.php file manages the uploaded files metadata allowing to read and write the files.</p>
<p>The formatmeta.php file allows to read the format list.</p>
</div>
</section>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Supported/Unsupported </h1>
</header>
<div>
<h6>Supported </h6>
<p>- Upload</p>
<p>- Download separately</p>
<p>- Delete</p>
<p>- Convert</p>
</div>
<div>
<h6>Unsupported </h6>
<p>- Download zip</p>
</div>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Known bugs </h1>
</header>
<div>
<p>When performing the same conversion twice, a second file is added to the list (but there's no second file on the server, the problem lies within the meta-data).</p>
<p>The upload procedure can't be performed twice at a time.</p>
<p>The meta-data access is faulty. The local data are not updated when another user changes something on server. So only the last update of the meta-data is saved.</p>
<p>When a file is added to a file bloc (for example when converting) the item is drawn out of the bloc (but is selectable anyway).</p>
</div>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Todo list </h1>
</header>
<div>
<p>The uploading user-checks (as if a file seems to already exists) need to be improved. So does the format detection (may need to create a new meta-data file that lists the extension which aren't ambiguous).</p>
<p>Multi-user-proof. (Hint : Managing a list of request on server that will be processed one by one. The client should only get the current state of the server and never edit its data itself.)</p>
<p>Upload of .zip for files with dependencies (such as latex file using images).</p>
</div>
</section>
<section data-hdoc-type="unit-of-content">
<header>
<h1>Capitalisation </h1>
</header>
<div>
<p>That was quite a huge piece of work and it still does so. I enjoyed working on a brand new thing, something not a standard exercise. It showed itself tricky and I failed as prioritizing the important point as I failed to eventually conceive a model that answer exactly to the problem.</p>
</div>
</section>
</section>
</body>
</html>
optim_to_hdoc/run.bat 0 → 100644
View file @ 306c906e
@echo off
set lib=lib
set ant=myantce.ant
set antparam=-Dprogram.param=%1
set scJarList=%lib%\*
java.exe -classpath "%scJarList%" -Xmx150m org.apache.tools.ant.Main -buildfile %ant% %antparam%
pause
REM start /MIN java.exe -classpath "%scJarList%" -Xmx150m org.apache.tools.ant.Main -buildfile %ant% %antparam%
optim_to_hdoc/run.sh 0 → 100755
View file @ 306c906e
#!/bin/sh
lib="lib"
ant="myantce.ant"
antparam="-Dprogram.param=$1"
#Recherche de java et controle que se soit une version SUN
vJavaCmd="java"
xCheckJava () {
vInputVarName=\$"$1"
vInputVarVal=`eval "expr \"$vInputVarName\" "`
if [ -z "$vInputVarVal" ];then
eval "$1=false"
return
fi
vSunJavaFound=`$vInputVarVal -version 2>&1 | grep -Eo -m 1 "(HotSpot)|(OpenJDK)"`
if [ "$vSunJavaFound" != "HotSpot" ] && [ "$vSunJavaFound" != "OpenJDK" ] ; then
eval "$1=false"
return
fi
}
xCheckJava vJavaCmd
if [ "$vJavaCmd" = "false" ]; then
vJavaCmd="$JAVA_HOME/bin/java"
xCheckJava vJavaCmd
if [ "$vJavaCmd" = "false" ]; then
echo "ERREUR: JRE de SUN introuvable. Veuillez déclarer la variable d'environnement JAVA_HOME."
exit 1
fi
fi
#Lancer la commande
scJarList="$lib/*"
$vJavaCmd -classpath "$scJarList:" -Xmx150m org.apache.tools.ant.Main -buildfile $ant $antparam
optim_to_hdoc/tmp/extract/.wspmeta 0 → 100644
View file @ 306c906e
This diff is collapsed.
optim_to_hdoc/tmp/extract/02hdocConverterPortal/demo.object 0 → 100644
View file @ 306c906e
<?xml version="1.0" encoding="UTF-8"?>
<sc:item xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
<of:gallery xmlns:of="scpf.org:office" xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive">
<of:galleryM>
<sp:title>Hdoc Converter Portal (v0.2) Demo</sp:title>
</of:galleryM>
<sp:img sc:refUri="re/screen1.png"/>
<sp:img sc:refUri="re/screen2.png"/>
</of:gallery>
</sc:item>
\ No newline at end of file
optim_to_hdoc/tmp/extract/02hdocConverterPortal/hdocConverter.section 0 → 100644
View file @ 306c906e
<?xml version="1.0" encoding="UTF-8"?>
<sc:item xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
<of:section xmlns:of="scpf.org:office" xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive">
<of:sectionM>
<sp:title>Hdoc Converter Portal</sp:title>
</of:sectionM>
<sp:content>
<of:fragment>
<sp:info>
<of:block>
<of:blockM/>
<sp:co>
<of:flow>
<sp:txt>
<of:txt>
<sc:para xml:space="preserve" sc:id="t2">Hdoc Converter Portal is a web platform designed to convert as many types of files to and from the <sc:inlineStyle role="emphasis" sc:id="t267">hdoc</sc:inlineStyle> format. The main program is in<sc:inlineStyle role="emphasis" sc:id="t268"> javascript/php</sc:inlineStyle> and it calls <sc:inlineStyle role="emphasis" sc:id="t269">ANT</sc:inlineStyle> scripts that, eventually, perform each conversion.</sc:para>
</of:txt>
</sp:txt>
</of:flow>
</sp:co>
</of:block>
</sp:info>
</of:fragment>
</sp:content>
<sp:sec>
<of:section>
<of:sectionM>
<sp:title>Demo</sp:title>
</of:sectionM>
<sp:content>
<of:fragment>