From e6da1c850c29c2a5b4d5e7cc06c127c54605d669 Mon Sep 17 00:00:00 2001
From: Sofian pujo <sofian.pujo@veremes.com>
Date: Tue, 6 Nov 2018 08:56:54 +0100
Subject: [PATCH] Correction d'anomalie sur les require_once
---
.../web_service/ws/Extraction.class.inc | 2 +-
.../ws/ExtractionExtraction.class.inc | 30 +++++++++++--------
.../web_service/ws/Extractions.class.inc | 4 +--
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/module_extraction/web_service/ws/Extraction.class.inc b/src/module_extraction/web_service/ws/Extraction.class.inc
index 1b97cb73..9acdb453 100755
--- a/src/module_extraction/web_service/ws/Extraction.class.inc
+++ b/src/module_extraction/web_service/ws/Extraction.class.inc
@@ -1,7 +1,7 @@
<?php
require_once __DIR__ . '/ExtractionExtraction.class.inc';
-require_once $this->aProperties['vas_home'] . '/rest/class/vitis_lib/Connection.class.inc';
+require_once __DIR__. '/../../class/vitis_lib/Connection.class.inc';
/**
* \file Extraction.class.inc
diff --git a/src/module_extraction/web_service/ws/ExtractionExtraction.class.inc b/src/module_extraction/web_service/ws/ExtractionExtraction.class.inc
index 07b301b7..770729dd 100755
--- a/src/module_extraction/web_service/ws/ExtractionExtraction.class.inc
+++ b/src/module_extraction/web_service/ws/ExtractionExtraction.class.inc
@@ -1,40 +1,44 @@
<?php
-require_once $this->aProperties['vas_home'] . "/../vas/rest/class/vitis_lib/DbClass.class.inc";
-require_once $this->aProperties['vas_home'] . '/../vas/rest/ws/vitis/Vitis.class.inc';
+ require_once __DIR__ . "/../../class/vitis_lib/DbClass.class.inc";
+ require_once __DIR__ . '/../vitis/Vitis.class.inc';
require_once 'vmlib/logUtil.inc';
-class ExtractionExtraction extends Vitis {
+class ExtractionExtraction extends Vitis
+{
//Chemin du fichier de ressources contenant les requêtes SQL
- var $sRessourcesFile = 'ws/extraction/ExtractionExtraction.class.sql.inc';
-
+ public $sRessourcesFile = 'ws/extraction/ExtractionExtraction.class.sql.inc';
+
/**
* Upload un document dans le ws_data du module Extraction.
* @param type $sIndex
* @param type $sFolder
*/
- function uploadDocument($sIndex, $sFolder) {
+ public function uploadDocument($sIndex, $sFolder)
+ {
// Crée le répertoire si inexistant.
$sDirPath = $this->aProperties['ws_data_dir'] . '/extraction/' . $sFolder . '/documents/' . $this->aValues["my_vitis_id"] . '/' . $sIndex . '/';
- if (!is_dir($sDirPath))
+ if (!is_dir($sDirPath)) {
mkdir($sDirPath, 0777, true);
+ }
+
// Ecrit le fichier.
if (!empty($_FILES[$sIndex])) {
$sErrorMessage = uploadFile($sIndex, "", $sDirPath . $_FILES[$sIndex]["name"], $_FILES[$sIndex]['size'] + 1);
- if ($sErrorMessage != "")
+ if ($sErrorMessage != "") {
writeToErrorLog($sErrorMessage);
- }
- else {
+ }
+
+ } else {
$sfileContentIndex = $sIndex . '_file';
- $sfileNameIndex = $sIndex . '_name';
+ $sfileNameIndex = $sIndex . '_name';
if (!empty($this->aValues[$sfileContentIndex])) {
$this->aValues[$sIndex] = $this->aValues[$sfileNameIndex];
- $fp = fopen($sDirPath . $this->aValues[$sfileNameIndex], "w");
+ $fp = fopen($sDirPath . $this->aValues[$sfileNameIndex], "w");
fwrite($fp, $this->aValues[$sfileContentIndex]);
fclose($fp);
}
}
}
}
-?>
\ No newline at end of file
diff --git a/src/module_extraction/web_service/ws/Extractions.class.inc b/src/module_extraction/web_service/ws/Extractions.class.inc
index 75b2d0b5..d10e1a37 100755
--- a/src/module_extraction/web_service/ws/Extractions.class.inc
+++ b/src/module_extraction/web_service/ws/Extractions.class.inc
@@ -13,7 +13,8 @@
*/
require_once __DIR__ . '/ExtractionExtraction.class.inc';
require_once 'Extraction.class.inc';
-require_once $this->aProperties['vas_home'] . '/rest/class/wab_lib/BusinessObject.class.inc';
+
+require_once __DIR__ . '/../../class/wab_lib/BusinessObject.class.inc';
class Extractions extends ExtractionExtraction
{
@@ -460,7 +461,6 @@ class Extractions extends ExtractionExtraction
public function trGenerer()
{
$this->oBO = new WabBusinessObject($this->oConnection->oBd, array(), $this->aValues, $this->aProperties, 'extraction', $this->aValues['bo_id']);
-
// Check si la table existe si oui change l'état
$this->oBO->wabSetStatus($this->aProperties["schema_extraction"], "extraction", "bo_id", $this->aValues["bo_id"], "AE Généré");
--
GitLab