Merge pull request #84 in CATS/pyclowder2 from Improvement/CATS-975-add_links_to_local_files to develop

* commit 'cc47ffa2700b15d796baaaaa2adef3e666d77465':
  Added making a temp folder for cases where multiple instance are running on the same machine
  Added linking to local files when the local file name doesn't match expected file name

Author: Chris-Schnaufer

pyclowder/connectors.py

@@ -296,13 +296,24 @@ def _prepare_dataset(self, host, secret_key, resource):
         tmp_files_created = []
         tmp_dirs_created = []
 
+        # Create a temporary folder to hold any links to local files we may need
+        temp_link_dir = tempfile.mkdtemp()
+        tmp_dirs_created.append(temp_link_dir)
+
         # first check if any files in dataset accessible locally
         ds_file_list = pyclowder.datasets.get_file_list(self, host, secret_key, resource["id"])
         for ds_file in ds_file_list:
             file_path = self._check_for_local_file(host, secret_key, ds_file)
             if not file_path:
                 missing_files.append(ds_file)
             else:
+                # Create a link to the original file if the "true" name of the file doesn't match what's on disk
+                if not file_path.lower().endswith(ds_file['filename'].lower()):
+                    ln_name = io.path.join(temp_link_dir, ds_file['filename'])
+                    os.symlink(file_path, ln_name)
+                    tmp_files_created.append(ln_name)
+                    file_path = ln_name
+
                 # Also get file metadata in format expected by extrator
                 (file_md_dir, file_md_tmp) = self._download_file_metadata(host, secret_key, ds_file['id'],
                                                                           ds_file['filepath'])