From 9361094bf6f813f44ee8394ae18ee0c5e6126cce Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Fri, 20 Oct 2023 13:23:28 -0500 Subject: [PATCH] Finishing Grafoscopio notebooks importation with fix for original creation/modification nil data in nodes. --- src/MiniDocs/LeDatabase.extension.st | 2 +- src/MiniDocs/LeTextualSnippet.extension.st | 6 +++++- src/MiniDocs/OrderedDictionary.extension.st | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/MiniDocs/LeDatabase.extension.st b/src/MiniDocs/LeDatabase.extension.st index 585446b..2050b6d 100644 --- a/src/MiniDocs/LeDatabase.extension.st +++ b/src/MiniDocs/LeDatabase.extension.st @@ -195,7 +195,7 @@ LeDatabase >> sanitizeMarkdeepSnippets: divSnippets withMetadata: remoteMetadata snippetData := markdeepDiv asSnippetDictionary. creationTime := snippetData at: 'created'. modificationTime := snippetData at: 'modified'. - timestampWarning := [:timestamp | 'Modified timestamps: ', timestamp ,' date and time was replaced instead of nil value. See "origin" key for more traceability info.']. + timestampWarning := [:timestamp | 'Modified timestamps: ', timestamp ,' date and time was replaced instead of nil value. See "origin" metadata for more historical traceability information.']. (creationTime = 'nil' and: [ modificationTime ~= 'nil' ]) ifTrue: [ snippetData redefineTimestampsBefore: modificationTime. diff --git a/src/MiniDocs/LeTextualSnippet.extension.st b/src/MiniDocs/LeTextualSnippet.extension.st index 8f8e9c3..d668cc2 100644 --- a/src/MiniDocs/LeTextualSnippet.extension.st +++ b/src/MiniDocs/LeTextualSnippet.extension.st @@ -74,7 +74,11 @@ LeTextualSnippet >> metadataInit [ | surrogate | self parent ifNil: [ surrogate := nil] - ifNotNil: [ surrogate := self parent uidString ]. + ifNotNil: [ + self parent isString + ifTrue: [ surrogate := self parent] + ifFalse: [ surrogate := self parent uidString ] + ]. ^ OrderedDictionary new at: 'id' put: self uidString; at: 'parent' put: surrogate; diff --git a/src/MiniDocs/OrderedDictionary.extension.st b/src/MiniDocs/OrderedDictionary.extension.st index 4b089b1..5454996 100644 --- a/src/MiniDocs/OrderedDictionary.extension.st +++ b/src/MiniDocs/OrderedDictionary.extension.st @@ -25,8 +25,10 @@ OrderedDictionary >> asLepiterSnippet [ createTime: (LeTime new time: ((self at: 'created')asDateAndTime)); editTime: (LeTime new time: ((self at: 'modified') asDateAndTime)); editEmail: (self at: 'modifier'); - createEmail: (self at: 'creator'). - ^ response + createEmail: (self at: 'creator'). + response metadata at: 'origin' ifPresent: [ response metadata at: 'origin' put: (self at: 'origin') ]. + response metadata at: 'errata' ifPresent: [ response metadata at: 'errata' put: (self at: 'errata') ]. + ^ response ] { #category : #'*MiniDocs' }