diff --git a/Code/Mantid/Framework/ICat/src/CatalogPublish.cpp b/Code/Mantid/Framework/ICat/src/CatalogPublish.cpp index 52524cfbcca5..4c3b71aee808 100644 --- a/Code/Mantid/Framework/ICat/src/CatalogPublish.cpp +++ b/Code/Mantid/Framework/ICat/src/CatalogPublish.cpp @@ -137,8 +137,6 @@ namespace Mantid if (boost::lexical_cast(getPropertyValue("GenerateDOI"))) { int64_t investigationID = getProperty("InvestigationID"); - if (investigationID == 0) throw std::runtime_error("You must provide a valid investigationID."); - std::string generatedDOI = catalogInfoService->registerDatafileDOI(investigationID); g_log.notice("The DOI registered for datafile " + Poco::Path(filePath).getFileName() + " was: " + generatedDOI); } diff --git a/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp b/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp index cc8cda455ddd..601701032c8e 100644 --- a/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp +++ b/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp @@ -391,6 +391,7 @@ namespace Mantid if (outputws->getColumnNames().empty()) { // Add rows headers to the output workspace. + outputws->addColumn("long64","DatabaseID"); outputws->addColumn("str","InvestigationID"); outputws->addColumn("str","Facility"); outputws->addColumn("str","Title"); @@ -414,6 +415,7 @@ namespace Mantid std::string emptyCell(""); // Now add the relevant investigation data to the table (They always exist). + savetoTableWorkspace(investigation->id, table); savetoTableWorkspace(investigation->name, table); savetoTableWorkspace(investigation->facility->name, table); savetoTableWorkspace(investigation->title, table); diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/CatalogSearch.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/CatalogSearch.cpp index 21523c99a81f..b888a4d3c6c3 100644 --- a/Code/Mantid/MantidQt/MantidWidgets/src/CatalogSearch.cpp +++ b/Code/Mantid/MantidQt/MantidWidgets/src/CatalogSearch.cpp @@ -752,6 +752,7 @@ namespace MantidQt // Show only a portion of the title as they can be quite long. resultsTable->setColumnWidth(headerIndexByName(resultsTable, "Title"), 210); + resultsTable->setColumnHidden(headerIndexByName(resultsTable, "DatabaseID"),true); resultsTable->setColumnHidden(headerIndexByName(resultsTable, "SessionID"), true); // Sort by endDate with the most recent being first.