Added property to publish algorithm. Refs #8742.

- Made publish dialog use publishing algorithm's property.
mantidproject · Jan 31, 2014 · 4bbe13e · 4bbe13e
1 parent a5fe015
commit 4bbe13e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/ICat/src/CatalogPublish.cpp b/Code/Mantid/Framework/ICat/src/CatalogPublish.cpp
@@ -56,6 +56,7 @@ namespace Mantid
       declareProperty("NameInCatalog","","The name to give to the file being saved. The file name or workspace name is used by default. "
           "This can only contain alphanumerics, underscores or periods.");
       declareProperty("InvestigationNumber","","The investigation number where the published file will be saved to.");
+      declareProperty("DataFileDescription","","A short description of the datafile you are publishing to the catalog.");
     }
 
     /// Execute the algorithm
@@ -115,7 +116,8 @@ namespace Mantid
       // Verify that the file can be opened correctly.
       if (fileStream.rdstate() & std::ios::failbit) throw Mantid::Kernel::Exception::FileError("Error on opening file at: ", filePath);
       // Publish the contents of the file to the server.
-      publish(fileStream,catalog->getUploadURL(getPropertyValue("InvestigationNumber"), getPropertyValue("NameInCatalog")));
+      publish(fileStream,catalog->getUploadURL(
+          getPropertyValue("InvestigationNumber"), getPropertyValue("NameInCatalog"), getPropertyValue("DataFileDescription")));
       // If a workspace was published, then we want to also publish the history of a workspace.
       if (!ws.empty()) publishWorkspaceHistory(catalog, workspace);
     }
@@ -221,7 +223,7 @@ namespace Mantid
       // Use the name the use wants to save the file to the server as and append .py
       std::string fileName = Poco::Path(Poco::Path(getPropertyValue("NameInCatalog")).getFileName()).getBaseName() + ".py";
       // Publish the workspace history to the server.
-      publish(ss, catalog->getUploadURL(getPropertyValue("InvestigationNumber"), fileName));
+      publish(ss, catalog->getUploadURL(getPropertyValue("InvestigationNumber"), fileName, getPropertyValue("DataFileDescription")));
     }
 
     /**

diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp
@@ -34,6 +34,7 @@ namespace MantidQt
       tie(m_uiForm.inputWorkspaceCb,"InputWorkspace");
       tie(m_uiForm.nameInCatalogTxt,"NameInCatalog");
       tie(m_uiForm.investigationNumberCb,"InvestigationNumber");
+      tie(m_uiForm.descriptionInput,"DataFileDescription");
 
       // Allows the combo box to show workspaces when they are loaded into Mantid.
       m_uiForm.inputWorkspaceCb->setValidatingAlgorithm(m_algName);