Added new attributes to cataloginfo. Refs #8126.

mantidproject · Oct 18, 2013 · f2194fe · f2194fe
1 parent d3a4c35
commit f2194fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/CatalogInfo.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/CatalogInfo.h
@@ -55,6 +55,8 @@ namespace Mantid
         const std::string catalogName() const;
         /// Obtain soap end point from the facility file.
         const std::string soapEndPoint() const;
+        /// Obtain the external download URL.
+        const std::string externalDownloadURL() const;
         /// Obtain the regex prefix from the  facility file.
         const std::string catalogPrefix() const;
         /// Obtain Windows prefix from the facility file.
@@ -76,6 +78,7 @@ namespace Mantid
 
         std::string m_catalogName;
         std::string m_soapEndPoint;
+        std::string m_externalDownloadURL;
         std::string m_catalogPrefix;
         std::string m_windowsPrefix;
         std::string m_macPrefix;

diff --git a/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp b/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp
@@ -19,12 +19,13 @@ namespace Mantid
      */
     CatalogInfo::CatalogInfo(const Poco::XML::Element* element)
     {
-      m_catalogName   = getAttribute(element, "catalog", "name");
-      m_soapEndPoint  = getAttribute(element, "soapendpoint", "url");
-      m_catalogPrefix = getAttribute(element, "prefix", "regex");
-      m_windowsPrefix = getAttribute(element, "windows", "replacement");
-      m_macPrefix     = getAttribute(element, "mac", "replacement");
-      m_linuxPrefix   = getAttribute(element, "linux", "replacement");
+      m_catalogName         = getAttribute(element, "catalog", "name");
+      m_soapEndPoint        = getAttribute(element, "soapendpoint", "url");
+      m_externalDownloadURL = getAttribute(element, "externaldownload", "url");
+      m_catalogPrefix       = getAttribute(element, "prefix", "regex");
+      m_windowsPrefix       = getAttribute(element, "windows", "replacement");
+      m_macPrefix           = getAttribute(element, "mac", "replacement");
+      m_linuxPrefix         = getAttribute(element, "linux", "replacement");
     }
 
     /**
@@ -43,6 +44,14 @@ namespace Mantid
       return (m_soapEndPoint);
     }
 
+    /**
+     * Obtain catalog name from the facility file.
+     */
+    const std::string CatalogInfo::externalDownloadURL() const
+    {
+      return (m_externalDownloadURL);
+    }
+
     /**
      * Obtain the regex prefix for default archive path.
      */