Merge pull request #44 from seandenigris/enh-ma-add-field-no-default-set

[Enh]: Magritte Field Adding - Don't Set Default for Nils
svenvc · Oct 21, 2023 · 704e459 · 704e459
2 parents 0ba1afb + 63ee309
commit 704e459
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/repository/Neo-CSV-Magritte/MAElementDescription.extension.st b/repository/Neo-CSV-Magritte/MAElementDescription.extension.st
@@ -31,13 +31,3 @@ MAElementDescription >> defaultCsvReader [
 
 	^ [ :trimmed | self fromString: trimmed ].
 ]
-
-{ #category : #'*Neo-CSV-Magritte' }
-MAElementDescription >> fromCSV: aStringOrNil [
-	| value |
-	(aStringOrNil isNil or: [ aStringOrNil isEmpty ]) ifTrue: [ ^ nil ].
-	value := self csvReader cull: aStringOrNil trimmed cull: self.
-	(self default = value and: [ self shouldCacheDefault not ]) ifTrue: [ ^ nil ].
-	^ value
-	"Implementation note: this was extracted from NeoCSVReader's Magritte field adding because it is useful in other places e.g. MACSVImporter"
-]
diff --git a/repository/Neo-CSV-Magritte/NeoCSVReader.extension.st b/repository/Neo-CSV-Magritte/NeoCSVReader.extension.st
@@ -8,5 +8,5 @@ NeoCSVReader >> addFieldDescribedByMagritte: aDescription [
 		converter: [ :s | 
 			s trimmed
 				ifNotEmpty: aDescription csvReader
-				ifEmpty: [ aDescription default ] ] 
+				ifEmpty: [ aDescription undefinedValue ] ] 
 ]