Update columns in ICAT3. Refs #9112.

- This allows ICAT3 & ICAT4 catalogs to work together
mantidproject · Mar 14, 2014 · ab6119e · ab6119e
1 parent 80df3e6
commit ab6119e
Showing 1 changed file with 36 additions and 18 deletions.
diff --git a/Code/Mantid/Framework/ICat/src/ICat3/ICat3Helper.cpp b/Code/Mantid/Framework/ICat/src/ICat3/ICat3Helper.cpp
@@ -50,11 +50,14 @@ namespace Mantid
     {
       if (outputws->getColumnNames().empty())
       {
-        outputws->addColumn("long64","InvestigationId");
-        outputws->addColumn("str","Proposal");
+        outputws->addColumn("str","Investigation id");
+        outputws->addColumn("str","Facility");
         outputws->addColumn("str","Title");
         outputws->addColumn("str","Instrument");
-        outputws->addColumn("str","Run Range");
+        outputws->addColumn("str","Run range");
+        outputws->addColumn("str","Start date");
+        outputws->addColumn("str","End date");
+        outputws->addColumn("str","SessionID");
       }
       saveInvestigations(response.return_,outputws);
     }
@@ -65,28 +68,29 @@ namespace Mantid
      */
     void CICatHelper::saveInvestigations(const std::vector<ns1__investigation*>& investigations,API::ITableWorkspace_sptr& outputws)
     {
-
       try
       {
         std::vector<ns1__investigation*>::const_iterator citr;
         for (citr=investigations.begin();citr!=investigations.end();++citr)
         {
           API::TableRow t = outputws->appendRow();
 
-          //investigation id
-          savetoTableWorkspace((*citr)->id,t);
-
-          //Proposal
-          savetoTableWorkspace((*citr)->invNumber,t);
+          std::string id = boost::lexical_cast<std::string>(*(*citr)->id);
 
-          //title
+          savetoTableWorkspace(&id,t);
+          savetoTableWorkspace((*citr)->facility,t);
           savetoTableWorkspace((*citr)->title,t);
-
-          //Instrument
           savetoTableWorkspace((*citr)->instrument,t);
-
-          //run range
           savetoTableWorkspace((*citr)->invParamValue,t);
+
+          std::string startDate = boost::lexical_cast<std::string>(*(*citr)->invStartDate);
+          savetoTableWorkspace(&startDate,t);
+
+          std::string endDate = boost::lexical_cast<std::string>(*(*citr)->invEndDate);
+          savetoTableWorkspace(&endDate,t);
+
+          std::string sessionID = m_session->getSessionId();
+          savetoTableWorkspace(&sessionID, t);
         }
       }
       catch(std::runtime_error& )
@@ -142,6 +146,9 @@ namespace Mantid
         outputws->addColumn("str","Location");
         outputws->addColumn("str","Create Time");
         outputws->addColumn("long64","Id");
+        outputws->addColumn("long64","File size(bytes)");
+        outputws->addColumn("str","File size");
+        outputws->addColumn("str","Description");
       }
 
       try
@@ -169,7 +176,6 @@ namespace Mantid
 
           // File Name
           savetoTableWorkspace((*datafile_citr)->name,t);
-          // File Size
           savetoTableWorkspace((*datafile_citr)->location,t);
 
           //File creation Time.
@@ -184,8 +190,17 @@ namespace Mantid
             creationtime->assign(ftime);
           }
           savetoTableWorkspace(creationtime,t);
+
+
           // 
           savetoTableWorkspace((*datafile_citr)->id,t);
+
+
+          LONG64 fileSize = boost::lexical_cast<LONG64>(*(*datafile_citr)->fileSize);
+          savetoTableWorkspace(&fileSize,t);
+
+          savetoTableWorkspace((*datafile_citr)->description,t);
+
         }
 
       }
@@ -401,11 +416,14 @@ namespace Mantid
     {
       if(outputws->getColumnNames().empty())
       {
-        outputws->addColumn("long64","InvestigationId");
-        outputws->addColumn("str","Proposal");
+        outputws->addColumn("str","Investigation id");
+        outputws->addColumn("str","Facility");
         outputws->addColumn("str","Title");
         outputws->addColumn("str","Instrument");
-        outputws->addColumn("str","Run Range");
+        outputws->addColumn("str","Run range");
+        outputws->addColumn("str","Start date");
+        outputws->addColumn("str","End date");
+        outputws->addColumn("str","SessionID");
       }
       saveInvestigations(response.return_,outputws);