From 4ee5e381388d90c42befb1e44d01af71b6143991 Mon Sep 17 00:00:00 2001
From: Gemma Guest <gemma.guest@stfc.ac.uk>
Date: Thu, 6 Dec 2018 10:31:57 +0000
Subject: [PATCH] Enable replacement of catalog path for Windows
Add a replacement string in the config for Windows which uses the fully qualified address for the archive at ISIS
---
Framework/Kernel/src/ICatalogInfo.cpp | 2 +-
instrument/Facilities.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Framework/Kernel/src/ICatalogInfo.cpp b/Framework/Kernel/src/ICatalogInfo.cpp
index 80f76c830d5..c8de68e8b0b 100644
--- a/Framework/Kernel/src/ICatalogInfo.cpp
+++ b/Framework/Kernel/src/ICatalogInfo.cpp
@@ -25,7 +25,7 @@ std::string ICatalogInfo::transformArchivePath(const std::string &path) const {
ret = replacePrefix(path, linuxPrefix(), windowsPrefix());
ret = replaceAllOccurences(ret, "/", "\\");
} else {
- ret = path;
+ ret = replacePrefix(path, catalogPrefix(), windowsPrefix());
}
#endif
return ret;
diff --git a/instrument/Facilities.xml b/instrument/Facilities.xml
index 7af2dc4cbb8..ea696f9c529 100644
--- a/instrument/Facilities.xml
+++ b/instrument/Facilities.xml
@@ -16,7 +16,7 @@
<externaldownload url="https://isisicatds.stfc.ac.uk/ids/"></externaldownload>
<filelocation>
<prefix regex="\\\\isis\\inst\$"></prefix>
- <windows replacement=""></windows>
+ <windows replacement="\\isis.cclrc.ac.uk\inst$"></windows>
<linux replacement="/archive"></linux>
<mac replacement="/archive"></mac>
</filelocation>
--
GitLab