From 9ac132e3b66654de432b7cfa675c06020faa94c5 Mon Sep 17 00:00:00 2001
From: Francois Henrotte <francois.henrotte@ulg.ac.be>
Date: Tue, 20 Nov 2012 20:06:43 +0000
Subject: [PATCH] bug fixed: model opened via GUI
---
contrib/onelab/OnelabClients.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/contrib/onelab/OnelabClients.cpp b/contrib/onelab/OnelabClients.cpp
index ffb1e51d5a..8284666cf6 100644
--- a/contrib/onelab/OnelabClients.cpp
+++ b/contrib/onelab/OnelabClients.cpp
@@ -653,8 +653,9 @@ bool remoteClient::syncOutputFile(const std::string &wdir, const std::string &fi
void MetaModel::construct()
{
OLMsg::Info("Metamodel now CONSTRUCTING");
+ std::string fileName = getWorkingDir() + genericNameFromArgs + onelabExtension;
openOnelabBlock();
- parse_onefile( genericNameFromArgs + onelabExtension);
+ parse_onefile(fileName);
closeOnelabBlock();
saveCommandLines();
//onelab::server::instance()->setChanged(true, getName());
@@ -662,7 +663,7 @@ void MetaModel::construct()
void MetaModel::analyze() {
OLMsg::Info("Metamodel now ANALYZING");
- std::string fileName = genericNameFromArgs + onelabExtension;
+ std::string fileName = getWorkingDir() + genericNameFromArgs + onelabExtension;
openOnelabBlock();
OLMsg::Info("Parse file <%s> %s", fileName.c_str(),
parse_onefile(fileName)?"done":"failed");
@@ -671,7 +672,7 @@ void MetaModel::analyze() {
void MetaModel::compute() {
OLMsg::Info("Metamodel now COMPUTING");
- std::string fileName = genericNameFromArgs + onelabExtension;
+ std::string fileName = getWorkingDir() + genericNameFromArgs + onelabExtension;
openOnelabBlock();
OLMsg::Info("Parse file <%s> %s", fileName.c_str(),
parse_onefile(fileName)?"done":"failed");
--
GitLab