Correct mindmapping_to_opale to remove hdoc conversion (call to mindmapping_to_hdoc)

mindmapping_to_opale/mindMapping2Opale.ant → mindMapping_to_Opale/mindmapping_to_opale.ant

@@ -16,19 +16,16 @@
 
   <!-- Sect Schema : only sect element -->
         <antcall target="Makehdoc">
-            <param name="myXSLT" value="sect.xsl"/>
             <param name="hdocName" value="sect"/>
         </antcall>
         
   <!-- Div Schema : sect and div element -->
         <antcall target="Makehdoc">
-            <param name="myXSLT" value="div.xsl"/>
             <param name="hdocName" value="div"/>
         </antcall>
 
   <!-- Div Schema : sect, div and p element -->
     <antcall target="Makehdoc">
-            <param name="myXSLT" value="threeLevel.xsl"/>
             <param name="hdocName" value="three"/>
         </antcall>
         
@@ -55,25 +52,21 @@
    <!-- Convert a mindMap file into a hdoc, with a xsl schema specified in the parameter -->
    <target name="Makehdoc" >
        <echo>Begin data conversion</echo>
-       <mkdir dir="${basedir}/temp/${hdocName}"/>
-       <mkdir dir="${basedir}/temp/${hdocName}/META-INF"/>
-       <copy file="${basedir}/mimetype" tofile="${basedir}/temp/${hdocName}/mimetype"/>
-       <!-- create the container file with an XSLT transformation -->
-       <xslt in="${basedir}/${inputPath}" out="${basedir}/temp/${hdocName}/META-INF/container.xml" xslresource="${basedir}/../mindMapping_to_Hdoc/xslt/makeContainer.xsl"/>
-       <!-- create the file which contains the freemind data converted-->
-       <xslt in="${basedir}/${inputPath}" out="${basedir}/temp/${hdocName}/content.xml" xslresource="${basedir}/../mindMapping_to_Hdoc/xslt/${myXSLT}"/>
-       
-       <!-- zipping files as the hdoc format -->
-       <zip destfile="${resultFile}/hdoc/${hdocName}.hdoc"
-       basedir="${basedir}/temp/${hdocName}"/>
       <!-- to generate scar files -->
+      <antcall target="hdoc_conversion"/>
       <antcall target="opale_conversion"/>
     <!-- </condition> -->
        
-        <delete dir="${resultFile}/hdoc"></delete>
+        <!--<delete dir="${resultFile}/hdoc"></delete>-->
        <echo>end data conversion</echo>
    </target>
 
+  <target name="hdoc_conversion">
+      <!-- <condition property="converting.set" else="false"> -->
+       <ant antfile="${basedir}/../mindmapping_to_hdoc/mindmapping_to_hdoc.ant" dir="${basedir}/../mindmapping_to_hdoc">
+            <property name="InputPath" value="${inputPath}"/>
+        </ant>
+   </target>
 
    <!-- Connect this to the work of the other group about hdoc to opale (configure and call their ant etc.) -->
    <target name="opale_conversion">
@@ -85,3 +78,8 @@
    </target>
     
 </project> 
+
+
+
+   
+

mindmapping_to_hdoc/mindMapping2Hdoc.ant → mindmapping_to_hdoc/mindmapping_to_hdoc.ant

@@ -14,26 +14,25 @@
         <echo>----------------------------Begin of conversion----------------------------------</echo>
 
 
-	<!-- Sect Schema : only sect element -->
+  <!-- Sect Schema : only sect element -->
         <antcall target="Makehdoc">
             <param name="myXSLT" value="sect.xsl"/>
             <param name="hdocName" value="sect"/>
         </antcall>
         
-	<!-- Div Schema : sect and div element -->
+  <!-- Div Schema : sect and div element -->
         <antcall target="Makehdoc">
             <param name="myXSLT" value="div.xsl"/>
             <param name="hdocName" value="div"/>
         </antcall>
 
-	<!-- Div Schema : sect, div and p element -->
-	  <antcall target="Makehdoc">
+  <!-- Div Schema : sect, div and p element -->
+    <antcall target="Makehdoc">
             <param name="myXSLT" value="threeLevel.xsl"/>
             <param name="hdocName" value="three"/>
         </antcall>
-        
 
-  <!-- <delete dir="${basedir}/temp"/> -->
+      <delete dir="${basedir}/temp"/>
         <echo>----------------------------End of conversion----------------------------------</echo>
     </target>
     
@@ -43,8 +42,6 @@
         <mkdir dir="${basedir}/temp" />
         <delete dir="${resultFile}/hdoc"></delete>
         <mkdir dir="${resultFile}/hdoc" />
-        <delete dir="${resultFile}/scar"></delete>
-        <mkdir dir="${resultFile}/scar" />
         <!--<condition>
           <equals arg1="${foo}" arg2=""/>
         </condition> -->
@@ -66,30 +63,9 @@
 	     <!-- zipping files as the hdoc format -->
        <zip destfile="${resultFile}/hdoc/${hdocName}.hdoc"
        basedir="${basedir}/temp/${hdocName}"/>
-    	<!-- to generate scar files -->
-      <antcall target="opale_conversion"/>
     <!-- </condition> -->
        
        <echo>end data conversion</echo>
    </target>
-
-
-   <!-- Connect this to the work of the other group about hdoc to opale (configure and call their ant etc.) -->
-   <target name="opale_conversion" if="${opale.exists}" depends="opale_test">
-      <!-- <condition property="converting.set" else="false"> -->
-       <ant antfile="${basedir}/hdoctoopale/hdoc_to_opale.ant" dir="${basedir}/hdoctoopale">
-            <property name="InputPath" value="${resultFile}/hdoc/${hdocName}.hdoc"/>
-            <property name="OutputPath" value="${resultFile}/scar/${hdocName}.scar"/>
-        </ant>
-   </target>
-
-   <!-- check if opale convertion is asked by the user -->
-    <target name="opale_test">
-      <condition property="opale.exists" else="false">
-          <equals arg1="${opale}" arg2="true"/>
-      </condition>
-      
-      <echo message="Run opale conversion ? ${opale.exists}"/>
-  </target>
     
 </project> 

mindmapping_to_hdoc/readme.txt

@@ -3,15 +3,9 @@
 #1 : you want to convert your freemindFile in Hdoc
 - put your freemind file in the mindMapping_to_Hdoc 
 - enter the command line :
-	- linux : ant -buildfile mindMapping2Hdoc.ant -DinputPath <yourFilename>
-	- windows : C:\ant\bin\ant -buildfile mindMapping2Hdoc.ant -DinputPath <yourFilename>
+	- linux : ant -buildfile mindmapping_to_hdoc.ant -DinputPath <yourFilename>
+	- windows : C:\ant\bin\ant -buildfile mindmapping_to_hdoc.ant -DinputPath <yourFilename>
 
 you will find the result in the folder result/hdoc
 
-#2 : you want a .scar (for scenari)
-- put your freemind file in the mindMapping_to_Hdoc 
-- enter the command line :
-	- linux : ant -buildfile mindMapping2Hdoc.ant -DinputPath <yourFilename>  -Dopale true
-	- windows : C:\ant\bin\ant -buildfile mindMapping2Hdoc.ant -DinputPath <yourFilename>  -Dopale true
-you will find the result in the folder result/opale
 

mindmapping_to_hdoc/temp/sect/mimetype

-application/x-hdoc+zip

mindmapping_to_opale/readme.txt

 # how to use the converter
 
 #1 : you want to convert your freemindFile in Opale
-- put your freemind file in the mindMapping_to_Opale 
+- put your freemind file in the mindmapping_to_opale 
 - enter the command line :
-	- linux : ant -buildfile mindMapping2Opale.ant -DinputPath <yourFilename>
-	- windows : C:\ant\bin\ant -buildfile mindMapping2Hdoc.ant -DinputPath <yourFilename>
+	- linux : ant -buildfile mindmapping_to_opale.ant -DinputPath <yourFilename>
+	- windows : C:\ant\bin\ant -buildfile mindmapping_to_opale.ant -DinputPath <yourFilename>
 you will find the result in the folder result/opale