Skip to content

Locify input csv fromUri column in excelerator #36

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 5 commits into from
Dec 9, 2019
Merged

Locify input csv fromUri column in excelerator #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6602e01
adding prefix to initialisation data structure
Dec 5, 2019
f7d6d85
modify convert to convert fromUri values to URI if it is not a URI
jyucsiro Dec 5, 2019
03f986c
remove logging
jyucsiro Dec 5, 2019
815491c
remove duplicate if statement
jyucsiro Dec 5, 2019
74b1f69
use function to map asgs11 and gnaf16 prefix info instead of copy-paste
jyucsiro Dec 6, 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
52 changes: 37 additions & 15 deletions excelerator/imports/api/methods-init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,12 @@ WHERE {

console.log("Refreshing Datatypes List")


var currDatasetUri = "http://linked.data.gov.au/dataset/asgs2016";
var asgs16 = [{
datasetUri: "http://linked.data.gov.au/dataset/asgs2016",
datasetUri: currDatasetUri,
title: "MeshBlock",
uri: "http://linked.data.gov.au/def/asgs#MeshBlock",
prefix: currDatasetUri + "/meshblock/",
withinTypes: [
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel1",
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel2",
Expand All @@ -149,51 +150,62 @@ WHERE {
],
baseType: true
}, {
datasetUri: "http://linked.data.gov.au/dataset/asgs2016",
datasetUri: currDatasetUri,
title: "SA1",
uri: "http://linked.data.gov.au/def/asgs#StatisticalAreaLevel1",
prefix: currDatasetUri + "/statisticalarealevel1/",
withinTypes: [
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel2",
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel3",
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel4",
"http://linked.data.gov.au/def/asgs#StateOrTerritory"
],
}, {
datasetUri: "http://linked.data.gov.au/dataset/asgs2016",
datasetUri: currDatasetUri,
title: "SA2",
uri: "http://linked.data.gov.au/def/asgs#StatisticalAreaLevel2",
prefix: currDatasetUri + "/statisticalarealevel2/",
withinTypes: [
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel3",
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel4",
"http://linked.data.gov.au/def/asgs#StateOrTerritory"
],
}, {
datasetUri: "http://linked.data.gov.au/dataset/asgs2016",
datasetUri: currDatasetUri,
title: "SA3",
uri: "http://linked.data.gov.au/def/asgs#StatisticalAreaLevel3",
prefix: currDatasetUri + "/statisticalarealevel3/",
withinTypes: [
"http://linked.data.gov.au/def/asgs#StatisticalAreaLevel4",
"http://linked.data.gov.au/def/asgs#StateOrTerritory"
],
}, {
datasetUri: "http://linked.data.gov.au/dataset/asgs2016",
datasetUri: currDatasetUri,
title: "SA4",
uri: "http://linked.data.gov.au/def/asgs#StatisticalAreaLevel4",
prefix: currDatasetUri + "/statisticalarealevel4/",
withinTypes: [
"http://linked.data.gov.au/def/asgs#StateOrTerritory"
],
}, {
datasetUri: "http://linked.data.gov.au/dataset/asgs2016",
datasetUri: currDatasetUri,
title: "StateOrTerritory",
uri: "http://linked.data.gov.au/def/asgs#StateOrTerritory",
prefix: currDatasetUri + "/stateorterritory/",
}];

var asgs11 = asgs16.map(x => Object.assign({}, x, { datasetUri: "http://linked.data.gov.au/dataset/asgs2011" }));
currDatasetUri = "http://linked.data.gov.au/dataset/asgs2011";
var asgs11 = asgs16.map(x => Object.assign({}, x, {
datasetUri: currDatasetUri,
prefix: `${currDatasetUri}/${x.prefix.split('/').slice(-2)[0]}/`
}));

currDatasetUri = "http://linked.data.gov.au/dataset/geofabric";
var geofabric = [{
datasetUri: "http://linked.data.gov.au/dataset/geofabric",
datasetUri: currDatasetUri,
title: "Contracted Catchment",
uri: "http://linked.data.gov.au/def/geofabric#ContractedCatchment",
prefix: currDatasetUri + "/contractedcatchment/",
withinTypes: [
"http://linked.data.gov.au/def/geofabric#RiverRegion",
"http://linked.data.gov.au/def/geofabric#DrainageDivision"
Expand All @@ -203,38 +215,48 @@ WHERE {
datasetUri: "http://linked.data.gov.au/dataset/geofabric",
title: "River Region",
uri: "http://linked.data.gov.au/def/geofabric#RiverRegion",
prefix: currDatasetUri + "/riverregion/",
withinTypes: [
"http://linked.data.gov.au/def/geofabric#DrainageDivision"
],
}, {
datasetUri: "http://linked.data.gov.au/dataset/geofabric",
datasetUri: currDatasetUri,
title: "Drainage Division",
uri: "http://linked.data.gov.au/def/geofabric#DrainageDivision",
prefix: currDatasetUri + "/drainagedivision/"
}];

currDatasetUri = "http://linked.data.gov.au/dataset/gnaf";
var gnafCurrent = [{
datasetUri: "http://linked.data.gov.au/dataset/gnaf",
datasetUri: currDatasetUri,
title: "Address",
uri: "http://linked.data.gov.au/def/gnaf#Address",
prefix: currDatasetUri + "/address/",
withinTypes: [
"http://linked.data.gov.au/def/gnaf#StreetLocality",
"http://linked.data.gov.au/def/gnaf#Locality"
],
baseType: true,
}, {
datasetUri: "http://linked.data.gov.au/dataset/gnaf",
datasetUri: currDatasetUri,
title: "Street Locality",
uri: "http://linked.data.gov.au/def/gnaf#StreetLocality",
prefix: currDatasetUri + "/streetLocality/",
withinTypes: [
"http://linked.data.gov.au/def/gnaf#Locality"
],
}, {
datasetUri: "http://linked.data.gov.au/dataset/gnaf",
datasetUri: currDatasetUri,
title: "Locality",
uri: "http://linked.data.gov.au/def/gnaf#Locality",
}]
prefix: currDatasetUri + "/locality/"
}];

var gnaf16 = gnafCurrent.map(x => Object.assign({}, x, { datasetUri: "http://linked.data.gov.au/dataset/gnaf-2016-05" }));
currDatasetUri = "http://linked.data.gov.au/dataset/gnaf-2016-05";
var gnaf16 = gnafCurrent.map(x => Object.assign({}, x, {
datasetUri: currDatasetUri,
prefix: `${currDatasetUri}/${x.prefix.split('/').slice(-2)[0]}/`
}));

var all = [].concat.apply([], [asgs16, asgs11, geofabric, gnafCurrent, gnaf16]);

Expand Down
6 changes: 6 additions & 0 deletions excelerator/imports/convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ export function processData(data, job, outputStream) {
if (!fromUri)
throw new Meteor.Error(`Undefined uri in row ${i}`);

//check if fromUri is a URI, else, turn it into a URI based on inputUriType
if (!fromUri.startsWith("http")) {
//get prefix from DataType and append fromUri value
fromUri = inputType.prefix + fromUri;
}

// The next "if" is totally a hack, URI should not be dependant on their parent URI
// Ideally check if the statement belongs to the dataset using the graph relationships. It means another query
// which may or may not be worth it?
Expand Down