Skip to content
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

Expose RDFLoader class to global context + Pass file format information from Loader to Parser + fix typo #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose RDFLoader class to global context + Pass file format information from Loader to Parser + fix typo #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/query_engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var QuadIndex = require("./quad_index");
var QueryPlan = require("./query_plan").QueryPlan;
var QueryFilters = require("./query_filters").QueryFilters;
var RDFModel = require("./rdf_model");
var RDFLoader = require("./rdf_loader").RDFLoader;
var RDFLoader = require("./rdf_loader");
var Callbacks = require("./graph_callbacks").CallbacksBackend;
var async = require('./utils');
var _ = require('./utils');
Expand Down Expand Up @@ -1382,7 +1382,7 @@ QueryEngine.prototype.executeUpdate = function(syntaxTree, callback) {
} else {
that.batchLoad(result,function(result){
if(result !== null) {
callback(null, rsult);
callback(null, result);
} else {
callback(new Error("Error batch loading quads"));
}
Expand Down
14 changes: 6 additions & 8 deletions src/rdf_loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var RVN3Parser = require("./rvn3_parser").RVN3Parser;
var JSONLDParser = require("./jsonld_parser").JSONLDParser;
var Utils = require("./utils");

var RDFLoader = function (params) {
RDFLoader = function (params) {

this.precedences = ["text/turtle", "text/n3", "application/ld+json", "application/json"];
this.parsers = {"text/turtle":RVN3Parser.parser, "text/n3":RVN3Parser.parser, "application/ld+json":JSONLDParser.parser, "application/json":JSONLDParser.parser};
Expand Down Expand Up @@ -75,18 +75,18 @@ RDFLoader.prototype.load = function(uri, graph, callback) {
var mimeParts = m.split("/");
if(mimeParts[1] === '*') {
if(mime.indexOf(mimeParts[0])!=-1) {
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri}, callback);
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri, format: mimeParts[0]}, callback);
}
} else {
if(mime.indexOf(m)!=-1) {
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri}, callback);
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri, format: m}, callback);
} else if(mime.indexOf(mimeParts[1])!=-1) {
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri}, callback);
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri, format: mimeParts[1]}, callback);
}
}
} else {
if(mime.indexOf(m)!=-1) {
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri}, callback);
return that.tryToParse(that.parsers[m], graph, data, {documentURI: uri, format: m}, callback);
}
}
}
Expand Down Expand Up @@ -133,9 +133,7 @@ RDFLoader.prototype.tryToParse = function(parser, graph, input, options, callbac
}
};

module.exports = {
RDFLoader: RDFLoader
};
module.exports = RDFLoader;


// var loader = require("./js-communication/src/rdf_loader").RDFLoader; loader = new loader.RDFLoader(); loader.load('http://dbpedialite.org/titles/Lisp_%28programming_language%29', function(success, results){console.log("hey"); console.log(success); console.log(results)})