diff --git a/meta/folder.groovy b/meta/folder.groovy index 4efb0d2..fe8b565 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -593,12 +593,14 @@ class MetaInfo extends GISJsonSerialised { class RelatedMetaInfo extends GISJsonSerialised { private String format + private String fullpath private String offsetpath private MetaInfo meta - RelatedMetaInfo(script, offsetpath = "", MetaInfo meta = null) { + RelatedMetaInfo(script, fullpath = "", offsetpath = "", MetaInfo meta = null) { super(script) - this.format = '0.1' + this.format = '0.2' + this.fullpath = fullpath this.offsetpath = offsetpath this.meta = meta } @@ -614,7 +616,7 @@ class MetaInfo extends GISJsonSerialised { def data = [ 'format' : format, 'offsetpath' : offsetpath, - 'meta' : meta.serialisationdata(), + //'meta' : meta.serialisationdata(), ] return data } @@ -779,13 +781,14 @@ class MetaInfo extends GISJsonSerialised { def String adjustedpath = relativize(destpath) def importedmetafile = adjustedpath + "/" + metafilepath() if (script.fileExists(importedmetafile)) { + script.echo("Deserialising meta at file: ${importedmetafile} (destpath: ${destpath})") mi.deserialiseJson(importedmetafile) } else { script.echo("Could not deserialise meta at file: ${importedmetafile} (destpath: ${destpath})- Does not exist") mi.addConfigurationInfo('', givenRepo, givenRevision, givenSHA) } - RelatedMetaInfo rmi = new RelatedMetaInfo(script, adjustedpath, mi) + RelatedMetaInfo rmi = new RelatedMetaInfo(script, adjustedpath, adjustedpath, mi) if (appendtoparentmeta) { associatedmeta.add(rmi) }