#include "funcrequest.h"
#include "lyx_cb.h"
-#include "bufferlist.h"
#include "support/filetools.h"
+
#include "frontends/Alert.h"
+
#include "gettext.h"
#include "BufferView.h"
#include "buffer_funcs.h"
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::makeDisplayPath;
+
+namespace lyx {
+
+using support::bformat;
+using support::changeExtension;
+using support::FileName;
+using support::makeDisplayPath;
using std::find;
using std::string;
using std::vector;
-extern BufferList bufferlist;
-
-
-bool Importer::Import(LyXView * lv, string const & filename,
- string const & format)
+bool Importer::Import(LyXView * lv, FileName const & filename,
+ string const & format, ErrorList & errorList)
{
- string const displaypath = makeDisplayPath(filename);
+ docstring const displaypath = makeDisplayPath(filename.absFilename());
lv->message(bformat(_("Importing %1$s..."), displaypath));
- string const lyxfile = changeExtension(filename, ".lyx");
+ FileName const lyxfile(changeExtension(filename.absFilename(), ".lyx"));
string loader_format;
vector<string> loaders = Loaders();
for (vector<string>::const_iterator it = loaders.begin();
it != loaders.end(); ++it) {
if (converters.isReachable(format, *it)) {
- if (!converters.convert(0, filename, filename,
- format, *it))
+ string const tofile =
+ changeExtension(filename.absFilename(),
+ formats.extension(*it));
+ if (!converters.convert(0, filename, FileName(tofile),
+ filename, format, *it, errorList))
return false;
loader_format = *it;
break;
}
}
if (loader_format.empty()) {
- Alert::error(_("Couldn't import file"),
+ frontend::Alert::error(_("Couldn't import file"),
bformat(_("No information for importing the format %1$s."),
formats.prettyName(format)));
return false;
}
- } else
+ } else {
loader_format = format;
+ }
if (loader_format == "lyx") {
lv->loadLyXFile(lyxfile);
} else {
- lv->setBuffer(newFile(lyxfile, string(), true));
+ Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
+ if (b)
+ lv->setBuffer(b);
+ else
+ return false;
bool as_paragraphs = loader_format == "textparagraph";
- string filename2 = (loader_format == format) ? filename
- : changeExtension(filename,
+ string filename2 = (loader_format == format) ? filename.absFilename()
+ : changeExtension(filename.absFilename(),
formats.extension(loader_format));
insertAsciiFile(lv->view(), filename2, as_paragraphs);
lv->dispatch(FuncRequest(LFUN_MARK_OFF));
v.push_back("textparagraph");
return v;
}
+
+
+} // namespace lyx