Skip to content

Commit

Permalink
Revert "Namespace-URLs durchgängig klein schreiben"
Browse files Browse the repository at this point in the history
This reverts commit d3280c0
  • Loading branch information
konstin committed Dec 28, 2016
1 parent e5927c0 commit 8e89c21
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 47 deletions.
2 changes: 0 additions & 2 deletions changelog.md

This file was deleted.

6 changes: 3 additions & 3 deletions examples/Body-01.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "https://oparl.example.org/body/0",
"type": "https://schema.oparl.org/1.0/body",
"type": "https://schema.oparl.org/1.0/Body",
"system": "https://oparl.example.org/",
"contactEmail": "[email protected]",
"contactName": "RIS-Betreuung",
Expand All @@ -22,7 +22,7 @@
"legislativeTerm": [
{
"id": "https://oparl.example.org/term/21",
"type": "https://schema.oparl.org/1.0/legislativeterm",
"type": "https://schema.oparl.org/1.0/LegislativeTerm",
"body": "https://oparl.example.org/body/0",
"name": "21. Wahlperiode",
"startDate": "2010-12-03",
Expand All @@ -31,7 +31,7 @@
],
"location": {
"id:": "https://oparl.example.org/location/0",
"type": "https://schema.oparl.org/1.0/location",
"type": "https://schema.oparl.org/1.0/Location",
"description": "Rathaus der Beispielstadt, Ratshausplatz 1, 12345 Beispielstadt",
"geometry": {
"type": "Feature",
Expand Down
2 changes: 1 addition & 1 deletion examples/File-01.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "https://oparl.example.org/files/57737",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Anlage 1 zur Anfrage",
"fileName": "anlage_1_zur_anfrage.pdf",
"mimeType": "application/pdf",
Expand Down
12 changes: 6 additions & 6 deletions examples/Meeting-01.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "https://oparl.example.org/meeting/281",
"type": "https://schema.oparl.org/1.0/meeting",
"type": "https://schema.oparl.org/1.0/Meeting",
"name": "4. Sitzung des Finanzausschusses",
"start": "2013-01-04T08:00:00+01:00",
"end": "2013-01-04T12:00:00+01:00",
Expand All @@ -10,7 +10,7 @@
],
"invitation": {
"id": "https://oparl.example.org/files/57739",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Einladung",
"fileName": "einladung.pdf",
"mimeType": "application/pdf",
Expand All @@ -23,7 +23,7 @@
},
"resultsProtocol": {
"id": "https://oparl.example.org/files/57739",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Protokoll",
"fileName": "protokoll.pdf",
"mimeType": "application/pdf",
Expand All @@ -36,7 +36,7 @@
},
"verbatimProtocol": {
"id": "https://oparl.example.org/files/57739",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Wortprotokoll",
"fileName": "wortprotokoll.pdf",
"mimeType": "application/pdf",
Expand All @@ -50,7 +50,7 @@
"auxiliaryFile": [
{
"id": "https://oparl.example.org/files/57739",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Nachtrags-Tagesordnung",
"fileName": "nachtrag-TO.pdf",
"mimeType": "application/pdf",
Expand All @@ -65,7 +65,7 @@
"agendaItem": [
{
"id": "https://oparl.example.org/agendaitem/3271",
"type": "https://schema.oparl.org/1.0/agendaitem",
"type": "https://schema.oparl.org/1.0/AgendaItem",
"meeting": "https://oparl.example.org/meeting/281",
"number": "10.1",
"name": "Satzungsänderung für Ausschreibungen",
Expand Down
2 changes: 1 addition & 1 deletion examples/Organization-01.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "https://oparl.example.org/organization/34",
"type": "https://schema.oparl.org/1.0/organization",
"type": "https://schema.oparl.org/1.0/Organization",
"body": "https://oparl.example.org/bodies/1",
"name": "Ausschuss für Haushalt und Finanzen",
"shortName": "Finanzausschuss",
Expand Down
10 changes: 5 additions & 5 deletions examples/Paper-01.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "https://oparl.example.org/paper/749",
"type": "https://schema.oparl.org/1.0/paper",
"type": "https://schema.oparl.org/1.0/Paper",
"body": "https://oparl.example.org/bodies/1",
"name": "Antwort auf Anfrage 1200/2014",
"reference": "1234/2014",
Expand All @@ -11,7 +11,7 @@
],
"mainFile": {
"id": "https://oparl.example.org/files/57737",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Anlage 1 zur Anfrage",
"fileName": "anlage_1_zur_anfrage.pdf",
"mimeType": "application/pdf",
Expand All @@ -27,7 +27,7 @@
"auxiliaryFile": [
{
"id": "https://oparl.example.org/files/57739",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Anlage 1 zur Anfrage",
"fileName": "anlage.pdf",
"mimeType": "application/pdf",
Expand All @@ -46,7 +46,7 @@
"location": [
{
"id": "https://oparl.example.org/locations/29856",
"type": "https://schema.oparl.org/1.0/location",
"type": "https://schema.oparl.org/1.0/Location",
"description": "Honschaftsstraße 312, Köln",
"geometry": {
"type": "Point",
Expand All @@ -68,7 +68,7 @@
"consultation": [
{
"id": "https://oparl.example.org/consultation/47594",
"type": "https://schema.oparl.org/1.0/consultation",
"type": "https://schema.oparl.org/1.0/Consultation",
"agendaItem": "https://oparl.example.org/agendaitem/15569",
"meeting": "https://oparl.example.org/meeting/243",
"organization": "https://oparl.example.org/organization/96",
Expand Down
6 changes: 3 additions & 3 deletions examples/Person-01.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "https://oparl.example.org/person/29",
"type": "https://schema.oparl.org/1.0/person",
"type": "https://schema.oparl.org/1.0/Person",
"body": "https://oparl.example.org/body/0",
"name": "Prof. Dr. Max Mustermann",
"familyName": "Mustermann",
Expand All @@ -19,15 +19,15 @@
"membership": [
{
"id": "https://oparl.example.org/memberships/385",
"type": "https://schema.oparl.org/1.0/membership",
"type": "https://schema.oparl.org/1.0/Membership",
"organization": "https://oparl.example.org/organizations/5",
"role": "Vorsitzende",
"votingRight": true,
"startDate": "2013-12-03"
},
{
"id": "https://oparl.example.org/memberships/693",
"type": "https://schema.oparl.org/1.0/membership",
"type": "https://schema.oparl.org/1.0/Membership",
"organization": "https://oparl.example.org/organizations/9",
"role": "Sachkundige Bürgerin",
"votingRight": false,
Expand Down
2 changes: 1 addition & 1 deletion examples/System-01.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "https://oparl.example.org/",
"type": "https://schema.oparl.org/1.0/system",
"type": "https://schema.oparl.org/1.0/System",
"oparlVersion": "https://schema.oparl.org/1.0/",
"body": "https://oparl.example.org/bodies",
"name": "Beispiel-System",
Expand Down
2 changes: 1 addition & 1 deletion src/1-05-nomenklatur.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ Das Präfix `oparl:` steht hierbei für die folgende Namespace-URL:
Dadurch kann eine Typenangabe wie `oparl:Organization` eindeutig in die
folgende URL übersetzt werden:

https://schema.oparl.org/1.0/organization
https://schema.oparl.org/1.0/Organization
18 changes: 9 additions & 9 deletions src/2-05-objektlisten-und-paginierung.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Ein Beispiel hierfür ist `subOrganizationOf` in `Organization`:
~~~~~ {#objektlisten_ex1 .json}
{
"id": "https://oparl.example.org/organization/1",
"type": "https://schema.oparl.org/1.0/organization",
"type": "https://schema.oparl.org/1.0/Organization",
"subOrganizationOf": "https://oparl.example.org/organization/2"
...
}
Expand All @@ -30,7 +30,7 @@ Ein Beispiel hierfür ist `meeting` in `Organization`:
~~~~~ {#objektlisten_ex2 .json}
{
"id": "https://oparl.example.org/organization/1",
"type": "https://schema.oparl.org/1.0/organization",
"type": "https://schema.oparl.org/1.0/Organization",
"meeting": [
"https://oparl.example.org/meeting/1",
"https://oparl.example.org/meeting/2",
Expand All @@ -49,10 +49,10 @@ Wert eines Attributs angegeben. Ein Beispiel für ein internes Objekt ist
~~~~~ {#objektlisten_ex3 .json}
{
"id": "https://oparl.example.org/body/1",
"type": "https://schema.oparl.org/1.0/body",
"type": "https://schema.oparl.org/1.0/Body",
"location": {
"id": "https://oparl.example.org/location/1",
"type": "https://schema.oparl.org/1.0/location",
"type": "https://schema.oparl.org/1.0/Location",
"description": "Ratshausvorplatz 1, 12345 Beispielstadt"
},
...
Expand All @@ -65,7 +65,7 @@ Beispiel des Attributes `membership` in `oparl:Person`.
~~~~~ {#objektlisten_ex4 .json}
{
"id": "https://oparl.example.org/person/1",
"type": "https://schema.oparl.org/1.0/person",
"type": "https://schema.oparl.org/1.0/Person",
"membership": [
{
"id": "https://oparl.example.org/memberships/385",
Expand Down Expand Up @@ -98,7 +98,7 @@ Listenausgabe. Ein Beispiel dafür ist `organization` in `oparl:Body`.
~~~~~ {#objektlisten_ex5a .json}
{
"id": "https://oparl.example.org/body/1",
"type": "https://schema.oparl.org/1.0/body",
"type": "https://schema.oparl.org/1.0/Body",
"organization": "https://oparl.example.org/body/1/organization"
...
}
Expand All @@ -111,19 +111,19 @@ Die externe Objektliste:
"data": [
{
"id": "https://oparl.example.org/organization/1",
"type": "https://schema.oparl.org/1.0/organization",
"type": "https://schema.oparl.org/1.0/Organization",
"name": "Organisation Nummer 1",
...
},
{
"id": "https://oparl.example.org/organization/2",
"type": "https://schema.oparl.org/1.0/organization",
"type": "https://schema.oparl.org/1.0/Organization",
"name": "Organisation Nummer 2",
...
},
{
"id": "https://oparl.example.org/organization/3",
"type": "https://schema.oparl.org/1.0/organization",
"type": "https://schema.oparl.org/1.0/Organization",
"name": "Organisation Nummer 3",
...
},
Expand Down
6 changes: 3 additions & 3 deletions src/3-00-schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ist:
~~~~~ {#objekte_example1 .json}
{
"id": "https://oparl.example.org/meeting/281",
"type": "https://schema.oparl.org/1.0/meeting",
"type": "https://schema.oparl.org/1.0/Meeting",
"name": "4. Sitzung des Finanzausschusses",
"start": "2013-01-04T08:00:00+01:00",
"end": "2013-01-04T12:00:00+01:00",
Expand All @@ -69,7 +69,7 @@ dann das Eltern-Objekt als zusätzliches Attribut hinzu.:
~~~~~ {#objekte_example2 .json}
{
"id": "https://oparl.example.org/files/57739",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"name": "Einladung",
"fileName": "einladung.pdf",
"mimeType": "application/pdf",
Expand All @@ -92,7 +92,7 @@ vorkommen:
~~~~~ {#objekte_example2 .json}
{
"id": "https://oparl.example.org/locations/29856",
"type": "https://schema.oparl.org/1.0/file",
"type": "https://schema.oparl.org/1.0/File",
"description": "Honschaftsstraße 312, Köln",
"geojson": {
"type": "Feature",
Expand Down
24 changes: 12 additions & 12 deletions src/3-01-eigenschaften-mit-verwendung-in-mehreren-objekttypen.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ definiert:

Typ (kurz) | Namespace-URL
-------------------------|-------------------------------------------
`oparl:AgendaItem` |https://schema.oparl.org/1.0/agendaitem
`oparl:Body` |https://schema.oparl.org/1.0/body
`oparl:Consultation` |https://schema.oparl.org/1.0/consultation
`oparl:File` |https://schema.oparl.org/1.0/file
`oparl:LegislativeTerm` |https://schema.oparl.org/1.0/legislativeterm
`oparl:Location` |https://schema.oparl.org/1.0/location
`oparl:Meeting` |https://schema.oparl.org/1.0/meeting
`oparl:Membership` |https://schema.oparl.org/1.0/membership
`oparl:Organization` |https://schema.oparl.org/1.0/organization
`oparl:Paper` |https://schema.oparl.org/1.0/paper
`oparl:Person` |https://schema.oparl.org/1.0/person
`oparl:System` |https://schema.oparl.org/1.0/system
`oparl:AgendaItem` |https://schema.oparl.org/1.0/AgendaItem
`oparl:Body` |https://schema.oparl.org/1.0/Body
`oparl:Consultation` |https://schema.oparl.org/1.0/Consultation
`oparl:File` |https://schema.oparl.org/1.0/File
`oparl:LegislativeTerm` |https://schema.oparl.org/1.0/LegislativeTerm
`oparl:Location` |https://schema.oparl.org/1.0/Location
`oparl:Meeting` |https://schema.oparl.org/1.0/Meeting
`oparl:Membership` |https://schema.oparl.org/1.0/Membership
`oparl:Organization` |https://schema.oparl.org/1.0/Organization
`oparl:Paper` |https://schema.oparl.org/1.0/Paper
`oparl:Person` |https://schema.oparl.org/1.0/Person
`oparl:System` |https://schema.oparl.org/1.0/System

### `name` und `shortName` {#eigenschaft-name-shortname}

Expand Down

0 comments on commit 8e89c21

Please sign in to comment.