Skip to content

Commit 1379c82

Browse files
committed
Change rdfloader to return main data structure
Signed-off-by: abhishekspeer <[email protected]>
1 parent 953c855 commit 1379c82

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

v0/rdfloader/rdfloader.go

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,23 @@ package rdfloader
22

33
import (
44
"fmt"
5-
"os"
5+
6+
"github.com/spdx/tools-golang/v0/spdx"
67

78
"github.com/spdx/tools-golang/v0/rdfloader/rdf2v1"
89
)
910

10-
func Reader2_1() (rdf2v1.Document, rdf2v1.Snippet, error) {
11-
12-
args := os.Args
13-
if len(args) != 2 {
14-
fmt.Errorf("Usage: %v <spdx-file-in>\n", args[0])
15-
fmt.Errorf(" Load SPDX 2.1 RDF file <spdx-file-in>, and\n")
16-
fmt.Errorf(" print its contents.\n")
17-
18-
}
19-
var spdxdoc *rdf2v1.Document
20-
var sp *rdf2v1.Snippet
21-
var err error
22-
23-
input := args[1]
24-
spdxdoc, sp, err = Parse(input)
11+
func Reader2_1(input string) *spdx.Document2_1 {
2512

26-
_, _ = spdxdoc, sp
27-
// var doc2v1 *spdx.Document2_1
28-
// doc2v1 = TransferDocument(spdxdoc, sp)
13+
spdxdoc, sp, err := Parse(input)
2914
if err != nil {
3015
fmt.Errorf("Parsing Error")
3116
}
32-
return *spdxdoc, *sp, err
17+
doc2v1 := rdf2v1.TransferDocument(spdxdoc, sp)
18+
if doc2v1 == nil {
19+
fmt.Errorf("Translation Error")
20+
}
21+
return doc2v1
3322
}
3423

3524
func Parse(input string) (*rdf2v1.Document, *rdf2v1.Snippet, error) {

0 commit comments

Comments
 (0)