Merge remote-tracking branch 'origin/feature/9376_icat_create_mantid_…

…dataset'
mantidproject · May 2, 2014 · 0455fbf · 0455fbf
2 parents ade8b4a + 770ab5b
commit 0455fbf
Show file tree

Hide file tree

Showing 2 changed files with 203 additions and 281 deletions.
diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
@@ -90,8 +90,16 @@ namespace Mantid
         std::string formatDateTime(const time_t &timestamp, const std::string &format);
         // Search the archive & obtain the dataset ID based on the investigationID.
         int64_t getMantidDatasetId(const std::string &investigationID);
+        // Creates a dataset for an investigation (based on ID) named 'mantid' if it does not already exist.
+        int64_t createMantidDataset(const std::string &investigationID);
         // Sets the soap-endpoint & SSL context for the given ICAT proxy.
         void setICATProxySettings(ICat4::ICATPortBindingProxy& icat);
+        // Returns the results of a search against ICAT for a given query.
+        std::vector<ICat4::xsd__anyType*> performSearch(ICat4::ICATPortBindingProxy& icat, std::string query);
+
+        // Is the desired accessType allowed for a specific bean?
+        template<class T>
+        bool isAccessAllowed(ICat4::ns1__accessType accessType, T& bean);
 
         // Stores the session details for a specific catalog.
         API::CatalogSession_sptr m_session;