litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.7' into develop

Browse source
This commit is contained in:
Jim Blake 2014-06-27 14:31:36 -04:00
commit 1baf710499
1 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
webapp/web/admin/sparql.jsp
View file

@ -71,35 +71,25 @@ td {
Format for SELECT query results: Format for SELECT query results:
</h3> </h3>
<input id='RS_XML_BUTTON' type='radio' name='resultFormat' <input id='RS_XML_BUTTON' type='radio' name='resultFormat'
value='RS_XML'> value='application/sparql-results+xml'>
<label for='RS_XML_BUTTON'> <label for='RS_XML_BUTTON'>
RS_XML RS_XML
</label> </label>
<input id='RS_TEXT_BUTTON' type='radio' name='resultFormat' <input id='RS_TEXT_BUTTON' type='radio' name='resultFormat'
value='RS_TEXT' checked='checked'> value='text/plain' checked='checked'>
<label for='RS_TEXT_BUTTON'> <label for='RS_TEXT_BUTTON'>
RS_TEXT RS_TEXT
</label> </label>
<input id='RS_CSV_BUTTON' type='radio' name='resultFormat' <input id='RS_CSV_BUTTON' type='radio' name='resultFormat'
value='vitro:csv'> value='text/csv'>
<label for='RS_CSV_BUTTON'> <label for='RS_CSV_BUTTON'>
CSV CSV
</label> </label>
<input id='RS_RDF_N3_BUTTON' type='radio' name='resultFormat'
value='RS_RDF/N3'>
<label for='RS_RDF_N3_BUTTON'>
RS_RDF/N3
</label>
<input id='RS_JSON_BUTTON' type='radio' name='resultFormat' <input id='RS_JSON_BUTTON' type='radio' name='resultFormat'
value='RS_JSON'> value='application/sparql-results+json'>
<label for='RS_JSON_BUTTON'> <label for='RS_JSON_BUTTON'>
RS_JSON RS_JSON
</label> </label>
<input id='RS_RDF_BUTTON' type='radio' name='resultFormat'
value='RS_RDF'>
<label for='RS_RDF_BUTTON'>
RS_RDF
</label>
</p> </p>
<p> <p>
@ -107,27 +97,22 @@ td {
Format for CONSTRUCT and DESCRIBE query results: Format for CONSTRUCT and DESCRIBE query results:
</h3> </h3>
<input id='RR_RDFXML_BUTTON' type='radio' name='rdfResultFormat' <input id='RR_RDFXML_BUTTON' type='radio' name='rdfResultFormat'
value='RDF/XML'> value='application/rdf+xml'>
<label for='RR_RDFXML_BUTTON'> <label for='RR_RDFXML_BUTTON'>
RDF/XML RDF/XML
</label> </label>
<input id='RR_RDFXMLABBREV_BUTTON' type='radio'
name='rdfResultFormat' value='RDF/XML-ABBREV' checked='checked'>
<label for='RR_RDFXMLABBREV_BUTTON'>
RDF/XML-ABBREV
</label>
<input id='RR_N3_BUTTON' type='radio' name='rdfResultFormat' <input id='RR_N3_BUTTON' type='radio' name='rdfResultFormat'
value='N3'> value='text/n3'>
<label for='RR_N3_BUTTON'> <label for='RR_N3_BUTTON'>
N3 N3
</label> </label>
<input id='RR_NTRIPLE_BUTTON' type='radio' name='rdfResultFormat' <input id='RR_NTRIPLE_BUTTON' type='radio' name='rdfResultFormat'
value='N-TRIPLE'> value='text/plain'>
<label for='RR_NTRIPLE_BUTTON'> <label for='RR_NTRIPLE_BUTTON'>
N-Triples N-Triples
</label> </label>
<input id='RR_TURTLE_BUTTON' type='radio' name='rdfResultFormat' <input id='RR_TURTLE_BUTTON' type='radio' name='rdfResultFormat'
value='TTL'> value='text/turtle'>
<label for='RR_TURTLE_BUTTON'> <label for='RR_TURTLE_BUTTON'>
Turtle Turtle
</label> </label>