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

Don't create pmd:codesUsed collections for measure types. #94

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

Don't create pmd:codesUsed collections for measure types. #94

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
13 changes: 12 additions & 1 deletion examples/bop-quarterly/csvw/component-specifications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"url":"component-specifications.csv","dc:title":"BoP Quarterly Example","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},{"name":"component_property","titles":"component_property","datatype":"string","propertyUrl":"{+component_attachment}","valueUrl":"{+component_property}"},{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:ComponentSpecification"},{"name":"codes_used","virtual":true,"propertyUrl":"http:\/\/publishmydata.com\/def\/qb\/codesUsed","valueUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/codes-used\/{component_slug}"}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/component\/{component_slug}"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"url":"component-specifications.csv",
"dc:title":"BoP Quarterly Example",
"tableSchema": {
"columns": [
{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},
{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},
{"name":"component_property","titles":"component_property","datatype":"string","propertyUrl":"{+component_attachment}","valueUrl":"{+component_property}"},
{"name":"codes_used", "titles": "codes_used","propertyUrl":"http:\/\/publishmydata.com\/def\/qb\/codesUsed","valueUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/codes-used\/{component_slug}"},
{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:ComponentSpecification"}],
"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/component\/{component_slug}"}
}
15 changes: 14 additions & 1 deletion examples/bop-quarterly/csvw/data-structure-definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"@id":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/structure","url":"component-specifications.csv","dc:title":"BoP Quarterly Example (Data Structure Definition)","rdf:type":{"@id":"qb:DataStructureDefinition"},"rdfs:label":"BoP Quarterly Example (Data Structure Definition)","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","datatype":"string","propertyUrl":"qb:component","valueUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/component\/{component_slug}"},{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/structure"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"@id":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/structure",
"url":"component-specifications.csv",
"dc:title":"BoP Quarterly Example (Data Structure Definition)",
"rdf:type":{"@id":"qb:DataStructureDefinition"},
"rdfs:label":"BoP Quarterly Example (Data Structure Definition)",
"tableSchema":{
"columns":[
{"name":"component_slug","titles":"component_slug","datatype":"string","propertyUrl":"qb:component","valueUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/component\/{component_slug}"},
{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},
{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true},
{"name": "codes_used", "titles": "codes_used", "suppressOutput": true}
],
"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/structure"}}
15 changes: 14 additions & 1 deletion examples/bop-quarterly/csvw/dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"@id":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example","url":"component-specifications.csv","dc:title":"BoP Quarterly Example","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","suppressOutput":true},{"name":"component_attachment","titles":"component_attachment","suppressOutput":true},{"name":"component_property","titles":"component_property","suppressOutput":true},{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:DataSet"},{"name":"structure","virtual":true,"propertyUrl":"qb:structure","valueUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/structure"}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"@id":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example",
"url":"component-specifications.csv",
"dc:title":"BoP Quarterly Example",
"tableSchema":{
"columns":[
{"name":"component_slug","titles":"component_slug","suppressOutput":true},
{"name":"component_attachment","titles":"component_attachment","suppressOutput":true},
{"name":"component_property","titles":"component_property","suppressOutput":true},
{"name": "codes_used", "titles": "codes_used", "suppressOutput": true},
{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:DataSet"},
{"name":"structure","virtual":true,"propertyUrl":"qb:structure","valueUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/structure"}
],
"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example"}}
11 changes: 10 additions & 1 deletion examples/bop-quarterly/csvw/used-codes-codelists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"url":"component-specifications.csv","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true},{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"skos:ConceptScheme"}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/codes-used\/{component_slug}"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"url":"component-specifications.csv",
"tableSchema":{
"columns":[
{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},
{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},
{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true},
{"name":"codes_used","titles":"codes_used","propertyUrl":"rdf:type","valueUrl":"skos:ConceptScheme"}
],
"aboutUrl":"http:\/\/gss-data.org.uk\/data\/bop-quarterly-example\/codes-used\/{component_slug}"}}
13 changes: 12 additions & 1 deletion examples/overseas-trade/csvw/component-specifications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"url":"component-specifications.csv","dc:title":"Overseas Trade Sample","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},{"name":"component_property","titles":"component_property","datatype":"string","propertyUrl":"{+component_attachment}","valueUrl":"{+component_property}"},{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:ComponentSpecification"},{"name":"codes_used","virtual":true,"propertyUrl":"http:\/\/publishmydata.com\/def\/qb\/codesUsed","valueUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/codes-used\/{component_slug}"}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/component\/{component_slug}"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"url":"component-specifications.csv",
"dc:title":"Overseas Trade Sample",
"tableSchema":{
"columns":[
{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},
{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},
{"name":"component_property","titles":"component_property","datatype":"string","propertyUrl":"{+component_attachment}","valueUrl":"{+component_property}"},
{"name":"codes_used","titles": "codes_used","propertyUrl":"http:\/\/publishmydata.com\/def\/qb\/codesUsed","valueUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/codes-used\/{component_slug}"},
{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:ComponentSpecification"}],
"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/component\/{component_slug}"}
}
15 changes: 14 additions & 1 deletion examples/overseas-trade/csvw/data-structure-definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"@id":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/structure","url":"component-specifications.csv","dc:title":"Overseas Trade Sample (Data Structure Definition)","rdf:type":{"@id":"qb:DataStructureDefinition"},"rdfs:label":"Overseas Trade Sample (Data Structure Definition)","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","datatype":"string","propertyUrl":"qb:component","valueUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/component\/{component_slug}"},{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/structure"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"@id":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/structure",
"url":"component-specifications.csv",
"dc:title":"Overseas Trade Sample (Data Structure Definition)",
"rdf:type":{"@id":"qb:DataStructureDefinition"},
"rdfs:label":"Overseas Trade Sample (Data Structure Definition)",
"tableSchema":{
"columns":[
{"name":"component_slug","titles":"component_slug","datatype":"string","propertyUrl":"qb:component","valueUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/component\/{component_slug}"},
{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},
{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true},
{"name":"codes_used","titles":"codes_used","suppressOutput":true},
],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/structure"}
}
15 changes: 14 additions & 1 deletion examples/overseas-trade/csvw/dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"@id":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample","url":"component-specifications.csv","dc:title":"Overseas Trade Sample","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","suppressOutput":true},{"name":"component_attachment","titles":"component_attachment","suppressOutput":true},{"name":"component_property","titles":"component_property","suppressOutput":true},{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:DataSet"},{"name":"structure","virtual":true,"propertyUrl":"qb:structure","valueUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/structure"}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"@id":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample",
"url":"component-specifications.csv",
"dc:title":"Overseas Trade Sample",
"tableSchema":{
"columns":[
{"name":"component_slug","titles":"component_slug","suppressOutput":true},
{"name":"component_attachment","titles":"component_attachment","suppressOutput":true},
{"name":"component_property","titles":"component_property","suppressOutput":true},
{"name": "codes_used", "titles": "codes_used", "suppressOutput": true},
{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"qb:DataSet"},
{"name":"structure","virtual":true,"propertyUrl":"qb:structure","valueUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/structure"}
],
"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample"}}
11 changes: 10 additions & 1 deletion examples/overseas-trade/csvw/used-codes-codelists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],"url":"component-specifications.csv","tableSchema":{"columns":[{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true},{"name":"type","virtual":true,"propertyUrl":"rdf:type","valueUrl":"skos:ConceptScheme"}],"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/codes-used\/{component_slug}"}}
{"@context":["http:\/\/www.w3.org\/ns\/csvw",{"@language":"en"}],
"url":"component-specifications.csv",
"tableSchema":{
"columns":[
{"name":"component_slug","titles":"component_slug","datatype":"string","suppressOutput":true},
{"name":"component_attachment","titles":"component_attachment","datatype":"string","suppressOutput":true},
{"name":"component_property","titles":"component_property","datatype":"string","suppressOutput":true},
{"name":"codes_used", "titles": "codes_used", "propertyUrl":"rdf:type","valueUrl":"skos:ConceptScheme"},
],
"aboutUrl":"http:\/\/gss-data.org.uk\/data\/overseas-trade-sample\/codes-used\/{component_slug}"}}
18 changes: 9 additions & 9 deletions examples/regional-trade/csvw/component-specifications.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
component_slug,component_attachment,component_property
date,qb:dimension,http://purl.org/linked-data/sdmx/2009/dimension#refPeriod
flow,qb:dimension,http://gss-data.org.uk/def/dimension/flow
gbp_total,qb:measure,http://gss-data.org.uk/def/measure/gbp-total
geography,qb:dimension,http://purl.org/linked-data/sdmx/2009/dimension#refArea
measure_type,qb:dimension,http://purl.org/linked-data/cube#measureType
net_mass,qb:measure,http://gss-data.org.uk/def/measure/net-mass
sitc_section,qb:dimension,http://gss-data.org.uk/def/dimension/sitc-section
unit,qb:attribute,http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure
component_slug,component_attachment,component_property,codes_used
date,qb:dimension,http://purl.org/linked-data/sdmx/2009/dimension#refPeriod,yes
flow,qb:dimension,http://gss-data.org.uk/def/dimension/flow,yes
gbp_total,qb:measure,http://gss-data.org.uk/def/measure/gbp-total,
geography,qb:dimension,http://purl.org/linked-data/sdmx/2009/dimension#refArea,yes
measure_type,qb:dimension,http://purl.org/linked-data/cube#measureType,yes
net_mass,qb:measure,http://gss-data.org.uk/def/measure/net-mass,
sitc_section,qb:dimension,http://gss-data.org.uk/def/dimension/sitc-section,yes
unit,qb:attribute,http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure,yes
10 changes: 5 additions & 5 deletions examples/regional-trade/csvw/component-specifications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
"datatype": "string",
"propertyUrl": "{+component_attachment}",
"valueUrl": "{+component_property}"
}{
"name": "codes_used",
"titles": "codes_used",
"propertyUrl": "http://publishmydata.com/def/qb/codesUsed",
"valueUrl": "http://gss-data.org.uk/data/regional-trade/codes-used/{component_slug}"
},{
"name": "type",
"virtual": true,
"propertyUrl": "rdf:type",
"valueUrl": "qb:ComponentSpecification"
},{
"name": "codes_used",
"virtual": true,
"propertyUrl": "http://publishmydata.com/def/qb/codesUsed",
"valueUrl": "http://gss-data.org.uk/data/regional-trade/codes-used/{component_slug}"
}],
"aboutUrl": "http://gss-data.org.uk/data/regional-trade/component/{component_slug}"
}
Expand Down
4 changes: 4 additions & 0 deletions examples/regional-trade/csvw/data-structure-definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
"titles": "component_property",
"datatype": "string",
"suppressOutput": true
},{
"name": "codes_used",
"titles": "codes_used",
"suppressOutput": true
}],
"aboutUrl": "http://gss-data.org.uk/data/regional-trade/structure"
}
Expand Down
17 changes: 9 additions & 8 deletions examples/regional-trade/csvw/dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@
{"titles": "component_slug", "name": "component_slug", "suppressOutput": true},
{"titles": "component_attachment", "name": "component_attachment", "suppressOutput": true},
{"titles": "component_property", "name": "component_property", "suppressOutput": true},
{"name": "codes_used", "titles": "codes_used", "suppressOutput": true},
{
"name": "type",
"virtual": true,
"propertyUrl": "rdf:type",
"valueUrl": "qb:DataSet"
"name": "type",
"virtual": true,
"propertyUrl": "rdf:type",
"valueUrl": "qb:DataSet"
},{
"name": "structure",
"virtual": true,
"propertyUrl": "qb:structure",
"valueUrl": "http://gss-data.org.uk/data/regional-trade/structure"
"name": "structure",
"virtual": true,
"propertyUrl": "qb:structure",
"valueUrl": "http://gss-data.org.uk/data/regional-trade/structure"
}],
"aboutUrl": "http://gss-data.org.uk/data/regional-trade"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/regional-trade/csvw/used-codes-codelists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"datatype": "string",
"suppressOutput": true
},{
"name": "type",
"virtual": true,
"name": "codes_used",
"titles": "codes_used",
"propertyUrl": "rdf:type",
"valueUrl": "skos:Collection"
}],
Expand Down
1 change: 0 additions & 1 deletion examples/regional-trade/csvw/used-codes-codes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"name": "value",
"titles": "value",
"datatype": "number",
"propertyUrl": "skos:member",
"suppressOutput": true
}],
"aboutUrl": "http://gss-data.org.uk/data/regional-trade/codes-used/{_name}"
Expand Down
6 changes: 6 additions & 0 deletions src/table2qb/configuration/column.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
(:type column)))
(def property-template :property_template)

(defn is-dimension-column? [column]
(= :dimension (:type column)))

(defn is-attribute-column? [column]
(= :attribute (:type column)))

(defn- replace-symbols [s]
(string/replace s #"£" "GBP"))

Expand Down
Loading