removes survey-bounds functionality (vlkb dbbounds) & fixes warning unused obscore_publisher (32cd8b50) · Commits · ViaLactea / vlkb-soda

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ namespace database
		int max_hdupos, int min_hdupos = 1);

		void dbModifyGroups(int sid, const std::string groups,
		const std::string obscore_publisher,
		const std::string db_uri, const std::string db_schema);

		void dbRemoveSurvey(int sid, const std::string db_uri, const std::string db_schema);
		void dbSurveyBounds(/int sid,/ const std::string db_uri, const std::string db_schema);
		std::vector<std::string> dbCheck(const std::string db_uri, const std::string db_schema);
		std::vector<std::string> dbListSurveys(const std::string db_uri, const std::string db_schema);
		std::string dbListFiles(int sid, const std::string db_uri, const std::string db_schema, const std::string fitsdir);

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

+0 −16

Original line number	Diff line number	Diff line
		@@ -126,21 +126,6 @@ vector<string> database::dbListSurveys(const string db_uri, const string db_sche



		void database::dbSurveyBounds(/int sid,/ const string db_uri, const string db_schema)
		{
		LOG_trace(__func__);

		DbConn db(db_uri, db_schema);

		// FIXME re-implement with obscore::s_region or polygon_region(_galactic)
		//
		//db.dbExecQuery(Sql_SELECT_SurveyBounds::qLonMinMax(sid));
		//db.dbExecQuery(Sql_SELECT_SurveyBounds::qLatMinMax(sid));
		}




		string database::dbListFiles(int sid, const string db_uri, const string db_schema, const string fitsdir)
		{
		LOG_trace(__func__);
		@@ -281,7 +266,6 @@ void database::dbAddSurvey(int sid, const string groups,


		void database::dbModifyGroups(int sid, const string groups,
		const string obscore_publisher,
		const string db_uri, const string db_schema)
		{
		LOG_trace(__func__);

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

+10 −44

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ namespace vlkb
		<< "Usage: " << progname << " <conf_filename> <command> [cmd-options] [cmd-args]" << endl
		<< "\n where conf_filename is typically /etc/" << progname << "/datasets.conf\n "
		<< "\n and where commands are:\n "
		<< "\n\t dbfiles dbinit dbcheck dblist dbbounds dbadd dbmodgroups dbremove\n"
		<< "\n\t dbfiles dbinit dbcheck dblist dbadd dbmodgroups dbremove\n"
		<< std::endl
		<< "Version: " << VERSIONSTR << " " << BUILD << std::endl;
		}
		@@ -38,7 +38,7 @@ namespace vlkb

		// program recognizes following commands

		enum cmd_set {dbinit, dbcheck, dblist, dbfiles, dbbounds, dbaddsurvey, dbmodgroups, dbremovesurvey};
		enum cmd_set {dbinit, dbcheck, dblist, dbfiles, dbaddsurvey, dbmodgroups, dbremovesurvey};


		// from bash receive args as strings
		@@ -51,7 +51,6 @@ namespace vlkb
		else if(cmdstr.compare("dbcheck") == 0) cmd = dbcheck;
		else if(cmdstr.compare("dblist") == 0) cmd = dblist;
		else if(cmdstr.compare("dbfiles") == 0) cmd = dbfiles;
		else if(cmdstr.compare("dbbounds") == 0) cmd = dbbounds;
		else if(cmdstr.compare("dbadd") == 0) cmd = dbaddsurvey;
		else if(cmdstr.compare("dbmodgroups") == 0) cmd = dbmodgroups;
		else if(cmdstr.compare("dbremove") == 0) cmd = dbremovesurvey;
		@@ -68,8 +67,6 @@ namespace vlkb
		} // namespce


		const bool WITH_PASSWORD = true;

		std::string base_name(std::string path)
		{
		return path.substr(path.find_last_of("//") + 1);
		@@ -105,7 +102,7 @@ int cmd_dbInit(int argc, char * argv[])
		std::cin >> answer;
		if(answer.compare("yes") == 0)
		{
		database::dbInit(vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema(), csv_filename);
		database::dbInit(vlkb::conf.getDbUri(), vlkb::conf.getDbSchema(), csv_filename);
		rc = 0;
		}
		else
		@@ -128,7 +125,7 @@ int cmd_dbCheck(void)
		int rc;
		try
		{
		vector<string> db_rows{database::dbCheck(vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema())};
		vector<string> db_rows{database::dbCheck(vlkb::conf.getDbUri(), vlkb::conf.getDbSchema())};
		for(string one_row : db_rows) cout << one_row << endl;
		rc = 0;
		}
		@@ -147,7 +144,7 @@ int cmd_dbList(void)
		int rc;
		try
		{
		vector<string> res_str = database::dbListSurveys(vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema());
		vector<string> res_str = database::dbListSurveys(vlkb::conf.getDbUri(), vlkb::conf.getDbSchema());
		rc = 0;
		for(string res_row : res_str)
		cout << res_row << endl;
		@@ -161,35 +158,6 @@ int cmd_dbList(void)
		}



		int cmd_dbBounds(int argc, char * argv[])
		{
		int rc;
		switch(argc)
		{
		case 2:
		try
		{
		database::dbSurveyBounds(/stoi(argv[1]),/ vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema());
		rc = 0;
		}
		catch(exception& e)
		{
		rc = vlkb::EXIT_WITH_ERROR;
		ERROR_STREAM << e.what() << endl;
		}
		break;

		default:
		cout << "Usage: dbbounds <SID>" << endl
		<< "prints min-max bounds" << endl;
		rc = vlkb::EXIT_WITH_USAGE;
		}
		return rc;
		}



		int cmd_dbFiles(int argc, char * argv[])
		{
		int rc;
		@@ -198,7 +166,7 @@ int cmd_dbFiles(int argc, char * argv[])
		case 2:
		try
		{
		string row = database::dbListFiles(std::stoi(argv[1]), vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema(), vlkb::conf.getFitsDir());
		string row = database::dbListFiles(std::stoi(argv[1]), vlkb::conf.getDbUri(), vlkb::conf.getDbSchema(), vlkb::conf.getFitsDir());
		rc = 0;
		cout << row << endl;
		}
		@@ -214,7 +182,7 @@ int cmd_dbFiles(int argc, char * argv[])
		{
		for(int i=std::stoi(argv[1]); i<=std::stoi(argv[2]); i++)
		cout <<
		database::dbListFiles(i, vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema(), vlkb::conf.getFitsDir())
		database::dbListFiles(i, vlkb::conf.getDbUri(), vlkb::conf.getDbSchema(), vlkb::conf.getFitsDir())
		<< endl;
		rc = 0;
		}
		@@ -291,7 +259,7 @@ int cmd_dbAdd(int argc, char * argv[])
		{
		database::dbAddSurvey(i, groups,
		vlkb::conf.getObsCorePublisher(), vlkb::conf.getObsCoreAccessFormat(), vlkb::conf.getObscoreAccessUrl(),
		vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema(), vlkb::conf.getFitsDir(), max_hdupos, min_hdupos);
		vlkb::conf.getDbUri(), vlkb::conf.getDbSchema(), vlkb::conf.getFitsDir(), max_hdupos, min_hdupos);
		}
		catch(exception& e)
		{
		@@ -397,8 +365,7 @@ int cmd_dbModGroups(int argc, char * argv[])
		string sql_groups_vec{to_sql_text_vec(groups)};

		for(int i=sid_from; i<=sid_to; i++)
		database::dbModifyGroups(i, sql_groups_vec,
		vlkb::conf.getObsCorePublisher(), vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema());
		database::dbModifyGroups(i, sql_groups_vec, vlkb::conf.getDbUri(), vlkb::conf.getDbSchema());
		rc = 0;
		}
		catch(exception& e)
		@@ -420,7 +387,7 @@ int cmd_dbRemove(int argc, char * argv[])
		case 2:
		try
		{
		database::dbRemoveSurvey(stoi(argv[1]), vlkb::conf.getDbUri(WITH_PASSWORD), vlkb::conf.getDbSchema());
		database::dbRemoveSurvey(stoi(argv[1]), vlkb::conf.getDbUri(), vlkb::conf.getDbSchema());
		rc = 0;
		}
		catch(exception& e)
		@@ -479,7 +446,6 @@ int main (int argc, char * argv[])
		case vlkb::dbinit: rc = cmd_dbInit(cmd_argc,cmd_argv); break;
		case vlkb::dbcheck: rc = cmd_dbCheck(); break;
		case vlkb::dblist: rc = cmd_dbList(); break;
		case vlkb::dbbounds: rc = cmd_dbBounds(cmd_argc,cmd_argv); break;
		case vlkb::dbfiles: rc = cmd_dbFiles(cmd_argc,cmd_argv); break;
		case vlkb::dbaddsurvey: rc = cmd_dbAdd(cmd_argc,cmd_argv); break;
		case vlkb::dbmodgroups: rc = cmd_dbModGroups(cmd_argc,cmd_argv); break;