This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jena-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 696688f Updated site from master
(4dfe64fa0d819ac1ecf9c4cb6e2c235cac1a2db3)
696688f is described below
commit 696688f6d195a173915937b6c6f9c23056cb385d
Author: Andy Seaborne <[email protected]>
AuthorDate: Fri Mar 6 18:23:24 2020 +0000
Updated site from master (4dfe64fa0d819ac1ecf9c4cb6e2c235cac1a2db3)
---
build-script | 71 ++++++++++++++++++++++++++++
content/tutorials/sparql_data/ds-dft.ttl | 12 ++---
content/tutorials/sparql_data/ds-ng-1.ttl | 8 ++--
content/tutorials/sparql_data/ds-ng-2.ttl | 8 ++--
content/tutorials/sparql_data/q-bp1.rq | 8 ++--
content/tutorials/sparql_data/q-bp2.rq | 12 ++---
content/tutorials/sparql_data/q-bp3.rq | 16 +++----
content/tutorials/sparql_data/q-bp4.rq | 16 +++----
content/tutorials/sparql_data/q-ds-1.rq | 12 ++---
content/tutorials/sparql_data/q-ds-2.rq | 16 +++----
content/tutorials/sparql_data/q-ds-3.rq | 16 +++----
content/tutorials/sparql_data/q-ds-4.rq | 20 ++++----
content/tutorials/sparql_data/q-ds-5.rq | 22 ++++-----
content/tutorials/sparql_data/q-f1.rq | 12 ++---
content/tutorials/sparql_data/q-f2.rq | 16 +++----
content/tutorials/sparql_data/q-opt1.rq | 18 +++----
content/tutorials/sparql_data/q-opt2.rq | 18 +++----
content/tutorials/sparql_data/q-opt3.rq | 18 +++----
content/tutorials/sparql_data/q-opt4.rq | 20 ++++----
content/tutorials/sparql_data/q-union1.rq | 16 +++----
content/tutorials/sparql_data/q-union1alt.rq | 18 +++----
content/tutorials/sparql_data/q-union2.rq | 16 +++----
content/tutorials/sparql_data/q-union3.rq | 20 ++++----
content/tutorials/sparql_data/q1.rq | 8 ++--
content/tutorials/sparql_data/vc-db-3.ttl | 30 ++++++------
25 files changed, 259 insertions(+), 188 deletions(-)
diff --git a/build-script b/build-script
new file mode 100755
index 0000000..094b01d
--- /dev/null
+++ b/build-script
@@ -0,0 +1,71 @@
+#!/bin/bash -x
+## ----
+## Copy of the jena-site job build script
+## https://builds.apache.org/job/Jena_Site/
+## ----------------
+
+set -e
+# Specify source and site branches
+SOURCE="master"
+SITE="asf-site"
+SOURCE_DIR=${PWD}
+
+git checkout ${SOURCE}
+git pull origin ${SOURCE}
+
+# Install Hugo
+TMP_HUGO_DIR="$(mktemp -d)"
+mkdir -p "${TMP_HUGO_DIR}/bin"
+cd "${TMP_HUGO_DIR}" || exit 1
+wget -O hugo.tar.gz
https://github.com/gohugoio/hugo/releases/download/v0.63.2/hugo_extended_0.63.2_Linux-64bit.tar.gz
+tar xfzv hugo.tar.gz
+mv hugo "${TMP_HUGO_DIR}/bin/"
+export PATH="${TMP_HUGO_DIR}/bin:$PATH"
+
+# Get commit info
+cd "${SOURCE_DIR}" || exit 1
+LAST_SHA=( $(git log -n 1 --pretty=format:"%H") )
+
+# Create temporary directory
+TMP_DIR="$(mktemp -d)"
+OUT_DIR="${TMP_DIR}/content"
+mkdir -p "${OUT_DIR}"
+
+# Build the site to our temporary folder
+hugo --destination "${OUT_DIR}"
+if [ $? = 0 ]; then
+ echo "Hugo build successful"
+else
+ echo "Hugo build failed"
+ exit 1
+fi
+
+# Switch to the SITE branch
+git checkout "${SITE}"
+git pull origin "${SITE}"
+
+# Remove the current contents of the SITE branch and replace them with the
contents of the temp folder
+rm -rf "${SOURCE_DIR}/content"
+git rm -r --cached content/*
+mkdir -p "${SOURCE_DIR}/content"
+cp -rT "${TMP_DIR}"/* "${SOURCE_DIR}/content"
+
+# Commit the changes to the SITE branch
+COMMIT_MESSAGE="Updated site from ${SOURCE} (${LAST_SHA})"
+git add -A
+git commit -m "${COMMIT_MESSAGE}" | true
+
+# Delete the temporary folders
+rm -rf "${TMP_DIR}"
+rm -rf "${TMP_HUGO_DIR}"
+
+# Push the SITE to the server
+git push -u origin ${SITE}
+if [ $? = 0 ]; then
+ echo "Push ${SITE} successful"
+else
+ echo "Push ${SITE} failed"
+fi
+
+# Switch back to SOURCE branch
+git checkout "${SOURCE}"
diff --git a/content/tutorials/sparql_data/ds-dft.ttl
b/content/tutorials/sparql_data/ds-dft.ttl
index 226d98e..d0ec1b6 100644
--- a/content/tutorials/sparql_data/ds-dft.ttl
+++ b/content/tutorials/sparql_data/ds-dft.ttl
@@ -1,6 +1,6 @@
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix web: <http://example/> .
-
-<ds-ng-1.ttl> dc:date "2005-07-14T03:18:56+01:00"^^xsd:dateTime .
-<ds-ng-2.ttl> dc:date "2005-09-22T05:53:05+01:00"^^xsd:dateTime .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix web: <http://example/> .
+
+<ds-ng-1.ttl> dc:date "2005-07-14T03:18:56+01:00"^^xsd:dateTime .
+<ds-ng-2.ttl> dc:date "2005-09-22T05:53:05+01:00"^^xsd:dateTime .
diff --git a/content/tutorials/sparql_data/ds-ng-1.ttl
b/content/tutorials/sparql_data/ds-ng-1.ttl
index 32dda24..5e99e41 100644
--- a/content/tutorials/sparql_data/ds-ng-1.ttl
+++ b/content/tutorials/sparql_data/ds-ng-1.ttl
@@ -1,4 +1,4 @@
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-
-[] dc:title "Harry Potter and the Philospher's Stone" .
-[] dc:title "Harry Potter and the Chamber of Secrets" .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+
+[] dc:title "Harry Potter and the Philospher's Stone" .
+[] dc:title "Harry Potter and the Chamber of Secrets" .
diff --git a/content/tutorials/sparql_data/ds-ng-2.ttl
b/content/tutorials/sparql_data/ds-ng-2.ttl
index 39b979f..d39262a 100644
--- a/content/tutorials/sparql_data/ds-ng-2.ttl
+++ b/content/tutorials/sparql_data/ds-ng-2.ttl
@@ -1,4 +1,4 @@
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-
-[] dc:title "Harry Potter and the Sorcerer's Stone" .
-[] dc:title "Harry Potter and the Chamber of Secrets" .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+
+[] dc:title "Harry Potter and the Sorcerer's Stone" .
+[] dc:title "Harry Potter and the Chamber of Secrets" .
diff --git a/content/tutorials/sparql_data/q-bp1.rq
b/content/tutorials/sparql_data/q-bp1.rq
index 7749258..99236be 100644
--- a/content/tutorials/sparql_data/q-bp1.rq
+++ b/content/tutorials/sparql_data/q-bp1.rq
@@ -1,4 +1,4 @@
-SELECT ?x ?name
-WHERE
- { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> ?name }
-
+SELECT ?x ?name
+WHERE
+ { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> ?name }
+
diff --git a/content/tutorials/sparql_data/q-bp2.rq
b/content/tutorials/sparql_data/q-bp2.rq
index f2cafa4..22e95b7 100644
--- a/content/tutorials/sparql_data/q-bp2.rq
+++ b/content/tutorials/sparql_data/q-bp2.rq
@@ -1,6 +1,6 @@
-SELECT ?givenName
-WHERE
- { ?y <http://www.w3.org/2001/vcard-rdf/3.0#Family> "Smith" .
- ?y <http://www.w3.org/2001/vcard-rdf/3.0#Given> ?givenName .
- }
-
+SELECT ?givenName
+WHERE
+ { ?y <http://www.w3.org/2001/vcard-rdf/3.0#Family> "Smith" .
+ ?y <http://www.w3.org/2001/vcard-rdf/3.0#Given> ?givenName .
+ }
+
diff --git a/content/tutorials/sparql_data/q-bp3.rq
b/content/tutorials/sparql_data/q-bp3.rq
index 32f0c02..de40c98 100644
--- a/content/tutorials/sparql_data/q-bp3.rq
+++ b/content/tutorials/sparql_data/q-bp3.rq
@@ -1,8 +1,8 @@
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?givenName
-WHERE
- { ?y vcard:Family "Smith" .
- ?y vcard:Given ?givenName .
- }
-
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?givenName
+WHERE
+ { ?y vcard:Family "Smith" .
+ ?y vcard:Given ?givenName .
+ }
+
diff --git a/content/tutorials/sparql_data/q-bp4.rq
b/content/tutorials/sparql_data/q-bp4.rq
index 4df12d5..5ad5a65 100644
--- a/content/tutorials/sparql_data/q-bp4.rq
+++ b/content/tutorials/sparql_data/q-bp4.rq
@@ -1,8 +1,8 @@
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?y ?givenName
-WHERE
- { ?y vcard:Family "Smith" .
- ?y vcard:Given ?givenName .
- }
-
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?y ?givenName
+WHERE
+ { ?y vcard:Family "Smith" .
+ ?y vcard:Given ?givenName .
+ }
+
diff --git a/content/tutorials/sparql_data/q-ds-1.rq
b/content/tutorials/sparql_data/q-ds-1.rq
index f95c73a..0cca0e7 100644
--- a/content/tutorials/sparql_data/q-ds-1.rq
+++ b/content/tutorials/sparql_data/q-ds-1.rq
@@ -1,6 +1,6 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT *
-{ ?s ?p ?o }
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT *
+{ ?s ?p ?o }
diff --git a/content/tutorials/sparql_data/q-ds-2.rq
b/content/tutorials/sparql_data/q-ds-2.rq
index edc3938..8716e93 100644
--- a/content/tutorials/sparql_data/q-ds-2.rq
+++ b/content/tutorials/sparql_data/q-ds-2.rq
@@ -1,8 +1,8 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT *
-{
- { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
-}
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT *
+{
+ { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
+}
diff --git a/content/tutorials/sparql_data/q-ds-3.rq
b/content/tutorials/sparql_data/q-ds-3.rq
index 0c681f4..da7d967 100644
--- a/content/tutorials/sparql_data/q-ds-3.rq
+++ b/content/tutorials/sparql_data/q-ds-3.rq
@@ -1,8 +1,8 @@
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT ?title
-{
- GRAPH :ds-ng-2.ttl
- { ?b dc:title ?title }
-}
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT ?title
+{
+ GRAPH :ds-ng-2.ttl
+ { ?b dc:title ?title }
+}
diff --git a/content/tutorials/sparql_data/q-ds-4.rq
b/content/tutorials/sparql_data/q-ds-4.rq
index 47bd718..7a3c191 100644
--- a/content/tutorials/sparql_data/q-ds-4.rq
+++ b/content/tutorials/sparql_data/q-ds-4.rq
@@ -1,10 +1,10 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT ?date ?title
-{
- ?g dc:date ?date . FILTER (?date > "2005-08-01T00:00:00Z"^^xsd:dateTime )
- GRAPH ?g
- { ?b dc:title ?title }
-}
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT ?date ?title
+{
+ ?g dc:date ?date . FILTER (?date > "2005-08-01T00:00:00Z"^^xsd:dateTime )
+ GRAPH ?g
+ { ?b dc:title ?title }
+}
diff --git a/content/tutorials/sparql_data/q-ds-5.rq
b/content/tutorials/sparql_data/q-ds-5.rq
index 096ccbb..3b9a31c 100644
--- a/content/tutorials/sparql_data/q-ds-5.rq
+++ b/content/tutorials/sparql_data/q-ds-5.rq
@@ -1,11 +1,11 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT *
-FROM <ds-dft.ttl>
-FROM NAMED <ds-ng-1.ttl>
-FROM NAMED <ds-ng-2.ttl>
-{
- { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
-}
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT *
+FROM <ds-dft.ttl>
+FROM NAMED <ds-ng-1.ttl>
+FROM NAMED <ds-ng-2.ttl>
+{
+ { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
+}
diff --git a/content/tutorials/sparql_data/q-f1.rq
b/content/tutorials/sparql_data/q-f1.rq
index 23dc333..6389303 100644
--- a/content/tutorials/sparql_data/q-f1.rq
+++ b/content/tutorials/sparql_data/q-f1.rq
@@ -1,6 +1,6 @@
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?g
-WHERE
- { ?y vcard:Given ?g . FILTER regex(?g, "r", "i") }
-
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?g
+WHERE
+ { ?y vcard:Given ?g . FILTER regex(?g, "r", "i") }
+
diff --git a/content/tutorials/sparql_data/q-f2.rq
b/content/tutorials/sparql_data/q-f2.rq
index 41be169..0437a26 100644
--- a/content/tutorials/sparql_data/q-f2.rq
+++ b/content/tutorials/sparql_data/q-f2.rq
@@ -1,8 +1,8 @@
-PREFIX info: <http://somewhere/peopleInfo#>
-
-SELECT ?resource
-WHERE
- {
- ?resource info:age ?age .
- FILTER (?age >= 24)
- }
+PREFIX info: <http://somewhere/peopleInfo#>
+
+SELECT ?resource
+WHERE
+ {
+ ?resource info:age ?age .
+ FILTER (?age >= 24)
+ }
diff --git a/content/tutorials/sparql_data/q-opt1.rq
b/content/tutorials/sparql_data/q-opt1.rq
index d2cf0e7..83c9c5d 100644
--- a/content/tutorials/sparql_data/q-opt1.rq
+++ b/content/tutorials/sparql_data/q-opt1.rq
@@ -1,10 +1,10 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- OPTIONAL { ?person info:age ?age }
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ OPTIONAL { ?person info:age ?age }
}
\ No newline at end of file
diff --git a/content/tutorials/sparql_data/q-opt2.rq
b/content/tutorials/sparql_data/q-opt2.rq
index 9283513..9243ee7 100644
--- a/content/tutorials/sparql_data/q-opt2.rq
+++ b/content/tutorials/sparql_data/q-opt2.rq
@@ -1,10 +1,10 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- ?person info:age ?age .
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ ?person info:age ?age .
}
\ No newline at end of file
diff --git a/content/tutorials/sparql_data/q-opt3.rq
b/content/tutorials/sparql_data/q-opt3.rq
index a66ee14..4e75ecf 100644
--- a/content/tutorials/sparql_data/q-opt3.rq
+++ b/content/tutorials/sparql_data/q-opt3.rq
@@ -1,10 +1,10 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- OPTIONAL { ?person info:age ?age . FILTER ( ?age > 24 ) }
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ OPTIONAL { ?person info:age ?age . FILTER ( ?age > 24 ) }
}
\ No newline at end of file
diff --git a/content/tutorials/sparql_data/q-opt4.rq
b/content/tutorials/sparql_data/q-opt4.rq
index ad5f881..13b2300 100644
--- a/content/tutorials/sparql_data/q-opt4.rq
+++ b/content/tutorials/sparql_data/q-opt4.rq
@@ -1,11 +1,11 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- OPTIONAL { ?person info:age ?age . }
- FILTER ( !bound(?age) || ?age > 24 )
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ OPTIONAL { ?person info:age ?age . }
+ FILTER ( !bound(?age) || ?age > 24 )
}
\ No newline at end of file
diff --git a/content/tutorials/sparql_data/q-union1.rq
b/content/tutorials/sparql_data/q-union1.rq
index 6a71e45..de8e17e 100644
--- a/content/tutorials/sparql_data/q-union1.rq
+++ b/content/tutorials/sparql_data/q-union1.rq
@@ -1,8 +1,8 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name
-WHERE
-{
- { [] foaf:name ?name } UNION { [] vCard:FN ?name }
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name
+WHERE
+{
+ { [] foaf:name ?name } UNION { [] vCard:FN ?name }
+}
diff --git a/content/tutorials/sparql_data/q-union1alt.rq
b/content/tutorials/sparql_data/q-union1alt.rq
index 261f35d..8a341df 100644
--- a/content/tutorials/sparql_data/q-union1alt.rq
+++ b/content/tutorials/sparql_data/q-union1alt.rq
@@ -1,9 +1,9 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name
-WHERE
-{
- [] ?p ?name
- FILTER (?p = foaf:name || ?p = vCard:FN)
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name
+WHERE
+{
+ [] ?p ?name
+ FILTER (?p = foaf:name || ?p = vCard:FN)
+}
diff --git a/content/tutorials/sparql_data/q-union2.rq
b/content/tutorials/sparql_data/q-union2.rq
index c60e866..829689c 100644
--- a/content/tutorials/sparql_data/q-union2.rq
+++ b/content/tutorials/sparql_data/q-union2.rq
@@ -1,8 +1,8 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name1 ?name2
-WHERE
-{
- { [] foaf:name ?name1 } UNION { [] vCard:FN ?name2 }
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name1 ?name2
+WHERE
+{
+ { [] foaf:name ?name1 } UNION { [] vCard:FN ?name2 }
+}
diff --git a/content/tutorials/sparql_data/q-union3.rq
b/content/tutorials/sparql_data/q-union3.rq
index 355fbbe..8b33dc3 100644
--- a/content/tutorials/sparql_data/q-union3.rq
+++ b/content/tutorials/sparql_data/q-union3.rq
@@ -1,10 +1,10 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name1 ?name2
-WHERE
-{
- ?x a foaf:Person
- OPTIONAL { ?x foaf:name ?name1 }
- OPTIONAL { ?x vCard:FN ?name2 }
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name1 ?name2
+WHERE
+{
+ ?x a foaf:Person
+ OPTIONAL { ?x foaf:name ?name1 }
+ OPTIONAL { ?x vCard:FN ?name2 }
+}
diff --git a/content/tutorials/sparql_data/q1.rq
b/content/tutorials/sparql_data/q1.rq
index 0509244..fe5a103 100644
--- a/content/tutorials/sparql_data/q1.rq
+++ b/content/tutorials/sparql_data/q1.rq
@@ -1,4 +1,4 @@
-SELECT ?x
-WHERE
- { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> "John Smith" }
-
+SELECT ?x
+WHERE
+ { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> "John Smith" }
+
diff --git a/content/tutorials/sparql_data/vc-db-3.ttl
b/content/tutorials/sparql_data/vc-db-3.ttl
index 3c8519b..be35504 100644
--- a/content/tutorials/sparql_data/vc-db-3.ttl
+++ b/content/tutorials/sparql_data/vc-db-3.ttl
@@ -1,15 +1,15 @@
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix vcard: <http://www.w3.org/2001/vcard-rdf/3.0#> .
-
-_:a a foaf:Person ;
- foaf:name "Matt Jones" .
-
-_:b a foaf:Person ;
- foaf:name "Sarah Jones" .
-
-_:c a foaf:Person ;
- vcard:FN "Becky Smith" .
-
-_:d a foaf:Person ;
- vcard:FN "John Smith" .
-
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix vcard: <http://www.w3.org/2001/vcard-rdf/3.0#> .
+
+_:a a foaf:Person ;
+ foaf:name "Matt Jones" .
+
+_:b a foaf:Person ;
+ foaf:name "Sarah Jones" .
+
+_:c a foaf:Person ;
+ vcard:FN "Becky Smith" .
+
+_:d a foaf:Person ;
+ vcard:FN "John Smith" .
+
