Skip to content

Commit fde3730

Browse files
danbriDataliberate
danbri
and
Dataliberate
authored
move V6 patch and medical, usageinfo drafts into master (#2456)
* Reinstated 301 redirect to https * Fixed typo: Recommendation not Recommended. * Add in tweaks to OPTIONS request response headers * Drafting implementation of MediaReview for discussion. /cc #2450 * Updated mediaAuthenticityCategory label. * Added disclaimer. /cc #2450 * updated so that label matches id. * usageInfo and acquireLicensePage properties #2454 Co-authored-by: Richard Wallis <rjw@dataliberate.com>
1 parent cb89228 commit fde3730

File tree

6 files changed

+280
-2
lines changed

6 files changed

+280
-2
lines changed

‎data/ext/pending/issue-2450.rdfa‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<div>
2+
3+
<div typeof="rdfs:Class" resource="http://schema.org/MediaReview">
4+
<span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Review">Review</a></span>
5+
<span class="h" property="rdfs:label">MediaReview</span>
6+
<span property="rdfs:comment">(editorial work in progress, this definition is incomplete and unreviewed)
7+
A [[MediaReview]] is a more specialized form of Review dedicated to the evaluation of media content online, typically in the context of fact-checking and misinformation.
8+
For more general reviews of media in the broader sense, use [[UserReview]], [[CriticReview]] or other [[Review]] types.</span>
9+
<span property="schema:category">issue-2450</span>
10+
<a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a>
11+
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
12+
</div>
13+
14+
<!--
15+
how do we point to the /itemReviewed vs it has a /review property -->
16+
in ClaimReview we use .itemReviewed pointing to a /Claim here, should we point to the VideoObject or the page that embeds it?
17+
we want to point to these for each MediaObject: URL(s) + Original Media URL(s) + Original Media Context
18+
MediaObject has /contentUrl
19+
(we wouldn't use /mainEntity or /mainEntityOfPage because the video is no being described).
20+
-->
21+
22+
23+
<div typeof="rdfs:Class" resource="http://schema.org/MediaManipulationRatingEnumeration">
24+
<span>Category: <span property="schema:category">issue-2450</span></span>
25+
<span class="h" property="rdfs:label">MediaManipulationRatingEnumeration</span>
26+
<span property="rdfs:comment">(editorial work in progress, this definition is incomplete and unreviewed) MediaManipulationRatingEnumeration classifies a number of ways in which a media item (video, image, audio) can be manipulated, taking into account the context within which they are published or presented.</span>
27+
<span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Enumeration">Enumeration</a></span>
28+
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
29+
<span>Source: <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
30+
</div>
31+
32+
33+
34+
<div typeof="http://schema.org/MediaManipulationRatingEnumeration" resource="http://schema.org/AuthenticContent">
35+
<span>Category: <span property="schema:category">issue-2450</span></span>
36+
<span class="h" property="rdfs:label">AuthenticContent</span>
37+
<span property="rdfs:comment">AuthenticMediaObject: An unaltered image that is presented in an accurate way.</span>
38+
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
39+
<span>Source: <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
40+
</div>
41+
<div typeof="http://schema.org/MediaManipulationRatingEnumeration" resource="http://schema.org/MissingContext">
42+
<span>Category: <span property="schema:category">issue-2450</span></span>
43+
<span class="h" property="rdfs:label">MissingContext</span>
44+
<span property="rdfs:comment">MissingContext: ...</span>
45+
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
46+
<span>Source: <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
47+
</div>
48+
49+
<!-- todo: Cropped, Transformed, Image Macro, Edited -->
50+
<!-- do we have a code for AuthenticVideo AuthenticImage AuthenticXyz etc? -->
51+
52+
<div typeof="rdf:Property" resource="http://schema.org/mediaAuthenticityCategory">
53+
<span>Category: <span property="schema:category">issue-2450</span></span>
54+
<span class="h" property="rdfs:label">mediaAuthenticityCategory</span>
55+
<span property="rdfs:comment">Indicates a MediaManipulationRatingEnumeration classification of a media object (in the context of how it was published or shared).</span>
56+
<span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/MediaReview">MediaReview</a></span>
57+
<span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/MediaManipulationRatingEnumeration">MediaManipulationRatingEnumeration</a></span>
58+
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
59+
<span>Source: <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
60+
</div>
61+
62+
</div>

‎data/ext/pending/issue-2454.rdfa‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<div>
2+
3+
<div typeof="rdf:Property" resource="http://schema.org/usageInfo">
4+
<span class="h" property="rdfs:label">usageInfo</span>
5+
<span property="rdfs:comment">The schema.org [[usageInfo]] property indicates further information about a [[CreativeWork]]. This property is applicable both to works that are freely available and to those that require payment or other transactions. It can reference additional information e.g. community expectations on preferred linking and citation conventions, as well as purchasing details. For something that can be commercially licensed, usageInfo can provide detailed, resource-specific information about licensing options.
6+
7+
This property can be used alongside the license property which indicates license(s) applicable to some piece of content. The usageInfo property can provide information about other licensing options, e.g. acquiring commercial usage rights for an image that is also available under non-commercial creative commons licenses.</span>
8+
<span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
9+
<span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
10+
<span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/URL">URL</a></span>
11+
<span>Category: <span property="schema:category">issue-2454</span></span>
12+
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
13+
<span>Source: <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2454">#2454</a></span>
14+
</div>
15+
16+
<div typeof="rdf:Property" resource="http://schema.org/acquireLicensePage">
17+
<span class="h" property="rdfs:label">acquireLicensePage</span>
18+
<span property="rdfs:comment">Indicates a page documenting how licenses can be purchased or otherwise acquired, for the current item.</span>
19+
<span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
20+
<span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
21+
<span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/URL">URL</a></span>
22+
<span>Category: <span property="schema:category">issue-2454</span></span>
23+
issue-894.rdfa: <link property="rdfs:subPropertyOf" href="http://schema.org/usageInfo" />
24+
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
25+
<span>Source: <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2454">#2454</a></span>
26+
</div>
27+
28+
</div>

‎handlers-secure.yaml‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
2+
handlers:
3+
4+
- url: /robots.txt
5+
static_files: site/docs/robots.txt
6+
upload: site/docs/robots.txt
7+
application_readable: True
8+
mime_type: text/plain
9+
secure: always
10+
redirect_http_response_code: 301
11+
12+
13+
- url: /favicon.ico
14+
static_files: site/docs/favicon.ico
15+
upload: site/docs/favicon.ico
16+
application_readable: True
17+
mime_type: image/x-icon
18+
secure: always
19+
redirect_http_response_code: 301
20+
21+
22+
# To avoid: "Could not guess mimetype for docs/schemaorg.owl. Using application/octet-stream."
23+
- url: /docs/schema_org_rdfa.html
24+
static_files: site/data/schema.rdfa
25+
upload: site/data/schema.rdfa
26+
application_readable: True
27+
mime_type: text/html
28+
secure: always
29+
redirect_http_response_code: 301
30+
31+
- url: /docs/jsonldcontext.json.*
32+
script: sdoapp.app
33+
secure: always
34+
redirect_http_response_code: 301
35+
36+
- url: /docs/full.*.html
37+
script: sdoapp.app
38+
secure: always
39+
redirect_http_response_code: 301
40+
41+
- url: /docs/schemas.html
42+
script: sdoapp.app
43+
secure: always
44+
redirect_http_response_code: 301
45+
46+
- url: /docs/developers.html
47+
script: sdoapp.app
48+
secure: always
49+
redirect_http_response_code: 301
50+
51+
- url: /docs/tree.json.*
52+
script: sdoapp.app
53+
secure: always
54+
redirect_http_response_code: 301
55+
56+
- url: /admin/refresh
57+
login: required
58+
script: sdoapp.app
59+
secure: always
60+
redirect_http_response_code: 301
61+
62+
# Use for /docs when PAGESTOREMODE not set to CLOUDSTORE
63+
#- url: /docs
64+
#static_dir: docs
65+
#application_readable: True
66+
67+
# Use for /docs when PAGESTOREMODE set to CLOUDSTORE
68+
- url: /docs
69+
script: sdoapp.app
70+
secure: always
71+
redirect_http_response_code: 301
72+
73+
- url: /admin
74+
static_dir: admin
75+
application_readable: True
76+
secure: always
77+
redirect_http_response_code: 301
78+
79+
#- url: /
80+
# static_files: static/index.html
81+
# upload: static/index.html
82+
# application_readable: True
83+
84+
- url: /search_files
85+
static_dir: static/search_files
86+
secure: always
87+
redirect_http_response_code: 301
88+
89+
- url: /version/latest/.*
90+
script: sdoapp.app
91+
secure: always
92+
redirect_http_response_code: 301
93+
94+
- url: /(version/[^/]*/)$
95+
script: sdoapp.app
96+
secure: always
97+
redirect_http_response_code: 301
98+
99+
- url: /(version/([^/]*))$
100+
script: sdoapp.app
101+
secure: always
102+
redirect_http_response_code: 301
103+
104+
- url: /version/
105+
script: sdoapp.app
106+
secure: always
107+
redirect_http_response_code: 301
108+
109+
- url: /version/(.*/.*\.rdfa)
110+
mime_type: text/html
111+
static_files: site/data/releases/\1
112+
upload: site/data/releases/(.*/.*\.rdfa)
113+
application_readable: True
114+
secure: always
115+
redirect_http_response_code: 301
116+
117+
- url: /version/(.*/.*\.ttl)
118+
mime_type: application/x-turtle
119+
static_files: site/data/releases/\1
120+
upload: site/data/releases/(.*/.*\.ttl)
121+
application_readable: True
122+
secure: always
123+
redirect_http_response_code: 301
124+
125+
- url: /version/(.*/.*\.jsonld)
126+
mime_type: application/ld+json
127+
static_files: site/data/releases/\1
128+
upload: site/data/releases/(.*/.*\.jsonld)
129+
application_readable: True
130+
secure: always
131+
redirect_http_response_code: 301
132+
133+
- url: /version/(.*/.*\.rdf)
134+
mime_type: application/rdf+xml
135+
static_files: site/data/releases/\1
136+
upload: site/data/releases/(.*/.*\.rdf)
137+
application_readable: True
138+
secure: always
139+
redirect_http_response_code: 301
140+
141+
- url: /version/(.*/.*\.nt)
142+
mime_type: application/n-triples
143+
static_files: site/data/releases/\1
144+
upload: site/data/releases/(.*/.*\.nt)
145+
application_readable: True
146+
secure: always
147+
redirect_http_response_code: 301
148+
149+
- url: /version/(.*/.*\.nq)
150+
mime_type: application/n-quads
151+
static_files: site/data/releases/\1
152+
upload: site/data/releases/(.*/.*\.nq)
153+
application_readable: True
154+
secure: always
155+
redirect_http_response_code: 301
156+
157+
- url: /version/(.*/.*\.csv)
158+
mime_type: text/csv
159+
static_files: site/data/releases/\1
160+
upload: site/data/releases/(.*/.*\.csv)
161+
application_readable: True
162+
secure: always
163+
redirect_http_response_code: 301
164+
165+
- url: /version/*/*
166+
static_dir: site/data/releases/
167+
application_readable: True
168+
secure: always
169+
redirect_http_response_code: 301
170+
171+
- url: /.*
172+
script: sdoapp.app
173+
secure: always
174+
redirect_http_response_code: 301
175+
176+

‎runpythonpostprepare.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ set -u
55
PWD="`pwd`"
66
PROG="`basename $0`"
77

8+
9+
if [ ${SECUREHTTP+"false"} ] #If $SECUREHTTP is set, use the handlers-secure.yaml
10+
then
11+
echo "$PROG: Copying handlers-secure.yaml to handlers.yaml - https 301 redirect"
12+
cp ./handlers-secure.yaml sdopythonapp/site/handlers.yaml
13+
else
14+
echo "$PROG: Copying handlers.yaml to handlers.yaml - http or https"
15+
cp ./handlers.yaml sdopythonapp/site/handlers.yaml
16+
fi
17+
echo
18+
819
if [ -d "sdopythonapp/site/docs" ] #If we have a local fileset to play with (ie. Not remote)
920
then
1021
echo
@@ -17,4 +28,4 @@ then
1728
cp docs/robots.txt sdopythonapp/site/docs/robots.txt
1829
fi
1930
echo
20-
fi
31+
fi

‎scripts/deployschema.org.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@ then
5757
fi
5858

5959

60+
export SECUREHTTP="YES" #ensure we end up with a handlers.yaml with https redirects
6061
sdopythonapp/runscripts/runpythondeploy.sh $EXE $MIG -p schemaorgae -y schemaorg.yaml
6162

‎sdopythonapp‎

0 commit comments

Comments
 (0)