|
23 | 23 | fromapp.translator.constimportDEFAULT_VALUE_TYPE |
24 | 24 | fromapp.translator.core.custom_types.meta_infoimportSeverityType |
25 | 25 | fromapp.translator.core.custom_types.tokensimportOperatorType |
| 26 | +fromapp.translator.core.custom_types.valuesimportValueType |
26 | 27 | fromapp.translator.core.mappingimportDEFAULT_MAPPING_NAME,SourceMapping |
27 | 28 | fromapp.translator.core.models.query_tokens.field_valueimportFieldValue |
28 | 29 | fromapp.translator.core.models.query_tokens.keywordimportKeyword |
@@ -211,18 +212,26 @@ def generate_field(self, data: FieldValue, source_mapping: SourceMapping): |
211 | 212 | ): |
212 | 213 | field_name=f"{field_name}|{data.operator.token_type}" |
213 | 214 |
|
214 | | -values=self.__pre_process_values(data.values) |
| 215 | +value_type_map= { |
| 216 | +OperatorType.REGEX:ValueType.regex_value |
| 217 | + } |
| 218 | +value_type=value_type_map.get(data.operator.token_type,ValueType.value) |
| 219 | +values=self.__pre_process_values(data.values,value_type) |
215 | 220 | iflen(values)==1: |
216 | 221 | return {field_name:values[0]} |
217 | 222 | eliflen(values)==0: |
218 | 223 | return {field_name:""} |
219 | 224 | return {field_name:values} |
220 | 225 |
|
221 | | -def__pre_process_values(self,values:DEFAULT_VALUE_TYPE)->list[Union[int,str]]: |
| 226 | +def__pre_process_values( |
| 227 | +self, |
| 228 | +values:DEFAULT_VALUE_TYPE, |
| 229 | +value_type:str=ValueType.value |
| 230 | + )->list[Union[int,str]]: |
222 | 231 | processed= [] |
223 | 232 | forvinvalues: |
224 | 233 | ifisinstance(v,StrValue): |
225 | | -processed.append(self.str_value_manager.from_container_to_str(v)) |
| 234 | +processed.append(self.str_value_manager.from_container_to_str(v,value_type=value_type)) |
226 | 235 | elifisinstance(v,str): |
227 | 236 | processed.append(v) |
228 | 237 | else: |
|