Added CatalogInfo class to FacilityInfo. Refs #7866.

mantidproject · Oct 7, 2013 · 87485a4 · 87485a4
1 parent b8f5ba7
commit 87485a4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/CatalogInfo.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/CatalogInfo.h
@@ -52,7 +52,7 @@ namespace Mantid
         /// Constructor
         CatalogInfo(const Poco::XML::Element* element);
         /// Obtain catalog name from the facility file.
-        std::string catalogName();
+        const std::string catalogName() const;
         /// Obtain soap end point from the facility file.
         std::string soapEndPoint();
         /// Obtain the regex prefix from the  facility file.

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/FacilityInfo.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/FacilityInfo.h
@@ -5,6 +5,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidKernel/DllConfig.h"
+#include "MantidKernel/CatalogInfo.h"
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/InstrumentInfo.h"
 #include "MantidKernel/RemoteJobManager.h"
@@ -75,10 +76,8 @@ class MANTID_KERNEL_DLL FacilityInfo
   const std::string & catalogName()const {return m_catalogName;}
   /// Return the archive search interface names
   const std::vector<std::string> & archiveSearch() const { return m_archiveSearch; }
-
   /// Returns the name of the default live listener
   const std::string & liveListener() const { return m_liveListener; }
-
   /// Returns a list of instruments of this facility
   const std::vector<InstrumentInfo> & instruments() const { return m_instruments; }
   /// Returns a list of instruments of given technique
@@ -89,6 +88,8 @@ class MANTID_KERNEL_DLL FacilityInfo
   std::vector<std::string> computeResources() const;
   /// Returns the RemoteJobManager for the named compute resource
   boost::shared_ptr<RemoteJobManager> getRemoteJobManager( const std::string &name) const;
+  /// Returns the catalogInfo class.
+  const CatalogInfo& catalogInfo() const { return m_catalogs; }
 
 private:
   void fillZeroPadding(const Poco::XML::Element* elem);
@@ -103,6 +104,7 @@ class MANTID_KERNEL_DLL FacilityInfo
   /// Add new extension
   void addExtension(const std::string& ext);
 
+  CatalogInfo m_catalogs;                      ///< Gain access to the catalogInfo class.
   const std::string m_name;                    ///< facility name
   int m_zeroPadding;                           ///< default zero padding for this facility
   std::string m_delimiter;                     ///< default delimiter between instrument name and run number

diff --git a/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp b/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp
@@ -30,7 +30,7 @@ namespace Mantid
     /**
      * Obtain catalog name from the facility file.
      */
-    std::string CatalogInfo::catalogName()
+    const std::string CatalogInfo::catalogName() const
     {
       return (m_catalogName);
     }

diff --git a/Code/Mantid/Framework/Kernel/src/FacilityInfo.cpp b/Code/Mantid/Framework/Kernel/src/FacilityInfo.cpp
@@ -5,7 +5,6 @@
 #include "MantidKernel/Strings.h"
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/ConfigService.h"
-#include "MantidKernel/CatalogInfo.h"
 
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/NodeList.h>
@@ -28,8 +27,8 @@ Logger& FacilityInfo::g_log(Logger::get("FacilityInfo"));
   * @param elem :: The Poco::XML::Element to read the data from
   * @throw std::runtime_error if name or file extensions are not defined
   */
-FacilityInfo::FacilityInfo(const Poco::XML::Element* elem) : 
-  m_name(elem->getAttribute("name")), m_zeroPadding(0), m_delimiter(), m_extensions(),
+FacilityInfo::FacilityInfo(const Poco::XML::Element* elem) :
+  m_catalogs(elem), m_name(elem->getAttribute("name")), m_zeroPadding(0), m_delimiter(), m_extensions(),
   m_soapEndPoint(), m_archiveSearch(), m_instruments(), m_catalogName(), m_liveListener(),
   m_computeResources()
 {
@@ -44,10 +43,9 @@ FacilityInfo::FacilityInfo(const Poco::XML::Element* elem) :
   fillDelimiter(elem);
   fillExtensions(elem);
 
-  Mantid::Kernel::CatalogInfo catalog(elem);
   // Make use of the catalog class to set related attributes.
-  m_soapEndPoint = catalog.soapEndPoint();
-  m_catalogName  = catalog.catalogName();
+  m_soapEndPoint = m_catalogs.soapEndPoint();
+  m_catalogName  = m_catalogs.catalogName();
 
   fillArchiveNames(elem);
   fillLiveListener(elem);