Skip to content
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

Jump to bottom

LIMS-1240: Dont use shortComments LIKE 'EDNA%' #795

Merged
merged 1 commit into from
Jul 23, 2024
Merged

LIMS-1240: Dont use shortComments LIKE 'EDNA%' #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions api/src/Page/Sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ private function get_sub_samples_query($where, $first_inner_select_where = '', $
LEFT OUTER JOIN screening sc ON dc.datacollectionid = sc.datacollectionid
LEFT OUTER JOIN screeningoutput so ON sc.screeningid = so.screeningid

LEFT OUTER JOIN screeningstrategy st ON st.screeningoutputid = so.screeningoutputid AND sc.shortcomments LIKE '%EDNA%'
LEFT OUTER JOIN screeningstrategy st ON st.screeningoutputid = so.screeningoutputid AND sc.programversion = 'EDNA MXv1'
LEFT OUTER JOIN screeningstrategywedge ssw ON ssw.screeningstrategyid = st.screeningstrategyid

LEFT OUTER JOIN autoprocintegration ap ON ap.datacollectionid = dc.datacollectionid
Expand Down Expand Up @@ -1208,7 +1208,7 @@ function _samples()
LEFT OUTER JOIN screening sc ON dc.datacollectionid = sc.datacollectionid
LEFT OUTER JOIN screeningoutput so ON sc.screeningid = so.screeningid

LEFT OUTER JOIN screeningstrategy st ON st.screeningoutputid = so.screeningoutputid AND sc.shortcomments LIKE '%EDNA%'
LEFT OUTER JOIN screeningstrategy st ON st.screeningoutputid = so.screeningoutputid AND sc.programVersion = 'EDNA MXv1'
LEFT OUTER JOIN screeningstrategywedge ssw ON ssw.screeningstrategyid = st.screeningstrategyid

LEFT OUTER JOIN autoprocintegration ap ON ap.datacollectionid = dc.datacollectionid
Expand Down
10 changes: 7 additions & 3 deletions api/src/Page/Stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,12 @@ function _pipelines() {

$t = $this->has_arg('t') ? $this->arg('t') : 'ai';

if (array_key_exists($t, $types)) $this->$types[$t]();
else $this->_error('No such stat type');
if (array_key_exists($t, $types)) {
$func = $types[$t];
$this->$func();
} else {
$this->_error('No such stat type');
}
}


Expand All @@ -275,7 +279,7 @@ function _auto_indexing() {
INNER JOIN datacollectiongroup dcg ON dcg.datacollectiongroupid = dc.datacollectiongroupid
INNER JOIN blsession ses ON ses.sessionid = dcg.sessionid
INNER JOIN v_run vr ON (ses.startdate BETWEEN vr.startdate AND vr.enddate)
WHERE s.shortcomments LIKE 'EDNA%' AND TIMESTAMPDIFF('SECOND', dc.endtime, s.bltimestamp) < 10000
WHERE s.shortcomments LIKE 'Strategy%' AND TIMESTAMPDIFF('SECOND', dc.endtime, s.bltimestamp) between 0 and 10000
AND ses.beamlinename in ('$bls')
GROUP BY s.shortcomments, vr.run
ORDER BY vr.run
Expand Down
Loading