diff -r 519970fe6c84 -r e211e2fc9d54 imports.cpp --- a/imports.cpp Tue Feb 21 16:18:23 2006 +0000 +++ b/imports.cpp Tue Feb 21 16:18:23 2006 +0000 @@ -1,13 +1,14 @@ #include +#include "file.h" #include "imports.h" -#include "file.h" #include "linkablemapobj.h" #include "misc.h" #include "mainwindow.h" #include "xsltproc.h" extern Main *mainWindow; +extern QDir vymBaseDir; ImportBase::ImportBase() { @@ -19,7 +20,7 @@ ImportBase::~ImportBase() { // Remove tmpdir - removeDir (tmpDir); + //removeDir (tmpDir); } void ImportBase::setDir(const QString &p) @@ -37,20 +38,57 @@ mapCenter=mc; } +bool ImportBase::transform() +{ + return true; +} + +QString ImportBase::getTransformedFile() +{ + return transformedFile; +} + ///////////////////////////////////////////////// -void ImportKDEBookmarks::transform() +bool ImportKDEBookmarks::transform() { transformedFile=tmpDir.path()+"/bookmarks.xml"; XSLTProc p; p.setInputFile (tmpDir.home().path()+"/.kde/share/apps/konqueror/bookmarks.xml"); p.setOutputFile (transformedFile); - p.setXSLFile ("styles/kdebookmarks2vym.xsl"); + p.setXSLFile (vymBaseDir.path()+"/styles/kdebookmarks2vym.xsl"); p.process(); + + return true; } -QString ImportKDEBookmarks::getTransformedFile() + +///////////////////////////////////////////////// +bool ImportMM::transform() { - return transformedFile; + // try to unzip + if (success==unzipDir (tmpDir, inputFile)) + { + cout << "Unzipped "<=0) transformedFile=transformedFile.remove (0,i+1); + transformedFile.replace(".mmap",".xml"); + transformedFile=tmpDir.path()+"/"+transformedFile; + cout << " transformedFile="<