Skip to content

Add Example for rdfSaver #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2019
Merged

Add Example for rdfSaver #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0b2e1
Merge branch 'rdfreader' into exampleSaver
abhishekspeer Aug 24, 2019
bda6f2e
Merge branch 'rdfreader' into exampleSaver
abhishekspeer Aug 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/8-load-save-Rdf/example_load-saveRDF.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ func main() {
}

}

func Parse2_1(input string) (*rdf2v1.Document, *rdf2v1.Snippet, error) {
parser := rdf2v1.NewParser(input)
defer fmt.Printf("RDF Document parsed successfully.\n")
Expand Down
3 changes: 2 additions & 1 deletion v0/rdfloader/rdf2v1/transferToIntermediate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ func collectCreationInfo(doc2v1 *spdx.Document2_1) *CreationInfo {
}

func collectExternalDocumentRef(doc2v1 *spdx.Document2_1) *ExternalDocumentRef {
if doc2v1.CreationInfo.ExternalDocumentReferences != nil {

if doc2v1.CreationInfo.ExternalDocumentReferences != nil {
stdEdr := ExternalDocumentRef{

ExternalDocumentId: Str(doc2v1.CreationInfo.ExternalDocumentReferences[0]),
Expand Down
2 changes: 2 additions & 0 deletions v0/rdfsaver/rdfsaver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ func Saver2_1(doc2v1 *spdx.Document2_1) error {
newdoc2v1 := rdf2v1.CollectDocument(doc2v1)
newsn2v1 := rdf2v1.CollectSnippets(doc2v1)
output := os.Stdout

errdoc := rdfsaver2v1.Write(output, newdoc2v1, newsn2v1)

if errdoc != nil {
fmt.Errorf("Parsing Error")
}
Expand Down
1 change: 1 addition & 0 deletions v0/rdfsaver/rdfsaver2v1/save_annotation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ func (f *Formatter) Annotation(an *rdf2v1.Annotation) (id goraptor.Term, err err
if err = f.setNodeType(id, rdf2v1.TypeAnnotation); err != nil {
return
}

err = f.addPairs(id,
Pair{"annotationDate", an.AnnotationDate.Val},
Pair{"rdfs:comment", an.AnnotationComment.Val},
Expand Down
1 change: 1 addition & 0 deletions v0/rdfsaver/rdfsaver2v1/save_document.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ func (f *Formatter) Document(doc *rdf2v1.Document) (docId goraptor.Term, err err
}
func (f *Formatter) ExternalDocumentRef(edr *rdf2v1.ExternalDocumentRef) (id goraptor.Term, err error) {
id = f.NodeId("edr")

if edr != nil {

if err = f.setNodeType(id, rdf2v1.TypeExternalDocumentRef); err != nil {
Expand Down
4 changes: 3 additions & 1 deletion v0/rdfsaver/rdfsaver2v1/save_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ func (f *Formatter) File(file *rdf2v1.File) (id goraptor.Term, err error) {

}
}

for _, dep := range file.FileDependency {
if file.FileDependency != nil {
fdId, err := f.File(file.FileDependency)
Expand All @@ -113,7 +114,8 @@ func (f *Formatter) File(file *rdf2v1.File) (id goraptor.Term, err error) {
}
}
}
if file.FileRelationship != nil {

if file.FileRelationship != nil {
frId, err := f.Relationship(file.FileRelationship)
if err != nil {
return id, err
Expand Down