diff -r 30b22f7bd009 -r 494e8f40f0f7 exports.cpp
--- a/exports.cpp	Mon Sep 12 19:52:51 2005 +0000
+++ b/exports.cpp	Tue Jan 03 09:44:41 2006 +0000
@@ -1,27 +1,28 @@
 #include "exports.h"
+#include "file.h"
+#include "linkablemapobj.h"
+#include "misc.h"
+#include "texteditor.h"
+#include "mainwindow.h"
 
-#include <qregexp.h>
+extern Main *mainWindow;
 
-#include "linkablemapobj.h"
-#include "texteditor.h"
-
-
-Export::Export()
+ExportBase::ExportBase()
 {
 	indentPerDepth="  ";
 }
 
-void Export::setPath (const QString &p)
+void ExportBase::setPath (const QString &p)
 {
 	filepath=p;
 }
 
-void Export::setMapCenter(MapCenterObj *mc)
+void ExportBase::setMapCenter(MapCenterObj *mc)
 {
 	mapCenter=mc;
 }
 
-QString Export::getSectionString(BranchObj *bostart)
+QString ExportBase::getSectionString(BranchObj *bostart)
 {
 	QString r;
 	BranchObj *bo=bostart;
@@ -38,13 +39,13 @@
 		return r + " ";
 }
 
-void Export::exportMap()
+void ExportBase::exportXML()
 {
 	QFile file (filepath);
 	if ( !file.open( IO_WriteOnly ) )
 	{
 		// FIXME experimental, testing
-		cout << "Export::exportMap  couldn't open "<<filepath<<endl;
+		cout << "ExportBase::exportXML  couldn't open "<<filepath<<endl;
 		return;
 	}
 	QTextStream ts( &file );	// use LANG decoding here...
@@ -91,7 +92,7 @@
 
 // Exports a map to a LaTex file.  This file needs to be included or inported into a LaTex document
 // it will not add a preamble, or anything that makes a full LaTex document.
-void Export::exportLaTeX() 
+void ExportLaTeX::exportLaTeX() 
 {
   QFile file (filepath);
   if ( !file.open( IO_WriteOnly ) ) {
@@ -137,81 +138,183 @@
   file.close();
 }
 
-#include "settings.h"
+ExportOO::ExportOO()
+{
+	// Create tmpdir and set paths
+	tmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
+	templateDir="oo-test/suse-template/";
+	contentTemplateFile=templateDir+"content-template.xml";
+	contentFile=tmpDir.path()+"/content.xml";
+	pageTemplateFile=templateDir+"page-template.xml";
+	chapterTemplateFile=templateDir+"chapter-template.xml";
 
-void Export::exportOOPresentation()
-{
-	QString templateDir="oo-test/suse-template/";
-	QString templateContent="content.xml";
-	QString tmpDir="/tmp/vym-ootest/";
-	QString header="";
-
-
-	// Create tmpdir
-		// TODO
-
+	outputFile=tmpDir.currentDirPath()+"/out.odp";
+	
 	// Copy template to tmpdir
-		// TODO
-
+	system ("cp -r "+templateDir+"* "+tmpDir.path());
+	
 
 	// Read content-template
-		// TODO
-	QString content;
-	if (!loadStringFromDisk (templateDir+templateContent,content))
+	if (!loadStringFromDisk (contentTemplateFile,content))
 	{
-		qWarning ("Export::exportOOPresentation() Couldn't load from "+templateDir+templateContent);
+		qWarning ("Export::exportOOPresentation() Couldn't load from "+contentTemplateFile);
 		return;
 	}
 
+	// Read page-template
+	QString pageTemplate;
+	if (!loadStringFromDisk (pageTemplateFile,pageTemplate))
+	{
+		qWarning ("Export::exportOOPresentation() Couldn't load from "+pageTemplateFile);
+		return;
+	}
+	
+	// Read chapter-template
+	QString chapterTemplate;
+	if (!loadStringFromDisk (chapterTemplateFile,chapterTemplate))
+	{
+		qWarning ("Export::exportOOPresentation() Couldn't load from "+chapterTemplateFile);
+		return;
+	}
+}
 
-	// Walk through map
-	QString s;
-	QString actIndent("");
-	uint j;
-	int i;
-	BranchObj *bo;
-	bo=mapCenter->first();
-	while (bo) 
-	{
-		// Make indentstring
-		for (i=0;i<bo->getDepth();i++) actIndent+= indentPerDepth;
+ExportOO::~ExportOO()
+{
+	// Remove tmpdir
+	//FIXME removeDir (tmpDir);
+	cout << "tmpDir="<<tmpDir.path()<<endl;
+}	
 
-		// Write heading
-		//	write (actIndent + getSectionString(bo) + bo->getHeading()+ "\n");
-		if (bo->getDepth()==0)
-		{
-			s+= (bo->getHeading()+ "\n");
-			for (j=0;j<bo->getHeading().length();j++) s+="=";
-			s+= "\n";
-		} else 	if (bo->getDepth()==1)
-			s+= ("\n"+getSectionString(bo) + bo->getHeading()+ "\n");
-		else	if (bo->getDepth()==2)
-			s+= (actIndent + " o " + bo->getHeading()+ "\n");
-		else	
-			s+ (actIndent + " - " + bo->getHeading()+ "\n");
-		
-		/*
-		// If necessary, write note
-		if (!bo->getNote().isEmpty())
-		{
-			s =textConvertToASCII(bo->getNote());
-			s=s.replace ("\n","\n"+actIndent);
-			ts << (s+"\n\n");
-		}
-		*/
-		bo=bo->next();
-		actIndent="";
-	}
+QString ExportOO::buildList (BranchObj *current)
+{
+    QString r;
+    BranchObj *bo;
+    int i=0;
+    bo=current->getFirstBranch();
+    if (bo)
+    {
+        // Start list
+        r+="<text:list>\n";
+        while (bo)
+        {
+            r+="<text:list-item><text:p text:style-name=\"P7\">\n  "+
+               bo->getHeading()+
+               "\n</text:p></text:list-item>\n";
+        }
+        r+="</text:list>\n";
+    }
+    return r;
+}
 
+QString ExportOO::walkPages (BranchObj *current)
+{
+	//FIXME Denkfehler: mit current anfangen, nicht mit
+	// Kind von current. Sonst erwisch ich nur jede 2. Depth
+	//
+
+
+    QString r;
+    BranchObj *bo;
+    int i=0;
+    bo=current->getFirstBranch();
+    while(bo)
+    {
+		r+=quotemeta(bo->getHeading())+"\n";
+		if (bo->getFirstBranch()) 
+			r+=walkPages (bo->getFirstBranch());
+		i++;
+		bo=current->getBranchNum (i);
+    }
+    return r;
+}
+
+
+void ExportOO::exportPresentation()
+{
+	QString allPages=walkPages (mapCenter);
+
+	cout << allPages<<endl;
 	
 	// Insert new content
-		// TODO
-	cout <<"\n\ns="<<s<<endl;
-	content.replace ("<!--INSERT PAGES HERE-->",s);
-	cout << "ExportOO: content=\n"<<content<<endl;
+	content.replace ("<!-- INSERT TITLE -->",quotemeta(mapCenter->getHeading()));
+	content.replace ("<!-- INSERT AUTHOR -->",quotemeta(mapCenter->getAuthor()));
+	content.replace ("<!-- INSERT PAGES -->",allPages);
+
+	// Write modified content
+	QFile f (contentFile);
+    if ( !f.open( IO_WriteOnly ) ) 
+	{
+		mainWindow->statusMessage(QString(QObject::tr("Could not write to %1")).arg(outputFile));
+		return;
+    }
+
+    QTextStream t( &f );
+    t << content;
+    f.close();
+
+	mainWindow->statusMessage( QString( QObject::tr("Map exported as %1")).arg( outputFile));
+
 
 	// zip tmpdir to destination
-		// TODO
+	zipDir (tmpDir,outputFile);	
 
+	/* FIXME not needed
+	QString onePage;
+	QString allPages;
+	QString heading;
+
+
+	// Walk through chapters (mainbranches)
+	QString s;
+
+	QString list;
+	BranchObj *bo;
+	BranchObj *boLastPage=NULL;
+	bo=mapCenter->first();
+	int depth;
+	int lastDepth=-1;
+	int basePageDepth=2;
+	while (bo)
+	{
+		depth=bo->getDepth();
+		heading=quotemeta(bo->getHeading());
+		if (depth>1)
+		{
+			if (depth==basePageDepth)
+			{
+				// Start a new page containing a heading and a list
+				if (boLastPage==NULL)
+				{
+					// Start new single page
+					boLastPage=bo;
+					onePage=pageTemplate;
+					onePage.replace ("<!-- INSERT PAGE HEADING -->", heading);
+					list="";
+				} else
+				{
+					// Finish last page, start new one
+					onePage.replace ("<!-- INSERT LIST -->", list);
+					boLastPage=bo;
+					allPages+=onePage;
+					onePage=pageTemplate;
+					onePage.replace ("<!-- INSERT PAGE HEADING -->", heading);
+					list="";
+				}
+			} else
+			{
+				if (lastDepth==depth-1)
+					// entering deeper branches, new list
+					list+="<text:list>";
+				// Just add heading to list on current page
+				list+="<text:list-item><text:p text:style-name=\"P7\">"+heading+"</text:p></text:list-item>\n";
+				if (lastDepth==depth+1)
+					// returning from deeper branches, finish list
+					list+="</text:list>";
+			}
+		}	
+		lastDepth=depth;
+		bo=bo->next();
+	}
+*/
 }