Overhaul structs, refactor JSON parser and saver

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

1 files changed, 16 insertions, 4 deletions

diff --git a/examples/5-report/example_report.go b/examples/5-report/example_report.go
index bd7971f..1197547 100644
--- a/examples/5-report/example_report.go
+++ b/examples/5-report/example_report.go
@@ -54,14 +54,26 @@ func main() {
 		return
 	}
 
+	if len(pkgIDs) == 0 {
+		return
+	}
+
 	// it does, so we'll go through each one
-	for _, pkgID := range pkgIDs {
-		pkg, ok := doc.Packages[pkgID]
-		if !ok {
-			fmt.Printf("Package %s has described relationship but ID not found\n", string(pkgID))
+	for _, pkg := range doc.Packages {
+		var documentDescribesPackage bool
+		for _, describedPackageID := range pkgIDs {
+			if pkg.PackageSPDXIdentifier == describedPackageID {
+				documentDescribesPackage = true
+				break
+			}
+		}
+
+		if !documentDescribesPackage {
 			continue
 		}
 
+		pkgID := pkg.PackageSPDXIdentifier
+
 		// check whether the package had its files analyzed
 		if !pkg.FilesAnalyzed {
 			fmt.Printf("Package %s (%s) had FilesAnalyzed: false\n", string(pkgID), pkg.PackageName)