From 813958f0aafbc4fea39756327ed47491834f401a Mon Sep 17 00:00:00 2001 From: anikaweinmann Date: Thu, 4 Jan 2024 11:47:44 +0100 Subject: [PATCH] adjust re pasing --- .../r.extract.buildings/r.extract.buildings.py | 1 - .../v.cd.areas/v.cd.areas.py | 7 ++++++- .../m.analyse.trees/v.trees.cd/v.trees.cd.py | 17 ++++++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/grass-gis-addons/m.analyse.buildings/r.extract.buildings/r.extract.buildings.py b/grass-gis-addons/m.analyse.buildings/r.extract.buildings/r.extract.buildings.py index b2032c4..7662133 100644 --- a/grass-gis-addons/m.analyse.buildings/r.extract.buildings/r.extract.buildings.py +++ b/grass-gis-addons/m.analyse.buildings/r.extract.buildings/r.extract.buildings.py @@ -340,7 +340,6 @@ def main(): except Exception: # for execution in GUI tile_output = re.search(r"Output is: <(.*?)>", msg).groups()[0] - output_list.append(tile_output) # verify that switching back to original mapset worked diff --git a/grass-gis-addons/m.analyse.buildings/v.cd.areas/v.cd.areas.py b/grass-gis-addons/m.analyse.buildings/v.cd.areas/v.cd.areas.py index d1a6fb7..5e4d9d6 100644 --- a/grass-gis-addons/m.analyse.buildings/v.cd.areas/v.cd.areas.py +++ b/grass-gis-addons/m.analyse.buildings/v.cd.areas/v.cd.areas.py @@ -325,7 +325,12 @@ def main(): grass.message(_(msg_part)) # create mapset dict based on Log, so that only those with output are listed if "Skipping..." not in msg: - tile_output = re.search(r"Output is:\n<(.*?)>", msg).groups()[0] + try: + # for execution in terminal + tile_output = re.search(r"Output is:\n<(.*?)>", msg).groups()[0] + except Exception: + # for execution in GUI + tile_output = re.search(r"Output is: <(.*?)>", msg).groups()[0] output_list.append(tile_output) if flags["q"]: area_identified = re.search( diff --git a/grass-gis-addons/m.analyse.trees/v.trees.cd/v.trees.cd.py b/grass-gis-addons/m.analyse.trees/v.trees.cd/v.trees.cd.py index 0ff4748..f6c4961 100644 --- a/grass-gis-addons/m.analyse.trees/v.trees.cd/v.trees.cd.py +++ b/grass-gis-addons/m.analyse.trees/v.trees.cd/v.trees.cd.py @@ -352,9 +352,20 @@ def main(): grass.message(_(msg_part)) # create mapset dict based on Log if "Skipping..." not in msg: - tile_output = ( - re.search(r"Output is:\n<(.*?)>", msg).groups()[0].split(",") - ) + try: + # for execution in terminal + tile_output = ( + re.search(r"Output is:\n<(.*?)>", msg) + .groups()[0] + .split(",") + ) + except Exception: + # for execution in GUI + tile_output = ( + re.search(r"Output is: <(.*?)>", msg) + .groups()[0] + .split(",") + ) for ind, el in enumerate(output_suffix): if tile_output[ind]: output_dict[el].append(tile_output[ind])