1.1 --- a/imports.cpp	Tue Feb 21 16:18:23 2006 +0000
     1.2 +++ b/imports.cpp	Tue Feb 21 16:18:23 2006 +0000
     1.3 @@ -1,13 +1,14 @@
     1.4  #include <qmessagebox.h>
     1.5  
     1.6 +#include "file.h"
     1.7  #include "imports.h"
     1.8 -#include "file.h"
     1.9  #include "linkablemapobj.h"
    1.10  #include "misc.h"
    1.11  #include "mainwindow.h"
    1.12  #include "xsltproc.h"
    1.13  
    1.14  extern Main *mainWindow;
    1.15 +extern QDir vymBaseDir;
    1.16  
    1.17  ImportBase::ImportBase()
    1.18  {
    1.19 @@ -19,7 +20,7 @@
    1.20  ImportBase::~ImportBase()
    1.21  {
    1.22  	// Remove tmpdir
    1.23 -	removeDir (tmpDir);
    1.24 +	//removeDir (tmpDir);
    1.25  }
    1.26  
    1.27  void ImportBase::setDir(const QString &p)
    1.28 @@ -37,20 +38,57 @@
    1.29  	mapCenter=mc;
    1.30  }
    1.31  
    1.32 +bool ImportBase::transform()
    1.33 +{
    1.34 +	return true;
    1.35 +}
    1.36 +
    1.37 +QString ImportBase::getTransformedFile()
    1.38 +{
    1.39 +	return transformedFile;
    1.40 +}
    1.41 +
    1.42  /////////////////////////////////////////////////
    1.43 -void ImportKDEBookmarks::transform()
    1.44 +bool ImportKDEBookmarks::transform()
    1.45  {
    1.46  	transformedFile=tmpDir.path()+"/bookmarks.xml";
    1.47  
    1.48  	XSLTProc p;
    1.49  	p.setInputFile (tmpDir.home().path()+"/.kde/share/apps/konqueror/bookmarks.xml");
    1.50  	p.setOutputFile (transformedFile);
    1.51 -	p.setXSLFile ("styles/kdebookmarks2vym.xsl");
    1.52 +	p.setXSLFile (vymBaseDir.path()+"/styles/kdebookmarks2vym.xsl");
    1.53  	p.process();
    1.54 +
    1.55 +	return true;
    1.56  }
    1.57  
    1.58 -QString ImportKDEBookmarks::getTransformedFile()
    1.59 +
    1.60 +/////////////////////////////////////////////////
    1.61 +bool ImportMM::transform()
    1.62  {
    1.63 -	return transformedFile;
    1.64 +	// try to unzip 
    1.65 +	if (success==unzipDir (tmpDir, inputFile))
    1.66 +	{
    1.67 +		cout << "Unzipped "<<inputFile<<" to "<<tmpDir.path()<<endl;
    1.68 +		
    1.69 +		// Set short name, too. Search from behind:
    1.70 +		transformedFile=inputFile;
    1.71 +		int i=transformedFile.findRev("/");
    1.72 +		if (i>=0) transformedFile=transformedFile.remove (0,i+1);
    1.73 +		transformedFile.replace(".mmap",".xml");
    1.74 +		transformedFile=tmpDir.path()+"/"+transformedFile;
    1.75 +		cout << "  transformedFile="<<transformedFile<<endl;
    1.76 +
    1.77 +		XSLTProc p;
    1.78 +		p.setInputFile (tmpDir.path()+"/Document.xml");
    1.79 +		p.setOutputFile (transformedFile);
    1.80 +		p.setXSLFile (vymBaseDir.path()+"/styles/mmap2vym.xsl");
    1.81 +		p.process();
    1.82 +
    1.83 +		cout << "  xslt done"<<endl;
    1.84 +
    1.85 +		return true;
    1.86 +	} else
    1.87 +		return false;
    1.88 +	
    1.89  }
    1.90 -