Fix a potential issue with unset dictionary file

EHRI · Mar 15, 2022 · 7075098 · 7075098
1 parent e1a9400
commit 7075098
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/controllers/FilesController.php b/controllers/FilesController.php
@@ -63,7 +63,9 @@ public function importAction()
             move_uploaded_file($_FILES["file"]["tmp_name"], $path);
 
             $dict_path = null;
-            if ($form->getElement("enhance")->isChecked() && isset($_FILES["enhance_dict"]["tmp_name"])) {
+            if ($form->getElement("enhance")->isChecked()
+                    && isset($_FILES["enhance_dict"]["tmp_name"])
+                    && !empty($_FILES["enhance_dict"]["tmp_name"])) {
                 $dict_path = $temp . DIRECTORY_SEPARATOR . $_FILES['enhance_dict']['name'];
                 move_uploaded_file($_FILES["enhance_dict"]["tmp_name"], $dict_path);
             }

diff --git a/helpers/TeiEditions_Helpers_DataFetcher.php b/helpers/TeiEditions_Helpers_DataFetcher.php
@@ -31,6 +31,7 @@ class TeiEditions_Helpers_DataFetcher
     function __construct($dict_path = null, $lang = 'eng', $opts = array())
     {
         if ($dict_path) {
+            error_log("Loading dictionary path: $dict_path");
             $doc = TeiEditions_Helpers_DocumentProxy::fromUriOrPath($dict_path);
             foreach ($doc->entities() as $entity) {
                 $this->dict[$entity->ref()] = $entity;

diff --git a/helpers/TeiEditions_Helpers_DataImporter.php b/helpers/TeiEditions_Helpers_DataImporter.php
@@ -75,7 +75,7 @@ public function importData($path, $mime, $neatline, $enhance, &$created, &$updat
             $tx->commit();
         } catch (Exception $e) {
             $tx->rollBack();
-            throw new TeiEditions_Helpers_ImportError("Error importing file: $name", 0, $e);
+            throw new TeiEditions_Helpers_ImportError("Error importing file: $name: " . $e->getMessage(), 0, $e);
         } finally {
             $onDone();
         }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tei-editions",
   "description": "An Omeka plugin for importing and rendering structured TEI files for EHRI digital editions.",
-  "version": "1.0.0-pre4",
+  "version": "1.0.0-pre5",
   "devDependencies": {
     "grunt": "^1.3.0",
     "grunt-cli": "^1.3.2",

diff --git a/plugin.ini b/plugin.ini
@@ -7,4 +7,4 @@ link="https://github.com/EHRI/TeiEditions"
 support_link="https://github.com/EHRI/TeiEditions/issues"
 omeka_minimum_version="2.6"
 omeka_target_version="2.6"
-version="1.0.0-pre4"
+version="1.0.0-pre5"