From 6bf8b5886c912526f7db8f09e13183cd4094afe9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 14 Dec 2021 09:43:38 +0000 Subject: [PATCH] Walk a tree of imported meta --- meta/folder.groovy | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 7a6ba4e..71514fb 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -934,17 +934,14 @@ class MetaInfo extends GISJsonSerialised { def MetaInfo mi = new MetaInfo(script) def String nextpath - def importedmetafile if (gatheredpath == '') { - nextpath = relatedmetainfo.offsetpath - importedmetafile = nextpath + '/' + metafilepath() + nextpath = "${relatedmetainfo.offsetpath}/${METAFOLDERNAME}" } else { - nextpath = gatheredpath + '/' + relatedmetainfo.offsetpath - importedmetafile = nextpath + '/' + METAFILENAME + nextpath = "${gatheredpath}/${relatedmetainfo.offsetpath}" } + def importedmetafile = "${nextpath}/${METAFILENAME}" def boolean imported if (script.fileExists(importedmetafile)) { - script.echo("Deserialising meta at file: ${importedmetafile}") mi.deserialiseJson(importedmetafile) imported = true } else {