From 7c926bfdc92421d9948cad97c55a8343995ba648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Carretero?=
<frederic.carretero@veremes.com>
Date: Fri, 16 Nov 2018 15:33:19 +0100
Subject: [PATCH] Upload des ressources d'un projet FME sur S3
---
web_service/ws/Workspaces.class.inc | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/web_service/ws/Workspaces.class.inc b/web_service/ws/Workspaces.class.inc
index 38f2feb4..6f6592a6 100755
--- a/web_service/ws/Workspaces.class.inc
+++ b/web_service/ws/Workspaces.class.inc
@@ -504,28 +504,29 @@ class Workspaces extends GTF {
// Si le répertoire existe déja : suppression.
if (is_dir($sDirName))
clearDir($sDirName);
- // Création de l'arboresence.
- mkdir($sDirName, 0777, true);
- mkdir($sDirName . "/form", 0777, true);
- mkdir($sDirName . "/form/ressources", 0777, true);
- mkdir($sDirName . "/fme", 0777, true);
// Upload du fichier fmw.
- $sErrorMessage = uploadInWsDataDir ("gtf", "workspace", $this->aValues["my_vitis_id"], "fmw_file", $this->aValues, -1, "fmw");
+ $this->aValues['fme'] = $this->aValues['fmw_file'];
+ $_FILES['fme'] = $_FILES['fmw_file'];
+ $sErrorMessage = uploadInWsDataDir("gtf", "workspace", $this->aValues["my_vitis_id"], "fme", $this->aValues, -1, "fmw");
// Copie du .fmw original en .bak.
if (empty($sErrorMessage))
- copyFileInWsDataDir ('gtf', 'workspace', $this->aValues["my_vitis_id"], 'fmw_file', $_FILES['fmw_file']['name'], $_FILES['fmw_file']['name'] . '.bak');
+ copyFileInWsDataDir ('gtf', 'workspace', $this->aValues["my_vitis_id"], 'fme', $_FILES['fmw_file']['name'], $_FILES['fmw_file']['name'] . '.bak');
else
writeToErrorLog($sErrorMessage);
- // Création des fichiers de ressources js et css.
- fclose(fopen($sDirName . "/form/ressources/Subform.js", "w+"));
- fclose(fopen($sDirName . "/form/ressources/Subform.css", "w+"));
- // Ressources complémentaires.
+ // Création des fichiers vides de ressources js et css.
+ createEmptyFileInWsDataDir('gtf', 'workspace', $this->aValues["my_vitis_id"], 'form/ressources', 'Subform.js');
+ createEmptyFileInWsDataDir('gtf', 'workspace', $this->aValues["my_vitis_id"], 'form/ressources', 'Subform.css');
+ // Upload du fichier de ressource.
if ($this->aValues["comp_file"] != "") {
- uploadFile('comp_file', "", $sDirName . "/fme/" . $_FILES['comp_file']['name'], $_FILES['comp_file']['size'] + 1);
+ $this->aValues['fme'] = $this->aValues['comp_file'];
+ $_FILES['fme'] = $_FILES['comp_file'];
+ $sErrorMessage = uploadInWsDataDir("gtf", "workspace", $this->aValues["my_vitis_id"], "fme", $this->aValues);
+ /*
$ext = pathinfo($_FILES['comp_file']['name'], PATHINFO_EXTENSION);
if ($ext == "zip") {
unZip($sDirName . "/fme/" . utf8_decode($_FILES['comp_file']['name']), $sDirName . "/fme/");
}
+ */
}
$oFmwParser = new GtfFmwParser($sDirName . "/fme/" . $_FILES['fmw_file']['name']);
// Sauve le .fmw sans les visualizers.
--
GitLab