From 3eeb42aaa1961d869a1b1481f0236d9da5ff9f96 Mon Sep 17 00:00:00 2001
From: Gemma Guest <gemma.guest@stfc.ac.uk>
Date: Thu, 6 Dec 2018 10:45:07 +0000
Subject: [PATCH] Catalog prefix now matches full path

Update the regex for matching the ISIS catalog prefix so that it can match either the short or fully-qualified path
---
 instrument/Facilities.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instrument/Facilities.xml b/instrument/Facilities.xml
index ea696f9c529..258a8579c00 100644
--- a/instrument/Facilities.xml
+++ b/instrument/Facilities.xml
@@ -15,7 +15,7 @@
     <soapendpoint url="https://icatisis.esc.rl.ac.uk/ICATService/ICAT"></soapendpoint>
     <externaldownload url="https://isisicatds.stfc.ac.uk/ids/"></externaldownload>
     <filelocation>
-      <prefix regex="\\\\isis\\inst\$"></prefix>
+      <prefix regex="\\\\isis(?:\.cclrc\.ac\.uk)?\\inst\$"></prefix>
       <windows replacement="\\isis.cclrc.ac.uk\inst$"></windows>
       <linux replacement="/archive"></linux>
       <mac replacement="/archive"></mac>
-- 
GitLab