Set File To parser.files Immediately After Parsing

Signed-off-by: Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com>

3 files changed, 3 insertions, 10 deletions

diff --git a/rdfloader/parser2v2/parse_file.go b/rdfloader/parser2v2/parse_file.go
index 6a37ccc..9fbf3b4 100644
--- a/rdfloader/parser2v2/parse_file.go
+++ b/rdfloader/parser2v2/parse_file.go
@@ -81,7 +81,6 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s
 				return nil, fmt.Errorf("error setting a file dependency in a file: %v", err)
 			}
 			file.FileDependencies = append(file.FileDependencies, string(newFile.FileSPDXIdentifier))
-			parser.files[file.FileSPDXIdentifier] = file
 		case SPDX_ATTRIBUTION_TEXT:
 			// cardinality: min 0
 			file.FileAttributionTexts = append(file.FileAttributionTexts, subTriple.Object.ID)
@@ -98,6 +97,7 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s
 			return nil, err
 		}
 	}
+	parser.files[file.FileSPDXIdentifier] = file
 	return file, nil
 }
 
diff --git a/rdfloader/parser2v2/parse_relationship.go b/rdfloader/parser2v2/parse_relationship.go
index a978500..3ef9c61 100644
--- a/rdfloader/parser2v2/parse_relationship.go
+++ b/rdfloader/parser2v2/parse_relationship.go
@@ -78,7 +78,6 @@ func (parser *rdfParser2_2) parseRelatedElementFromTriple(reln *spdx.Relationshi
 			DocumentRefID: "",
 			ElementRefID:  file.FileSPDXIdentifier,
 		}
-		parser.files[file.FileSPDXIdentifier] = file
 
 	case SPDX_PACKAGE:
 		pkg, err := parser.getPackageFromNode(triple.Subject)
diff --git a/rdfloader/parser2v2/parse_snippet_info.go b/rdfloader/parser2v2/parse_snippet_info.go
index d56cd7b..d9c8279 100644
--- a/rdfloader/parser2v2/parse_snippet_info.go
+++ b/rdfloader/parser2v2/parse_snippet_info.go
@@ -27,12 +27,11 @@ func (parser *rdfParser2_2) getSnippetInformationFromNode2_2(node *gordfParser.N
 		case SPDX_SNIPPET_FROM_FILE:
 			// cardinality: exactly 1
 			// file which is associated with the snippet
-			file, err := parser.getFileFromNode(siTriple.Object)
+			_, err := parser.getFileFromNode(siTriple.Object)
 			if err != nil {
 				return nil, err
 			}
 			si.SnippetFromFileSPDXIdentifier, err = ExtractDocElementID(getLastPartOfURI(siTriple.Object.ID))
-			parser.files[file.FileSPDXIdentifier] = file
 		case SPDX_RANGE:
 			// cardinality: min 1
 			err = parser.setSnippetRangeFromNode(siTriple.Object, si)
@@ -175,15 +174,10 @@ func (parser *rdfParser2_2) parseRangeReference(node *gordfParser.Node, snippet
 	if len(associatedTriples) == 0 {
 		return nil
 	}
-	file, err := parser.getFileFromNode(node)
+	_, err := parser.getFileFromNode(node)
 	if err != nil {
 		return fmt.Errorf("error parsing a new file in a reference: %v", err)
 	}
-
-	// setting the file to the parser. We cannot say if it is unpackaged
-	// because it is quite possible that the range references a file which
-	// belongs to another package.
-	parser.files[file.FileSPDXIdentifier] = file
 	return nil
 }