Drug category construction fix. Custom Fuseki dockerfile to allow set…

…up.sh.
kclhi · Apr 12, 2019 · 7bccc41 · 7bccc41
1 parent d79b8b9
commit 7bccc41
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/api/routes/drug.js b/api/routes/drug.js
@@ -19,7 +19,7 @@ function postDrugs(drugData, res, insertOrDelete, callback) {
 function type(drugOrCategory, id) {
 
  return drug = `:Drug` + drugOrCategory + id + ` rdf:type vocab:DrugType, owl:NamedIndividual ;
- rdfs:label "` + id + `"@en .`
+ rdfs:label "` + id + `"@en `
 
 }
 
@@ -45,7 +45,7 @@ function administrationSubsumption(id) {
 function individualAction(req, res, insertOrDelete, callback) {
 
  // Individual drug format:
- const drug = type("T", req.body.drug_id)
+ const drug = type("T", req.body.drug_id) + ` .`
 
  var drugAdministration = administration("T", req.body.drug_id);
 
@@ -150,7 +150,10 @@ function categoryAction(req, res, insertOrDelete, callback) {
 
  }
 
- const drugCategoryAdministration = administration("Cat", req.body.drug_category_id);
+ const drugCategoryAdministration = administration("Cat", req.body.drug_category_id) + ` .`;
+
+ console.log(drugCategory);
+ console.log(drugCategoryAdministration);
 
  postDrugs(drugCategory + " " + drugCategoryAdministration, res, insertOrDelete, callback);
 

diff --git a/docker-compose.demo.yml b/docker-compose.demo.yml
@@ -32,7 +32,8 @@ services:
  - 1234:1234
 
  fuseki:
- image: stain/jena-fuseki
+ build:
+ context: fuseki
  volumes:
  - drug_volume:/fuskei
  environment:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,8 @@ services:
  - fuseki
 
  fuseki:
- image: stain/jena-fuseki
+ build:
+ context: fuseki
  volumes:
  - drug_volume:/fuskei
  environment:

diff --git a/fuseki/Dockerfile b/fuseki/Dockerfile
@@ -0,0 +1,3 @@
+FROM stain/jena-fuseki
+# Adds curl
+RUN apk add --update curl && rm -rf /var/cache/apk/*