Author: buildbot
Date: Tue Sep 2 07:25:05 2014
New Revision: 920997
Log:
Staging update by buildbot for jena
Modified:
websites/staging/jena/trunk/content/ (props changed)
websites/staging/jena/trunk/content/documentation/io/index.html
websites/staging/jena/trunk/content/documentation/io/rdf-input.html
websites/staging/jena/trunk/content/documentation/io/rdf-output.html
Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 2 07:25:05 2014
@@ -1 +1 @@
-1621697
+1621941
Modified: websites/staging/jena/trunk/content/documentation/io/index.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/io/index.html (original)
+++ websites/staging/jena/trunk/content/documentation/io/index.html Tue Sep 2
07:25:05 2014
@@ -164,14 +164,18 @@ can be integrated into both the parser a
<li>RDF/JSON</li>
<li>TriG</li>
<li>N-Quads</li>
+<li>RDF Thrift</li>
</ul>
-<p>RDF/JSON is not JSON-LD - it is a direct encoding of RDF triples in JSON.
+<p>RDF/JSON is different from JSON-LD - it is a direct encoding of RDF triples
in JSON.
See the <a href="rdf-json.html">description of RDF/JSON</a>.</p>
+<p>RDF Thrift is a binary encoding of RDF (graphs and datasets) that can be
useful
+for fast parsing. See the
+<a href="http://afs.github.io/rdf-thrift";>description of RDF Thrift</a>.</p>
<h2 id="command-line-tools">Command line tools</h2>
<p>There are scripts in Jena download to run these commands.</p>
<ul>
<li><code>riot</code> - parse, guessing the syntax from the file extension.
- Assumed N-Quads/N-Triples from stdin.</li>
+ Assumes N-Quads/N-Triples from stdin.</li>
<li><code>turtle</code>, <code>ntriples</code>, <code>nquads</code>,
<code>trig</code>, <code>rdfxml</code> - parse a particular language</li>
</ul>
<p>These can be called directly as Java programs:</p>
@@ -213,6 +217,14 @@ See the <a href="rdf-json.html">descript
<td>JSON-LD</td>
</tr>
<tr>
+<td><code>.trdf</code></td>
+<td>RDF Thrift</td>
+</tr>
+<tr>
+<td><code>.rt</code></td>
+<td>RDF Thrift</td>
+</tr>
+<tr>
<td><code>.rj</code></td>
<td>RDF/JSON</td>
</tr>
@@ -227,13 +239,17 @@ example, <code>.nt.gz</code> is gzip com
</pre></div>
+<p>This can be a mixture of files in difefrent syntaxes when file extensiosn
+are used to determine the file syntax type.</p>
<p>The scripts all accept the same arguments (type <code>"riot --help"</code>
to
get command line reminders):</p>
<ul>
-<li><code>--validate</code>: Checking mode: same as <code>--strict --sink
--check=true</code></li>
+<li><code>--syntax=NAME</code>; Explicitly set the input syntax for all
files.</li>
+<li><code>--validate</code>: Checking mode: same as <code>--strict --sink
--check=true</code>.</li>
<li><code>--check=true/false</code>: Run with checking of literals and IRIs
either on or off.</li>
-<li><code>--sink</code>: No output of triples or quads.</li>
+<li><code>--sink</code>: No output.</li>
<li><code>--time</code>: Output timing information.</li>
+<li><code>--out=FORMAT</code>: Output in a given syntax (this is streaming,
not pretty printing).</li>
</ul>
<p>To aid in checking for errors in UTF8-encoded files, there is a
utility which reads a file of bytes as UTF8 and checks the encoding.</p>
Modified: websites/staging/jena/trunk/content/documentation/io/rdf-input.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/io/rdf-input.html
(original)
+++ websites/staging/jena/trunk/content/documentation/io/rdf-input.html Tue Sep
2 07:25:05 2014
@@ -207,9 +207,65 @@ with no URI scheme is assumed to be a lo
</table>
<h3 id="determining-the-rdf-syntax">Determining the RDF syntax</h3>
<p>The syntax of the RDF file is determined by the content type (if an HTTP
-request), then the file extension if there is no content type (or it's
-<code>text/plain</code>), which is assumed to be type returned for an
unconfigured
+request), then the file extension if there is no content type. Content type
+<code>text/plain</code> is ignored; it is assumed to be type returned for an
unconfigured
http server. The application can also pass in a declared language hint.</p>
+<p>The string name traditionally used in <code>model.read</code> is mapped to
RIOT <code>Lang</code>
+as:</p>
+<table>
+<thead>
+<tr>
+<th>Jena reader</th>
+<th>RIOT Lang</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code>"TURTLE"</code></td>
+<td><code>TURTLE</code></td>
+</tr>
+<tr>
+<td><code>"TTL"</code></td>
+<td><code>TURTLE</code></td>
+</tr>
+<tr>
+<td><code>"Turtle"</code></td>
+<td><code>TURTLE</code></td>
+</tr>
+<tr>
+<td><code>"N-TRIPLES"</code></td>
+<td><code>NTRIPLES</code></td>
+</tr>
+<tr>
+<td><code>"N-TRIPLE"</code></td>
+<td><code>NTRIPLES</code></td>
+</tr>
+<tr>
+<td><code>"NT"</code></td>
+<td><code>NTRIPLES</code></td>
+</tr>
+<tr>
+<td><code>"RDF/XML"</code></td>
+<td><code>RDFXML</code></td>
+</tr>
+<tr>
+<td><code>"N3"</code></td>
+<td><code>N3</code></td>
+</tr>
+<tr>
+<td><code>"JSON-LD"</code></td>
+<td><code>JSONLD</code></td>
+</tr>
+<tr>
+<td><code>"RDF/JSON"</code></td>
+<td><code>RDFJSON</code></td>
+</tr>
+<tr>
+<td><code>"RDF/JSON"</code></td>
+<td><code>RDFJSON</code></td>
+</tr>
+</tbody>
+</table>
<p>The following is a suggested Apache httpd .htaccess file:</p>
<div class="codehilite"><pre><span class="n">AddType</span> <span
class="n">text</span><span class="o">/</span><span class="n">turtle</span>
<span class="p">.</span><span class="n">ttl</span>
<span class="n">AddType</span> <span class="n">application</span><span
class="o">/</span><span class="n">rdf</span><span class="o">+</span><span
class="n">xml</span> <span class="p">.</span><span class="n">rdf</span>
@@ -220,6 +276,7 @@ http server. The application can also pa
<span class="n">AddType</span> <span class="n">text</span><span
class="o">/</span><span class="n">trig</span> <span
class="p">.</span><span class="n">trig</span>
<span class="n">AddType</span> <span class="n">application</span><span
class="o">/</span><span class="n">n</span><span class="o">-</span><span
class="n">quads</span> <span class="p">.</span><span class="n">nq</span>
+<span class="n">AddType</span> <span class="n">application</span><span
class="o">/</span><span class="n">rdf</span><span class="o">+</span><span
class="n">thrift</span> <span class="p">.</span><span class="n">trdf</span>
</pre></div>
@@ -275,7 +332,7 @@ data:</p>
files. The default configuration used for the global
<code>StreamManager</code> is
a file access class, wihere the current directory is that of the java
process, a URL accessor for reading from the web, and a
-class laoder-based accessor. Different setups can be built and used
+class loader-based accessor. Different setups can be built and used
either as the global set up, </p>
<p>There is also a <code>LocationMapper</code> for rewiting file names and
URLs before
use to allow placing known names in different places (e.g. having local
Modified: websites/staging/jena/trunk/content/documentation/io/rdf-output.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/io/rdf-output.html
(original)
+++ websites/staging/jena/trunk/content/documentation/io/rdf-output.html Tue
Sep 2 07:25:05 2014
@@ -158,6 +158,7 @@ introduced in Jena 2.10.1.</p>
<li><a href="#streamed-block-formats">Streamed Block Formats</a></li>
<li><a href="#line-printed-formats">Line printed formats</a></li>
<li><a href="#n-triples-and-n-quads">N-Triples and N-Quads</a></li>
+<li><a href="#rdf-thrift">RDF Thrift</a></li>
<li><a href="#rdfxml">RDF/XML</a></li>
<li><a href="#examples">Examples</a></li>
<li><a href="#Notes">Notes</a></li>
@@ -195,6 +196,7 @@ are available as part of the standard se
<li>RDF/JSON</li>
<li>TriG</li>
<li>NQuads</li>
+<li>RDF Thrift</li>
</ul>
<p>In addition, there are variants of Trutle, TriG for pretty printing,
streamed output and flat output. RDF/XML has variants for pretty printing
@@ -261,6 +263,10 @@ as follows:</p>
<td><code>"RDF/JSON"</code></td>
<td><code>RDFJSON</code></td>
</tr>
+<tr>
+<td><code>"RDF/JSON"</code></td>
+<td><code>RDFJSON</code></td>
+</tr>
</tbody>
</table>
<h2 id="formats">Formats</h2>
@@ -307,6 +313,10 @@ an <code>RDFFormat</code> internally. T
<td>RDFJSON</td>
<td></td>
</tr>
+<tr>
+<td>RDFTHRFT</td>
+<td>RDF Thrift</td>
+</tr>
</tbody>
</table>
<p>Pretty printed RDF/XML is also known as RDF/XML-ABBREV</p>
@@ -529,6 +539,29 @@ in ASCII (using <code>\u</code> escape s
</tr>
</tbody>
</table>
+<h3 id="rdf-thrift">RDF Thrift</h3>
+<p>The <a href="http://afs.github.io/rdf-thrift";>RDF Thrift</a> format is a
binary encoding of RDF Graphs
+and RDF Datasets, as well as SPARQL Result Sets, that can provide efficient
parsing
+compared to the text-based standardised syntax such as N-triples, Turtle or
RDF/XML.</p>
+<table>
+<thead>
+<tr>
+<th>RDFFormat</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>RDFTHRIFT</td>
+</tr>
+<tr>
+<td>RDFTHRIFT_VALUES</td>
+</tr>
+</tbody>
+</table>
+<p><code>RDFTHRIFT_VALUES</code> is a variant where numeric values are written
as values,
+not as lexcial format and datatype. See the
+<a href="http://afs.github.io/rdf-thrift";>description of RDF Thrift</a>
+for details.</p>
<h3 id="rdfxml">RDF/XML</h3>
<p>RIOT supports output in RDF/XML. RIOT RDFFormats defaults to pretty printed
RDF/XML,
while the jena writer writer name defaults to a streaming plain output.</p>
