Commit 93f33c24 authored by Robert Butora's avatar Robert Butora
Browse files

vlkb-obscore: inserts only survName -> obs_collection, species&trans -> obs_title

parent 31ba7b0e

data-access/engine/src/vlkb-obscore/src/database/SqlSchema_DELETE.cpp

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ SqlSchema_DELETE::SqlSchema_DELETE(void) 
vector<string> SqlSchema_DELETE::getCommand(int sid, const Survey& surv)

{

   string sidStr     = to_string(sid);

   string obsCollStr = surv.getObsCollection();// FIXME + to_sqlstring(surv.getObsCollection()); and remove apostrophes below...

   string obsCollStr = surv.getObsCollection();

   string obsTitleStr = surv.getObsTitle();



   vector<string> vDELETE{

/*      {"DELETE FROM cubeboundsgalactic WHERE header_id IN (SELECT header_id FROM headers WHERE survey_id = " + sidStr + ")"},
@@ -23,7 +24,7 @@ vector<string> SqlSchema_DELETE::getCommand(int sid, const Survey& surv) 
      {"DELETE FROM verticesicrs       WHERE header_id IN (SELECT header_id FROM headers WHERE survey_id = " + sidStr + ")"},

      {"DELETE FROM headers            WHERE survey_id = " + sidStr},

*/

      {"DELETE FROM obscore WHERE obs_collection LIKE \'" + obsCollStr + "\'"},

      {"DELETE FROM obscore WHERE obs_collection = \'" + obsCollStr + "\' AND obs_title = \'" + obsTitleStr +  "\'"},

   };

   return vDELETE;

}

data-access/engine/src/vlkb-obscore/src/database/SqlSurvey.cpp

+5 −3
Original line number Diff line number Diff line
@@ -122,11 +122,13 @@ string Survey::getStorageFilter(void) 


string Survey::getObsCollection(void) const

{

   return survName +" "+ survSpecies +" "+ survTransition;

   return survName;

}







string Survey::getObsTitle(void) const

{

   return survSpecies + " | " + survTransition;

}

data-access/engine/src/vlkb-obscore/src/database/SqlSurvey.hpp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ class Survey 


      std::string getStorageFilter(void);

      std::string getObsCollection(void) const;

      std::string getObsTitle(void) const;



      // table fields

data-access/engine/src/vlkb-obscore/src/database/database.cpp

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ void database::dbAddSurvey(int sid, const string groups, 
      const string obs_publisher_did = obscore_publisher + "?" + rel_pathname;



      // optional

      const string obs_title{surv.survSpecies + " | " + surv.survTransition};

      const string obs_title{surv.getObsTitle()};



      // 4. set optional values which are available (in header or in metadata)

      try