Skip to content

Bug/support nquads #148

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

Closed
wants to merge 8 commits into from
Closed

Bug/support nquads #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dcf2f12
Support standard application/n-quads in jsonld
ivikash Aug 3, 2016
9c9533c
Parameters in options fixed
ivikash Aug 3, 2016
c207508
README.md changes
ivikash Aug 3, 2016
cce2b89
application/nquads changed to application/n-quads
ivikash Aug 3, 2016
024a700
Removed comments
ivikash Aug 3, 2016
bce8be7
Comments for N-Quads fixed
ivikash Aug 3, 2016
c4e3db5
Changed nquads --> n-quads in inputFormat
ivikash Aug 3, 2016
d081290
Typo fixed for n-quads
ivikash Aug 3, 2016
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@ jsonld.normalize(doc, {
});

// serialize a document to N-Quads (RDF)
jsonld.toRDF(doc, {format: 'application/nquads'}, function(err, nquads) {
jsonld.toRDF(doc, {format: 'application/n-quads'}, function(err, nquads) {
// nquads is a string of nquads
});

// deserialize N-Quads (RDF) to JSON-LD
jsonld.fromRDF(nquads, {format: 'application/nquads'}, function(err, doc) {
jsonld.fromRDF(nquads, {format: 'application/n-quads'}, function(err, doc) {
// doc is JSON-LD
});

Expand Down
29 changes: 17 additions & 12 deletions js/jsonld.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,9 +756,9 @@ jsonld.objectify = function(input, ctx, options, callback) {
* [base] the base IRI to use.
* [expandContext] a context to expand with.
* [inputFormat] the format if input is not JSON-LD:
* 'application/nquads' for N-Quads.
* 'appilcation/n-quads' for N-Quads.
* [format] the format if output is a string:
* 'application/nquads' for N-Quads.
* 'appilcation/n-quads' for N-Quads.
* [documentLoader(url, callback(err, remoteDoc))] the document loader.
* @param callback(err, normalized) called once the operation completes.
*/
Expand Down Expand Up @@ -787,8 +787,13 @@ jsonld.normalize = function(input, options, callback) {
options.documentLoader = jsonld.loadDocument;
}

if('inputFormat' in options) {
if(options.inputFormat !== 'application/nquads') {
var opts = _clone(options);

if('inputFormat' in opts) {
if(opts.inputFormat.indexOf('application/nquads') === -1) {
opts.inputFormat = 'application/n-quads';
}
if(opts.inputFormat !== 'application/n-quads') {
return callback(new JsonLdError(
'Unknown normalization input format.',
'jsonld.NormalizeError'));
Expand All @@ -798,7 +803,6 @@ jsonld.normalize = function(input, options, callback) {
new Processor().normalize(parsedInput, options, callback);
} else {
// convert to RDF dataset then do normalization
var opts = _clone(options);
delete opts.format;
opts.produceGeneralizedRdf = false;
jsonld.toRDF(input, opts, function(err, dataset) {
Expand All @@ -820,7 +824,7 @@ jsonld.normalize = function(input, options, callback) {
* format option or an RDF dataset to convert.
* @param [options] the options to use:
* [format] the format if dataset param must first be parsed:
* 'application/nquads' for N-Quads (default).
* 'application/n-quads' for N-Quads (default).
* [rdfParser] a custom RDF-parser to use to parse the dataset.
* [useRdfType] true to use rdf:type, false to use @type
* (default: false).
Expand Down Expand Up @@ -851,9 +855,9 @@ jsonld.fromRDF = function(dataset, options, callback) {
}

if(!('format' in options) && _isString(dataset)) {
// set default format to nquads
// set default format to n-quads
if(!('format' in options)) {
options.format = 'application/nquads';
options.format = 'application/n-quads';
}
}

Expand Down Expand Up @@ -918,7 +922,7 @@ jsonld.fromRDF = function(dataset, options, callback) {
* [base] the base IRI to use.
* [expandContext] a context to expand with.
* [format] the format to use to output a string:
* 'application/nquads' for N-Quads.
* 'appilcation/nquads' for N-Quads.
* [produceGeneralizedRdf] true to output generalized RDF, false
* to produce only standard RDF (default: false).
* [documentLoader(url, callback(err, remoteDoc))] the document loader.
Expand Down Expand Up @@ -959,7 +963,7 @@ jsonld.toRDF = function(input, options, callback) {
// output RDF dataset
dataset = Processor.prototype.toRDF(expanded, options);
if(options.format) {
if(options.format === 'application/nquads') {
if(options.format === 'appilcation/nquads') {
return callback(null, _toNQuads(dataset));
}
throw new JsonLdError(
Expand Down Expand Up @@ -4005,7 +4009,7 @@ Normalize.prototype.main = function(dataset, callback) {

// handle invalid output format
if(self.options.format) {
if(self.options.format !== 'application/nquads') {
if(self.options.format !== 'appilcation/nquads') {
return callback(new JsonLdError(
'Unknown output format.',
'jsonld.UnknownFormat', {format: self.options.format}));
Expand Down Expand Up @@ -4217,7 +4221,7 @@ Normalize.prototype.main = function(dataset, callback) {
normalized.sort();

// 8) Return the normalized dataset.
if(self.options.format === 'application/nquads') {
if(self.options.format === 'appilcation/nquads') {
result = normalized.join('');
return callback();
}
Expand Down Expand Up @@ -7023,6 +7027,7 @@ function _parseNQuads(input) {

// register the N-Quads RDF parser
jsonld.registerRDFParser('application/nquads', _parseNQuads);
jsonld.registerRDFParser('application/n-quads', _parseNQuads);

/**
* Converts an RDF dataset to N-Quads.
Expand Down