Added the ability to use more than one input directory for collection…

… master files that may be spread across sperate directories.

default.config.ini

@@ -20,7 +20,7 @@ include_migrated_from_uri = TRUE
 
 [FILE_GETTER]
 class = Cdm
-input_directory = "/tmp/mik_input"
+input_directories[] = "/tmp/mik_input"
 alias = cexpress
 ws_url = "http://content.lib.sfu.ca:81/dmwebservices/index.php?q="
 utils_url = "http://content.lib.sfu.ca/utils/"

src/filegetters/CdmNewspapers.php

@@ -12,7 +12,12 @@ class CdmNewspapers extends FileGetter
     /**
      * @var string $inputDirectory - path to newspaper collection.
      */
-    public $inputDirectory;
+    //public $inputDirectory;
+
+    /**
+     * @var array $inputDirectories - array of paths to files for newspaper collection.
+     */
+    public $inputDirectories;
 
     /**
      * @var array (dict) $OBJFilePaths - paths to OBJ files for collection
@@ -44,9 +49,15 @@ public function __construct($settings)
         $this->settings = $settings['FILE_GETTER'];
         $this->utilsUrl = $this->settings['utils_url'];
         $this->alias = $this->settings['alias'];
-        $this->inputDirectory = $this->settings['input_directory'];
-        $potentialObjFiles = $this
-            ->getIssueMasterFiles($this->inputDirectory);
+        //$this->inputDirectory = $this->settings['input_directory'];
+        $this->inputDirectories = $this->settings['input_directories'];
+        // interate over inputDirectories to create $potentialObjFiles array.
+        $potentialObjFiles = array();
+        foreach ($this->inputDirectories as $inputDirectory) {
+            $potentialObjFilesPart = $this
+                ->getIssueMasterFiles($inputDirectory);
+            $potentialObjFiles = array_merge($potentialObjFiles, $potentialObjFilesPart);
+        }
         $this->OBJFilePaths = $this->determineObjItems($potentialObjFiles);
         // information and methods for thumbnail minipulation
         $this->thumbnail = new \mik\filemanipulators\ThumbnailFromCdm($settings);
@@ -105,8 +116,6 @@ public function getIssueLocalFilesForOBJ($issueDate)
         // to use for the OBJ.tiff of each newspaper page.
         // Deal on an issue-by-issue bassis.
 
-        //print_r($this->getIssueMasterFiles($inputDirectory, $issueDate));
-        //return $arrayOfFilePaths;
         $key = DIRECTORY_SEPARATOR . $issueDate . DIRECTORY_SEPARATOR;
         return $this->OBJFilePaths[$key];
     }