Overhaul structs, refactor JSON parser and saver

Signed-off-by: Ian Ling <ian@iancaling.com>

1 files changed, 35 insertions, 5 deletions

diff --git a/tvloader/parser2v2/parser.go b/tvloader/parser2v2/parser.go
index 9886874..1d9f8e9 100644
--- a/tvloader/parser2v2/parser.go
+++ b/tvloader/parser2v2/parser.go
@@ -58,12 +58,42 @@ func (parser *tvParser2_2) parsePairFromStart2_2(tag string, value string) error
 
 	// create an SPDX Document data struct if we don't have one already
 	if parser.doc == nil {
-		parser.doc = &spdx.Document2_2{}
+		parser.doc = &spdx.Document2_2{ExternalDocumentReferences: []spdx.ExternalDocumentRef2_2{}}
 	}
 
-	// move to Creation Info parser state
-	parser.st = psCreationInfo2_2
+	switch tag {
+	case "DocumentComment":
+		parser.doc.DocumentComment = value
+	case "SPDXVersion":
+		parser.doc.SPDXVersion = value
+	case "DataLicense":
+		parser.doc.DataLicense = value
+	case "SPDXID":
+		eID, err := extractElementID(value)
+		if err != nil {
+			return err
+		}
+		parser.doc.SPDXIdentifier = eID
+	case "DocumentName":
+		parser.doc.DocumentName = value
+	case "DocumentNamespace":
+		parser.doc.DocumentNamespace = value
+	case "ExternalDocumentRef":
+		documentRefID, uri, alg, checksum, err := extractExternalDocumentReference(value)
+		if err != nil {
+			return err
+		}
+		edr := spdx.ExternalDocumentRef2_2{
+			DocumentRefID: documentRefID,
+			URI:           uri,
+			Checksum:      spdx.Checksum{Algorithm: spdx.ChecksumAlgorithm(alg), Value: checksum},
+		}
+		parser.doc.ExternalDocumentReferences = append(parser.doc.ExternalDocumentReferences, edr)
+	default:
+		// move to Creation Info parser state
+		parser.st = psCreationInfo2_2
+		return parser.parsePairFromCreationInfo2_2(tag, value)
+	}
 
-	// and ask Creation Info subfunc to parse
-	return parser.parsePairFromCreationInfo2_2(tag, value)
+	return nil
 }