From e137a9246d2cadef3dde05de81fa83b2953fe808 Mon Sep 17 00:00:00 2001
From: Cyril Vazquez <cyril.vazquez@maarch.org>
Date: Fri, 16 Aug 2013 08:08:16 +0000
Subject: [PATCH] Fix: storeResourceFromURI problem with local copy to tmp,
import to docserver before copy is over: remove copy as fileURI provides link
to original file.
---
core/trunk/core/class/resources_controler.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/core/trunk/core/class/resources_controler.php b/core/trunk/core/class/resources_controler.php
index 53f6cf671c9..0b035ba8785 100755
--- a/core/trunk/core/class/resources_controler.php
+++ b/core/trunk/core/class/resources_controler.php
@@ -166,7 +166,7 @@ class resources_controler
$db = new dbquery();
$db->connect();
//copy sended file on tmp
- $fileContent = file_get_contents($fileURI);
+ /*$fileContent = file_get_contents($fileURI);
$random = rand();
$fileName = 'tmp_file_' . $random . '.' . $fileFormat;
$Fnm = $_SESSION['config']['tmppath'] . $fileName;
@@ -180,7 +180,15 @@ class resources_controler
'size' => filesize($Fnm),
'format' => $fileFormat,
'tmpFileName' => $fileName,
+ );*/
+ $docserverControler = new docservers_controler();
+ $fileInfos = array(
+ 'tmpDir' => dirname($fileURI) . DIRECTORY_SEPARATOR,
+ 'size' => filesize($fileURI),
+ 'format' => $fileFormat,
+ 'tmpFileName' => basename($fileURI),
);
+
//print_r($fileInfos);
$storeResult = array();
$storeResult = $docserverControler->storeResourceOnDocserver(
@@ -204,7 +212,7 @@ class resources_controler
$status,
$fileFormat
);
- unlink($Fnm);
+ //unlink($Fnm);
//var_dump($data);exit;
$resId = $resource->load_into_db(
$table,
--
GitLab