diff options
Diffstat (limited to 'tvloader/parser2v1/parse_file.go')
| -rw-r--r-- | tvloader/parser2v1/parse_file.go | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/tvloader/parser2v1/parse_file.go b/tvloader/parser2v1/parse_file.go index 81768bb..8ecc280 100644 --- a/tvloader/parser2v1/parse_file.go +++ b/tvloader/parser2v1/parse_file.go @@ -5,7 +5,8 @@ package parser2v1 import ( "fmt" - "github.com/spdx/tools-golang/spdx" + "github.com/spdx/tools-golang/spdx/common" + "github.com/spdx/tools-golang/spdx/v2_1" ) func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error { @@ -22,7 +23,7 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_1 { return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } - parser.file = &spdx.File2_1{} + parser.file = &v2_1.File{} parser.file.FileName = value // tag for creating new package section and going back to parsing Package case "PackageName": @@ -50,12 +51,12 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error parser.file.FileSPDXIdentifier = eID if parser.pkg == nil { if parser.doc.Files == nil { - parser.doc.Files = []*spdx.File2_1{} + parser.doc.Files = []*v2_1.File{} } parser.doc.Files = append(parser.doc.Files, parser.file) } else { if parser.pkg.Files == nil { - parser.pkg.Files = []*spdx.File2_1{} + parser.pkg.Files = []*v2_1.File{} } parser.pkg.Files = append(parser.pkg.Files, parser.file) } @@ -67,12 +68,12 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error return err } if parser.file.Checksums == nil { - parser.file.Checksums = []spdx.Checksum{} + parser.file.Checksums = []common.Checksum{} } - switch spdx.ChecksumAlgorithm(subkey) { - case spdx.SHA1, spdx.SHA256, spdx.MD5: - algorithm := spdx.ChecksumAlgorithm(subkey) - parser.file.Checksums = append(parser.file.Checksums, spdx.Checksum{Algorithm: algorithm, Value: subvalue}) + switch common.ChecksumAlgorithm(subkey) { + case common.SHA1, common.SHA256, common.MD5: + algorithm := common.ChecksumAlgorithm(subkey) + parser.file.Checksums = append(parser.file.Checksums, common.Checksum{Algorithm: algorithm, Value: subvalue}) default: return fmt.Errorf("got unknown checksum type %s", subkey) } @@ -85,7 +86,7 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error case "FileCopyrightText": parser.file.FileCopyrightText = value case "ArtifactOfProjectName": - parser.fileAOP = &spdx.ArtifactOfProject2_1{} + parser.fileAOP = &v2_1.ArtifactOfProject{} parser.file.ArtifactOfProjects = append(parser.file.ArtifactOfProjects, parser.fileAOP) parser.fileAOP.Name = value case "ArtifactOfProjectHomePage": @@ -108,14 +109,14 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error parser.file.FileDependencies = append(parser.file.FileDependencies, value) // for relationship tags, pass along but don't change state case "Relationship": - parser.rln = &spdx.Relationship2_1{} + parser.rln = &v2_1.Relationship{} parser.doc.Relationships = append(parser.doc.Relationships, parser.rln) return parser.parsePairForRelationship2_1(tag, value) case "RelationshipComment": return parser.parsePairForRelationship2_1(tag, value) // for annotation tags, pass along but don't change state case "Annotator": - parser.ann = &spdx.Annotation2_1{} + parser.ann = &v2_1.Annotation{} parser.doc.Annotations = append(parser.doc.Annotations, parser.ann) return parser.parsePairForAnnotation2_1(tag, value) case "AnnotationDate": |