Skip to content

Fixed issue automatic adding space in string value. #68

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

Merged
merged 1 commit into from
Jun 12, 2023
Merged

Fixed issue automatic adding space in string value. #68

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
21 changes: 12 additions & 9 deletions JsonPreprocessor/CJsonPreprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,15 +684,18 @@ def __handleStrNoneTrueFalse(objJson):
i=0
for item in items:
i+=1
subItems = re.split("\s*,\s*", item)
newSubItem = ""
j=0
for subItem in subItems:
j+=1
if j<len(subItems):
newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem) + ", "
else:
newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem)
if re.search("\s*\[[^\[\]]*\]\s*,*\s*", item):
Copy link
Owner

@test-fullautomation test-fullautomation Jun 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Son,
can you explain me the code a little.
I would expect that inside a string (means between double quotes) data must be only processed if a ${ sequence exists. Otherwise it mustn't be touched.
Thank you,
Thomas

Copy link
Collaborator Author

@namsonx namsonx Jun 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello Thomas,

This code I handle for the situation that a value (right hand side of ":" in Json config file) is a list and this list contains nested parameters. For example, "key" : [1, "two", ${nested}['abc']['def'], 3, "four"] then the value of nested param will be replaced in this list.

I think I forgot the case that a list value could be separated into multiple lines.

I will update my change tomorrow.

Thank you,
Son

subItems = re.split("\s*,\s*", item)
j=0
for subItem in subItems:
j+=1
if j<len(subItems):
newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem) + ","
else:
newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem)
else:
newSubItem = item
if i<len(items):
newLine = newLine + newSubItem + " : "
else:
Expand Down Expand Up @@ -720,7 +723,7 @@ def __handleStrNoneTrueFalse(objJson):

try:
oJson = json.loads(sJsonDataUpdated,
cls=CJSONDecoder ,
cls=CJSONDecoder,
object_pairs_hook=self.__processImportFiles)
except Exception as error:
raise Exception(f"json file '{jFile}': '{error}'")
Expand Down