Skip to content

sequencerd: set SEQ_WAIT_EXPOSE before sending expose; match integer keys with = not like #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cfremling wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −5
Open

sequencerd: set SEQ_WAIT_EXPOSE before sending expose; match integer keys with = not like #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8712263
sequencerd: set SEQ_WAIT_EXPOSE before sending expose, not after the …
cfremling Sep 9, 2026
8f8523a
sequencerd: match integer keys with = instead of like (full table sca…
cfremling Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sequencerd/sequence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2891,6 +2891,7 @@ namespace Sequencer {
if ( this->tcs_preauth_time > 0 ) this->notify_tcs_next_target = true; else this->notify_tcs_next_target = false;

this->arm_readout_flag = true; // enables the async_listener to look for the readout and clear the EXPOSE bit
this->wait_state_manager.set( Sequencer::SEQ_WAIT_EXPOSE ); // set EXPOSE bit

this->set_imgtype();

Expand All @@ -2913,7 +2914,6 @@ namespace Sequencer {
}

error = this->target.update_state( Sequencer::TARGET_EXPOSING ); // set EXPOSE state in database
this->wait_state_manager.set( Sequencer::SEQ_WAIT_EXPOSE ); // set EXPOSE bit

return error;
}
Expand Down
8 changes: 4 additions & 4 deletions sequencerd/sequencer_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ namespace Sequencer {
std::map<std::string, mysqlx::Value> bindings;

if ( use_id ) {
condition = "SET_ID like :setid";
condition = "SET_ID = :setid";
bindings = { { "setid", mysqlx::Value(setid_in) } };
}
else {
Expand Down Expand Up @@ -403,7 +403,7 @@ namespace Sequencer {
}

try {
const std::string condition("OBSERVATION_ID like :obsid");
const std::string condition("OBSERVATION_ID = :obsid");
const std::string order("OBSERVATION_ID");
std::map<std::string, mysqlx::Value> bindings = { { "obsid", mysqlx::Value(obsid) } };

Expand Down Expand Up @@ -533,7 +533,7 @@ namespace Sequencer {
// Find a row in the SQL active observations table,
// the next one (in order) where state is state_in.
//
const std::string condition("SET_ID like :setid && STATE like :state");
const std::string condition("SET_ID = :setid && STATE like :state");
const std::string order("OBS_ORDER");
std::map<std::string, mysqlx::Value> bindings = { { "state", mysqlx::Value(state_in) },
{ "setid", mysqlx::Value(this->setid) } };
Expand Down Expand Up @@ -773,7 +773,7 @@ namespace Sequencer {
// vector identifies the fields to retrieve and is initialized by the TargetInfo()
// class initializer list.
//
const std::string condition("OBSERVATION_ID like :obsid");
const std::string condition("OBSERVATION_ID = :obsid");
std::map<std::string, mysqlx::Value> bindings = { { "obsid", mysqlx::Value(this->obsid) } };

// read from active targets table
Expand Down
Loading