cluster_search_ui/commit

Made pengine addresses relative.

authorChris Dijkshoorn
Tue Feb 24 10:47:52 2015 +0000
committerChris Dijkshoorn
Tue Feb 24 10:47:52 2015 +0000
commitcfd71ada1375deb651ea40be4a1c8d3664ecea8e
tree931df71bfe692be83e7a2cf9cb764c7f0ef1d030
parent13f912ded2cd6ed733a1728bd6f44640d99e8c13
Diff style: patch stat
diff --git a/web/js/result.js b/web/js/result.js
index 60a428c..8956bae 100644
--- a/web/js/result.js
+++ b/web/js/result.js
@@ -3,15 +3,7 @@
 */
 displayOptions = {
 	showAnnotations: true,
-}
-
-itemServer = {
-	location: getServerItemUrl()
-}
-
-function getServerItemUrl() {
-	var urlParts = document.location.href.split("item");
-	return urlParts[0];
+	metadataLinkBase: 'results?query='
 }
 
 function showResult(uri) {
@@ -21,7 +13,7 @@ function showResult(uri) {
 
 function metadata(uri) {
 	// Get metadata from server
-	new Pengine({server: itemServer.location + 'pengine',
+	new Pengine({server: 'pengine',
 				application: 'enrichment',
 				ask: 'metadata(' + Pengine.stringify(uri, {string:'atom'}) + ', Metadata),!',
 				onsuccess: function () {
@@ -38,14 +30,12 @@ function metadataWell(data, uri) {
 	// First item is title, so start from 1
 	for(var i=1; i<metadata.properties.length; i++) {
 		html.appendChild(
-			$.el.dt(
-				$.el.a({'class':'r_def',
-					    'href':'results?query=' + metadata.properties[i].predicate_label},
-					metadata.properties[i].predicate_label)));
+			$.el.dt(metadata.properties[i].predicate_label));
 		html.appendChild(
 			$.el.dd(
 				$.el.a({'class':'r_undef',
-					    'href':'results?query=' + metadata.properties[i].object_label},
+					    'href':displayOptions.metadataLinkBase +
+							   metadata.properties[i].object_label},
 					metadata.properties[i].object_label)));
 	}
 	return html;
@@ -53,8 +43,7 @@ function metadataWell(data, uri) {
 
 function annotations(uri) {
 	// Get metadata from server
-	var pengineServer = itemServer.location + 'pengine';
-	new Pengine({server: pengineServer,
+	new Pengine({server: 'pengine',
 				application: 'enrichment',
 				ask: 'object_annotations(' + Pengine.stringify(uri, {string:'atom'}) + ', Annotations),!',
 				onsuccess: function () {