Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-04-11 02:09:31 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

invert lower/greater conditions to be consistent with how comparisons are performed in rsexpr.h

Browse Source
This commit is contained in:
csoler 2023-01-17 21:52:27 +01:00
parent 6a28727e76
commit b87e450207
1 changed files with 8 additions and 4 deletions

12
retroshare-gui/src/gui/advsearch/expressionwidget.cpp

@ -158,14 +158,18 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
case RsRegularExpression::InRange:
expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(lowVal), 86400+checkedConversion(highVal));
break;
case RsRegularExpression::Greater: // fallthrough
case RsRegularExpression::Greater:
expr = new RsRegularExpression::DateExpression(RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals,checkedConversion(86400+exprParamElem->getIntValue())));
break;
case RsRegularExpression::SmallerEquals:
expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(exprParamElem->getIntValue()+86400));
expr = new RsRegularExpression::DateExpression(RsRegularExpression::DateExpression(RsRegularExpression::Greater,checkedConversion(86400+exprParamElem->getIntValue())));
break;
default:
case RsRegularExpression::GreaterEquals: // fallthrough
case RsRegularExpression::GreaterEquals:
expr = new RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals, checkedConversion(exprParamElem->getIntValue()));
break;
case RsRegularExpression::Smaller:
expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(exprParamElem->getIntValue()));
expr = new RsRegularExpression::DateExpression(RsRegularExpression::Greater, checkedConversion(exprParamElem->getIntValue()-1));
break;
}
break;