Fix JS update of download links

Author: will-moore

idr_gallery/templates/idr_gallery/archived_image.html

@@ -149,12 +149,13 @@ <h3>Download Image Files</h3>
           }
           const baseUrl = downloadUrl.split(IDR_ID)[0];    // e.g. https://ftp.ebi.ac.uk/pub/databases/IDR/
           console.log(`Download URL for ${IDR_ID}:`, downloadUrl);
-          if (downloadUrl) {
+          if (downloadUrl && downloadUrl !== DOWNLOAD_URL) {
+            console.log(`Updating download URLs from ${DOWNLOAD_URL} to ${downloadUrl}`);
             // update all ".file_download" links to this download URL
             const fileDownloadLinks =
               document.querySelectorAll(".file_download");
             fileDownloadLinks.forEach((link) => {
-              link.href = link.href.replace(DOWNLOAD_URL, baseUrl);
+              link.href = link.href.replace(DOWNLOAD_URL, downloadUrl);
             });
           }
         } else {

idr_gallery/views.py

@@ -586,7 +586,7 @@ def image_viewer(request, iid, conn=None, **kwargs):
             if idrid in path:
                 # we want path *after* /idr0002-heriche-condensation/
                 # split on idrid handles mismatch like idr0047-neuert-yeastmrna with path idr0047-neuert-yeastmRNA
-                file_path = path.split(idrid_name, 1)[-1]
+                file_path = path.split(idrid, 1)[-1]
                 # remove before first "/" if present
                 file_path = file_path.split("/", 1)[-1] if "/" in file_path else file_path
                 if data_location == "Github":