Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[8713] branches/BIGDATA_RELEASE_1_4_0
|
From: <tho...@us...> - 2014-11-17 18:40:05
|
Revision: 8713
http://sourceforge.net/p/bigdata/code/8713
Author: thompsonbry
Date: 2014-11-17 18:39:34 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Merging in fixes for RDR support in the workbench.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_4_0/.classpath
branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/css/style.css
branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/index.html
branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/js/workbench.js
branches/BIGDATA_RELEASE_1_4_0/build.xml
Modified: branches/BIGDATA_RELEASE_1_4_0/.classpath
===================================================================
--- branches/BIGDATA_RELEASE_1_4_0/.classpath 2014-11-17 14:40:18 UTC (rev 8712)
+++ branches/BIGDATA_RELEASE_1_4_0/.classpath 2014-11-17 18:39:34 UTC (rev 8713)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.7.13-onejar.jar"/>
<classpathentry kind="src" path="bigdata/src/java"/>
<classpathentry kind="src" path="bigdata-rdf/src/java"/>
<classpathentry kind="src" path="bigdata-sails/src/java"/>
@@ -98,6 +99,5 @@
<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.7.13.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.7.13.jar" sourcepath="/Users/mikepersonick/.m2/repository/org/openrdf/sesame/sesame-sparql-testsuite/2.7.13/sesame-sparql-testsuite-2.7.13-sources.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.7.13.jar"/>
- <classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.7.13-onejar.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/css/style.css
===================================================================
--- branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/css/style.css 2014-11-17 14:40:18 UTC (rev 8712)
+++ branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/css/style.css 2014-11-17 18:39:34 UTC (rev 8713)
@@ -153,6 +153,13 @@
overflow-x: scroll;
}
+.error-box {
+ margin: 20px;
+ overflow-x: scroll;
+ font-family: monospace;
+ white-space: pre;
+}
+
.box:last-of-type {
}
Modified: branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/index.html
===================================================================
--- branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/index.html 2014-11-17 14:40:18 UTC (rev 8712)
+++ branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/index.html 2014-11-17 18:39:34 UTC (rev 8713)
@@ -59,12 +59,14 @@
<select id="rdf-type" disabled>
<option value="n-quads">N-Quads</option>
<option value="n-triples">N-Triples</option>
+ <option value="n-triples-RDR">N-Triples-RDR</option>
<option value="n3">Notation3</option>
<option value="rdf/xml">RDF/XML</option>
<option value="json">JSON</option>
<option value="trig">TriG</option>
<option value="trix">TriX</option>
<option value="turtle">Turtle</option>
+ <option value="turtle-RDR">Turtle-RDR</option>
</select>
</p>
<a href="#" class="advanced-features-toggle">Advanced features</a>
@@ -78,7 +80,7 @@
</div>
- <div class="box" id="update-response">
+ <div class="error-box" id="update-response">
<span></span>
<iframe name="update-response-container"></iframe>
</div>
@@ -124,7 +126,7 @@
</div>
- <div id="query-response" class="box">
+ <div id="query-response" class="error-box">
</div>
<div id="query-pagination" class="box">
Modified: branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/js/workbench.js 2014-11-17 14:40:18 UTC (rev 8712)
+++ branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/js/workbench.js 2014-11-17 18:39:34 UTC (rev 8713)
@@ -18,9 +18,11 @@
// key is value of RDF type selector, value is name of CodeMirror mode
var RDF_MODES = {
'n-triples': 'ntriples',
+ 'n-triples-RDR': 'ntriples-RDR',
'rdf/xml': 'xml',
'json': 'json',
- 'turtle': 'turtle'
+ 'turtle': 'turtle',
+ 'turtle-RDR': 'turtle'
};
var FILE_CONTENTS = null;
// file/update editor type handling
@@ -29,6 +31,7 @@
var RDF_TYPES = {
'nq': 'n-quads',
'nt': 'n-triples',
+ 'ntx': 'n-triples-RDR',
'n3': 'n3',
'rdf': 'rdf/xml',
'rdfs': 'rdf/xml',
@@ -38,17 +41,20 @@
'trig': 'trig',
'trix': 'trix',
//'xml': 'trix',
- 'ttl': 'turtle'
+ 'ttl': 'turtle',
+ 'ttlx': 'turtle-RDR'
};
var RDF_CONTENT_TYPES = {
'n-quads': 'text/x-nquads',
'n-triples': 'text/plain',
+ 'n-triples-RDR': 'application/x-n-triples-RDR',
'n3': 'text/rdf+n3',
'rdf/xml': 'application/rdf+xml',
'json': 'application/sparql-results+json',
'trig': 'application/x-trig',
'trix': 'application/trix',
- 'turtle': 'application/x-turtle'
+ 'turtle': 'application/x-turtle',
+ 'turtle-RDR': 'application/x-turtle-RDR'
};
var SPARQL_UPDATE_COMMANDS = [
'INSERT',
@@ -104,7 +110,9 @@
var EXPORT_EXTENSIONS = {
'application/rdf+xml': ['RDF/XML', 'rdf', true],
'application/n-triples': ['N-Triples', 'nt', true],
+ 'application/x-n-triples-RDR': ['N-Triples-RDR', 'ntx', true],
'application/x-turtle': ['Turtle', 'ttl', true],
+ 'application/x-turtle-RDR': ['Turtle-RDR', 'ttlx', true],
'text/rdf+n3': ['N3', 'n3', true],
'application/trix': ['TriX', 'trix', true],
'application/x-trig': ['TRIG', 'trig', true],
@@ -783,6 +791,7 @@
if(jqXHR.status === 0) {
message += 'Could not contact server';
} else {
+ var response = $('<div>').append(jqXHR.responseText);
if(response.find('pre').length === 0) {
message += response.text();
} else {
@@ -917,7 +926,7 @@
var settings = {
type: 'POST',
data: $('#query-form').serialize(),
- headers: { 'Accept': 'application/sparql-results+json, application/rdf+xml' },
+ headers: { 'Accept': 'application/sparql-results+json' },
success: showQueryResults,
error: queryResultsError
};
@@ -1737,7 +1746,7 @@
/* Utility functions */
function getSID(binding) {
- return '<<\n ' + abbreviate(binding.value.s.value) + '\n ' + abbreviate(binding.value.p.value) + '\n ' + abbreviate(binding.value.o.value) + '\n>>';
+ return '<<\n ' + abbreviate(binding.subject.value) + '\n ' + abbreviate(binding.predicate.value) + '\n ' + abbreviate(binding.object.value) + '\n>>';
}
function abbreviate(uri) {
Modified: branches/BIGDATA_RELEASE_1_4_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_4_0/build.xml 2014-11-17 14:40:18 UTC (rev 8712)
+++ branches/BIGDATA_RELEASE_1_4_0/build.xml 2014-11-17 18:39:34 UTC (rev 8713)
@@ -75,11 +75,12 @@
</path>
<!-- runtime classpath w/o install. -->
- <path id="runtime.classpath">
- <pathelement location="${build.dir}/classes" />
- <path refid="build.classpath" />
+ <path id="runtime.classpath">
+ <fileset file="${bigdata.dir}/bigdata-rdf/lib/openrdf-sesame-${sesame.version}-onejar.jar"/>
+ <pathelement location="${build.dir}/classes" />
+ <path refid="build.classpath" />
</path>
-
+
<!-- classpath as installed. -->
<!-- @todo .so and .dll -->
<path id="install.classpath">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
