Patch 4

Aptfile

@@ -0,0 +1 @@
+swi-prolog

Procfile

@@ -0,0 +1 @@
+web: node app.js

app.js

@@ -6,8 +6,11 @@ const path = require('path')
 const { config } = require('./config.js')
 const tmp = require('./lib/tmp.js')
 const eye = require('./lib/eye/eye.js')
-const cwm = require('./lib/cwm/cwm.js')
+// const cwm = require('./lib/cwm/cwm.js')
 const jen3 = require('./lib/jen3/jen3.js')
+const jena = require('./lib/jena/jena.js')
+const triplify = require('./lib/triplify/triplify.js')
+const spin3 = require('./lib/spin3/spin3.js')
 const { generateLink, resolveLink } = require('./lib/gen_link.js')
 const { checkBuiltinInput } = require('./lib/check_builtin_input.js')
 
@@ -17,7 +20,15 @@ app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: true }))
 
 app.use('/n3/editor/s/*', (req, res) => {
-	res.sendFile(path.join(__dirname, "editor/index.html")); 
+	res.sendFile(path.join(__dirname, "editor/index.html"));
+});
+app.use('/n3/out', express.static("out"));
+app.use('/n3/editor/out', express.static("out"));
+app.use('/n3/spin3*', (req, res) => {
+	res.sendFile(path.join(__dirname, "editor/spin3.html"));
+});
+app.use('/n3/sparql*', (req, res) => {
+	res.sendFile(path.join(__dirname, "editor/sparql.html"));
 });
 app.use('/n3/editor', express.static(path.join(__dirname, "editor")));
 app.use('/n3/lib/eyebrow', express.static(path.join(__dirname, "lib/eyebrow")));
@@ -46,8 +57,9 @@ app.post('/n3', (request, response) => {
 	const data = request.body
 	// console.log("data:", data);
 	console.log(
-		"task:", data.task, 
-		(data.system? ", system: " + data.system : "")
+		"task:", data.task,
+		(data.subTask ? ", subTask: " + data.subTask : ""),
+		(data.system ? ", system: " + data.system : "")
 	);
 
 	function ctu(ret) {
@@ -73,18 +85,30 @@ app.post('/n3', (request, response) => {
 			doImperating(data, ctu)
 			break
 
-		case 'generate_link':
-			doGenerateLink(data, ctu)
+		case 'triplify':
+			doTriplify(data, ctu)
 			break
 
-		case 'resolve_link':
-			doResolveLink(data, ctu)
+		case 'query':
+			doQuery(data, ctu)
 			break
 
+		case 'spin3':
+			doSpin3(data, ctu);
+			break
+
 		case 'check_builtin_input':
 			doCheckBuiltinInput(data, ctu)
 			break
 
+		case 'generate_link':
+			doGenerateLink(data, ctu)
+			break
+
+		case 'resolve_link':
+			doResolveLink(data, ctu)
+			break
+
 		default:
 			ctu({ error: 'unknown task: ' + data.task })
 	}
@@ -93,15 +117,12 @@ app.post('/n3', (request, response) => {
 app.listen(config.http.port)
 console.log(`Listening at ${config.http.hostname}:${config.http.port}`)
 
-function doReasoning(options, ctu) {
-	tmp.save(options.formula, (file) => {
+async function doReasoning(options, ctu) {
+	let file;
+	try {
+		file = await tmp.save(options.formula)
 
-		function end(ret) {
-			tmp.del(file)
-			ctu(ret)
-		}
-
-		var reasoner = null;
+		let reasoner = null;
 		switch (options.system) {
 			case "eye":
 				reasoner = eye
@@ -116,46 +137,130 @@ function doReasoning(options, ctu) {
 				break
 
 			default:
-				end({ error: `unsupported system: "${options.system}"` })
-				break
+				throw `unsupported system: "${options.system}"`
 		}
-		if (reasoner)
-			reasoner.exec(options, file, end)
-	})
+
+		const output = await reasoner.exec(options, file)
+		ctu({ success: output })
+
+	} catch (e) {
+		console.log(e)
+		ctu({ error: e + "" })
+
+	} finally {
+		await tmp.del(file)
+	}
 }
 
-function doExplaining(options, ctu) {
-	tmp.save(options.formula, (file) => {
+async function doExplaining(options, ctu) {
+	let file
+	try {
+		file = await tmp.save(options.formula)
 
-		var reasoner = null;
+		let reasoner = null;
 		switch (options.system) {
 			case "eye":
 				reasoner = eye
 				break
 
 			default:
-				end({ error: `unsupported system: "${options.system}"` })
-				break
+				throw `unsupported system: "${options.system}"`
 		}
 
-		reasoner.exec(options, file, (explanation) => {
-			tmp.del(file)
+		const explanation = await reasoner.exec(options, file)
+		ctu({ success: explanation })
 
-			ctu(explanation)
-		})
-	})
+	} catch(e) {
+		console.log(e)
+		ctu({ error: e })
+
+	} finally {
+		await tmp.del(file)
+	}
 }
 
-function doImperating(options, ctu) {
-	tmp.save(options.formula, (file) => {
+async function doImperating(options, ctu) {
+	let file
+	try {
+		file = await tmp.save(options.formula)
+
+		const reasoner = jen3;
+		const code = await reasoner.exec(options, file)
+		ctu({ success: code })
+
+	} catch (e) {
+		console.log(e)
+		ctu({ error: e + "" })
+
+	} finally {
+		await tmp.del(file)
+	}
+}
 
-		var reasoner = jen3;
-		reasoner.exec(options, file, (code) => {
-			tmp.del(file)
+async function doTriplify(options, ctu) {
+	let file
+	try {
+		file = tmp.save(options.formula)
 
-			ctu(code)
-		})
-	})
+		const code = await triplify.exec(options, file)
+		ctu({ success: code })
+
+	} catch (e) {
+		console.log(e)
+		ctu({ error: e + "" })
+
+	} finally {
+		await tmp.del(file)
+	}
+}
+
+async function doQuery(options, ctu) {
+	let data, query
+	try {
+		data = await tmp.save(options.data)
+		query = await tmp.save(options.query)
+
+		let engine = null;
+		switch (options.system) {
+
+			case "jena":
+				engine = jena
+				break
+
+			default:
+				throw `unsupported system: "${options.system}"`
+		}
+
+		const output = await engine.exec(options, data, query)
+		ctu({ success: output })
+
+	} catch (e) {
+		console.log(e)
+		ctu({ error: e + "" })
+
+	} finally {
+		await tmp.del(data)
+		await tmp.del(query)
+	}
+}
+
+async function doSpin3(options, ctu) {
+	let data, query
+	try {
+		data = await tmp.save(options.data)
+		query = await tmp.save(options.query)
+
+		const output = await spin3.exec(options, data, query);
+		ctu({ success: output })
+
+	} catch (e) {
+		console.log(e)
+		ctu({ error: e + "" })
+
+	} finally {
+		await tmp.del(data)
+		await tmp.del(query)
+	}
 }
 
 function doGenerateLink(options, ctu) {
@@ -166,24 +271,28 @@ function doGenerateLink(options, ctu) {
 
 function doResolveLink(options, ctu) {
 	resolveLink(options.id)
-		.then((data) => { 
+		.then((data) => {
 			// console.log("resolved link:", data);
 			ctu({ success: data })
 		})
 		.catch((error) => { ctu({ error: error }) })
 }
 
-function doCheckBuiltinInput(options, ctu) {
-	tmp.save(options.definitions, (defFile) => {
-		tmp.save(options.test, (testFile) => {
+async function doCheckBuiltinInput(options, ctu) {
+	let defFile, testFile
+	try {
+		defFile = await tmp.save(options.definitions)
+		testFile = await tmp.save(options.test)
 
-			function end(ret) {
-				tmp.del(defFile)
-				tmp.del(testFile)
-				ctu(ret)
-			}
+		const output = await checkBuiltinInput(defFile, testFile)
+		ctu({ success: output })
 
-			checkBuiltinInput(defFile, testFile, end)
-		})
-	})
+	} catch (e) {
+		console.log(e)
+		ctu({ error: e + "" })
+
+	} finally {
+		await tmp.del(defFile)
+		await tmp.del(testFile)
+	}
 }

config.js

@@ -1,38 +1,50 @@
 config = {
 	http: {
-		hostname: 'http://127.0.0.1',
-		port: 3002
+		hostname: 'https://n3-editor.herokuapp.com',
+	    port: ((typeof process) != "undefined" ? process.env.PORT : undefined)
 	},
 
-	reasoners: {
+	out: "/app/out",
+
+	tools: {
 		eye: {
-			exec: "/Users/wvw/git/n3/n3-editor-js/opt/eye/bin/eye",
-			folder: "/Users/wvw/git/n3/n3-editor-js/lib/eye"
+			exec: "eye", 
+		    folder: "/app/lib/eye"
 		},
 		cwm: {
 			// (use python2 for cwm)
-			pythonCmd: "python",
-			exec: "/Users/wvw/cwm-1.2.1/swap/cwm.py"
+			pythonCmd: "", // (python2 is not available)
+            exec: ""
 		},
 		jen3: {
-			exec: "/Users/wvw/git/n3/n3-editor-js/lib/jen3/jen3.jar",
-			codegen: "/Users/wvw/git/n3/n3-editor-js/lib/jen3/codegen.jar",
-			folder: "/Users/wvw/git/n3/n3-editor-js/lib/jen3"
-		}
+            exec: "/app/lib/jen3/jen3.jar",
+            codegen: "/app/lib/jen3/codegen.jar",
+		    folder: "/app/lib/jen3"
+		},
+		jena: {
+			exec: "/app/lib/jena/sparql.jar",
+		},
+		triplify: {
+			exec: "/app/lib/triplify/sparql2spin.jar"
+		},
+		spin3: {
+			folder: "/app/lib/spin3"
+		},
 	},
 
 	link: {
 		max_len: 50000,
 		db: {
+            // mysql://b4837d17c012f1:[email protected]/heroku_e750abd160bbcaf?reconnect=true
 			port: '33060',
-			host: 'localhost',
-			db: "n3_links",
-			user: 'root',
-			pwd: ''
+            host: "us-cdbr-east-06.cleardb.net",
+            db: "heroku_e750abd160bbcaf",
+            user: "b4837d17c012f1",
+            pwd: "e023e78d"
 		}
 	},
 
-	path: "/Users/wvw/git/n3/n3-editor-js"
+	path: "/Users/wvw/git/n3/n3-editor-js" // ??
 }
 
 if (typeof exports === 'object' && typeof module === 'object')