Skip to content

Commit 28851af

Browse files
authored
Merge pull request #39 from UncoderIO/logscale_escape_fix
Logscale escaping fix
2 parents 7ace6a1 + b09d02b commit 28851af

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

translator/app/translator/platforms/logscale/escape_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class LogscaleEscapeManager(EscapeManager):
77
escape_map = {
8-
ValueType.value: EscapeDetails(pattern='(/|\+|\\\\|{|\[|\*|"|\(|\)(?![*?\\\\]))')
8+
ValueType.value: EscapeDetails(pattern='(\\\\|/|\+|{|\[|\*|"|\(|\))')
99
}
1010

1111

translator/app/translator/platforms/logscale/renders/logscale.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
from typing import Union
2020

2121
from app.translator.const import DEFAULT_VALUE_TYPE
22+
from app.translator.core.mapping import SourceMapping
23+
from app.translator.core.models.parser_output import MetaInfoContainer
24+
from app.translator.core.models.platform_details import PlatformDetails
25+
from app.translator.core.render import BaseQueryFieldValue, BaseQueryRender
2226
from app.translator.platforms.logscale.const import logscale_query_details
2327
from app.translator.platforms.logscale.escape_manager import logscale_escape_manager
2428
from app.translator.platforms.logscale.functions import LogScaleFunctions, log_scale_functions
2529
from app.translator.platforms.logscale.mapping import LogScaleMappings, logscale_mappings
26-
from app.translator.core.mapping import SourceMapping
27-
from app.translator.core.models.platform_details import PlatformDetails
28-
from app.translator.core.models.parser_output import MetaInfoContainer
29-
from app.translator.core.render import BaseQueryRender, BaseQueryFieldValue
3030

3131

3232
class LogScaleFieldValue(BaseQueryFieldValue):
@@ -41,6 +41,8 @@ def apply_field_name(self, field_name: str) -> str:
4141
def equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
4242
if isinstance(value, list):
4343
return f"({self.or_token.join(self.equal_modifier(field=field, value=v) for v in value)})"
44+
if value == "":
45+
return f'{self.apply_field_name(field_name=field)}=""'
4446
return f'{self.apply_field_name(field_name=field)}=/{self.apply_value(value)}/i'
4547

4648
def less_modifier(self, field: str, value: Union[int, str]) -> str:

0 commit comments

Comments
 (0)