Merge branch 'Bug-9505'

OpenEdition · May 28, 2020 · 3838219 · 3838219
2 parents 7ffb38e + b4226c1
commit 3838219
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/lodel/scripts/logic/class.entities_import.php b/lodel/scripts/logic/class.entities_import.php
@@ -57,6 +57,16 @@ public function importAction (&$context, &$error, $delete = true)
 			$this->task = $task = $context['task'];
 			unset($context['task']);
 		}
+        $tmp_importdir = C::get('tmp_importdir', 'cfg');
+        if (!empty($tmp_importdir)) {
+            $importfile = $tmp_importdir.$task['fichier']['contents'];
+            if (isset($task['fichier']['use_importdir']) && $task['fichier']['use_importdir']) {
+                $this->task['fichier']['contents'] = unserialize(file_get_contents($importfile));
+                $task['fichier']['contents'] = $this->task['fichier']['contents'];
+                delete_files($importfile);
+
+            }
+        }
 		if (!$task)
 			View::getView()->back();
 		$taskLogic->populateContext($task, $context);
@@ -67,7 +77,9 @@ public function importAction (&$context, &$error, $delete = true)
 		$context['idparent'] = $task['idparent'];
 		$odt = isset($task['odt']) ? $task['odt'] : null;
 		$tei = $task['tei'];
-		$contents = $task['fichier'];
+		$tmp_importdir = C::get('tmp_importdir', 'cfg');
+	    $contents = $task['fichier'];
+
 		unset($task);
 
 		// restore the entity

diff --git a/lodel/src/lodel/edition/checkimport.php b/lodel/src/lodel/edition/checkimport.php
@@ -28,8 +28,15 @@
 	if (!$task)
 		View::getView()->back();
 	$taskLogic->populateContext($task, $context);
-	$context = array_merge($context, $task['fichier']);
-	if(!empty($task['identity']))
+    $tmp_importdir = C::get('tmp_importdir', 'cfg');
+    if (!empty($tmp_importdir)) {
+        if (isset($task['fichier']['use_importdir']) && $task['fichier']['use_importdir']) {
+            $task['fichier']['contents'] = unserialize(file_get_contents($tmp_importdir.$task['fichier']['contents']));
+        }
+    }
+     $context = array_merge($context, $task['fichier']);
+
+ if(!empty($task['identity']))
 		$context['identity'] = $task['identity'];
 	if(!empty($task['idparent']))
 		$context['idparent'] = $task['idparent'];

diff --git a/lodel/src/lodel/edition/oochargement.php b/lodel/src/lodel/edition/oochargement.php
@@ -148,7 +148,18 @@ function printErrors($errors, $exit = true, $isFrame = true)
 					try
 					{
 						$parser = new TEIParser($context['idtype']);
-						$contents['contents'] = $parser->parse($teiContents, '', $tmpdir, $sourceoriginale);
+                        $tmp_importdir = C::get('tmp_importdir', 'cfg');
+                        if (!empty($tmp_importdir)) {
+                            if (!file_exists($tmp_importdir)) {
+                                mkdir($tmp_importdir, 0700, true);
+                            }
+                            $tmp_importfile = $tmp_importdir.'/'.basename($file1).'-import';
+                            file_put_contents($tmp_importfile, serialize($parser->parse($teiContents, '', $tmpdir, $sourceoriginale)));
+                            $contents['contents'] = '/'.basename($file1).'-import';
+                            $contents['use_importdir'] =  true;
+                        } else{
+						    $contents['contents'] = $parser->parse($teiContents, '', $tmpdir, $sourceoriginale);
+                        }
 					}
 					catch(Exception $e)
 					{