diff --git a/meta/folder.groovy b/meta/folder.groovy index 71514fb..045c866 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -595,28 +595,23 @@ class MetaInfo extends GISJsonSerialised { private String format private String importpath private String offsetpath - private MetaInfo meta - - RelatedMetaInfo(script, importpath = "", offsetpath = "", MetaInfo meta = null) { + + RelatedMetaInfo(script, importpath = "", offsetpath = "") { super(script) this.format = '0.2' this.importpath = importpath this.offsetpath = offsetpath - this.meta = meta } void deserialiseJson(rawmeta) { //format = rawmeta['format'] offsetpath = rawmeta['offsetpath'] - //meta = new MetaInfo(script) - //meta.deserialiseJson(rawmeta['meta']) } LinkedHashMap serialisationdata() { def data = [ 'format' : format, 'offsetpath' : offsetpath, - //'meta' : meta.serialisationdata(), ] return data } @@ -788,7 +783,7 @@ class MetaInfo extends GISJsonSerialised { mi.addConfigurationInfo('', givenRepo, givenRevision, givenSHA) } - RelatedMetaInfo rmi = new RelatedMetaInfo(script, importedmetafile, adjustedpath, mi) + RelatedMetaInfo rmi = new RelatedMetaInfo(script, importedmetafile, adjustedpath) if (appendtoparentmeta) { associatedmeta.add(rmi) } @@ -958,17 +953,14 @@ class MetaInfo extends GISJsonSerialised { } def walkrelated(ArrayList metacollection, String comment = '', int level = 0, String gatheredpath = '') { - script.echo("walkrelated: metacollection: ${metacollection}\nComment: ${comment}\nLevel: ${level}\nGathered path: ${gatheredpath}") def results = [ 'metacollection' : metacollection, 'comment': comment ] results.metacollection.add(this) results.comment += "${level} ".padRight(level * 4) + globalreleasetag() + '\n' - script.echo("Partial results: ${results.comment}") for (relatedmetainfo in associatedmeta) { def childmetainfo = openchildmeta(gatheredpath, relatedmetainfo) - script.echo("Child meta results: ${childmetainfo}") if (childmetainfo.imported) { results = childmetainfo.childmeta.walkrelated(results.metacollection, results.comment, level + 1, childmetainfo.nextpath) }