diff --git a/source/net/yacy/cora/lod/JenaTripleStore.java b/source/net/yacy/cora/lod/JenaTripleStore.java index e31c916b7..52ec77ff6 100644 --- a/source/net/yacy/cora/lod/JenaTripleStore.java +++ b/source/net/yacy/cora/lod/JenaTripleStore.java @@ -12,6 +12,10 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import net.yacy.cora.document.UTF8; +import net.yacy.cora.lod.vocabulary.Geo; +import net.yacy.cora.lod.vocabulary.HttpHeader; +import net.yacy.cora.lod.vocabulary.Tagging; +import net.yacy.cora.lod.vocabulary.YaCyMetadata; import net.yacy.kelondro.logging.Log; import net.yacy.search.Switchboard; @@ -27,6 +31,13 @@ import com.hp.hpl.jena.util.FileManager; public class JenaTripleStore { public static Model model = ModelFactory.createDefaultModel(); + static { + model.setNsPrefix(YaCyMetadata.PREFIX, YaCyMetadata.NAMESPACE); + model.setNsPrefix(Tagging.DEFAULT_PREFIX, Tagging.DEFAULT_NAMESPACE); + model.setNsPrefix(HttpHeader.PREFIX, HttpHeader.NAMESPACE); + model.setNsPrefix(Geo.PREFIX, Geo.NAMESPACE); + model.setNsPrefix("pnd", "http://dbpedia.org/ontology/individualisedPnd"); + } public static ConcurrentHashMap privatestorage = null; diff --git a/source/net/yacy/cora/lod/vocabulary/Geo.java b/source/net/yacy/cora/lod/vocabulary/Geo.java index 5088fa0a2..8bae85a7a 100644 --- a/source/net/yacy/cora/lod/vocabulary/Geo.java +++ b/source/net/yacy/cora/lod/vocabulary/Geo.java @@ -34,18 +34,18 @@ public enum Geo implements Vocabulary { Long, Lat; - public final static String IDENTIFIER = "http://www.w3.org/2003/01/geo/wgs84_pos#"; + public final static String NAMESPACE = "http://www.w3.org/2003/01/geo/wgs84_pos#"; public final static String PREFIX = "geo"; private final String predicate; private Geo() { - this.predicate = IDENTIFIER + this.name().toLowerCase(); + this.predicate = NAMESPACE + this.name().toLowerCase(); } @Override public String getURLStub() { - return IDENTIFIER; + return NAMESPACE; } @Override diff --git a/source/net/yacy/cora/lod/vocabulary/HttpHeader.java b/source/net/yacy/cora/lod/vocabulary/HttpHeader.java index 28f9d21e2..ea44d1663 100644 --- a/source/net/yacy/cora/lod/vocabulary/HttpHeader.java +++ b/source/net/yacy/cora/lod/vocabulary/HttpHeader.java @@ -86,18 +86,18 @@ public enum HttpHeader implements Vocabulary { via, // representing a Via header, warning; // representing a Warning header. - public final static String IDENTIFIER = "http://www.w3.org/WAI/ER/HTTP/WD-HTTP-in-RDF-20060131"; + public final static String NAMESPACE = "http://www.w3.org/1999/xx/http#"; public final static String PREFIX = "http"; private final String predicate; private HttpHeader() { - this.predicate = IDENTIFIER + this.name(); + this.predicate = NAMESPACE + this.name(); } @Override public String getURLStub() { - return IDENTIFIER; + return NAMESPACE; } @Override diff --git a/source/net/yacy/cora/lod/vocabulary/Tagging.java b/source/net/yacy/cora/lod/vocabulary/Tagging.java index 64692b29c..0e1d67ba7 100644 --- a/source/net/yacy/cora/lod/vocabulary/Tagging.java +++ b/source/net/yacy/cora/lod/vocabulary/Tagging.java @@ -35,7 +35,8 @@ import net.yacy.document.geolocalization.Localization; public class Tagging { - private final static String DEFAULT_IDENTIFIER_STUB = "http://yacy.net/tagging#"; + public final static String DEFAULT_NAMESPACE= "http://yacy.net/tagging#"; + public final static String DEFAULT_PREFIX = "tag"; private final String navigatorName; private final Map synonym2term; @@ -49,7 +50,7 @@ public class Tagging { this.synonym2term = new ConcurrentHashMap(); this.term2synonym = new ConcurrentHashMap(); this.synonym2synonyms = new ConcurrentHashMap>(); - this.predicatePrefix = DEFAULT_IDENTIFIER_STUB; + this.predicatePrefix = DEFAULT_NAMESPACE; this.predicate = this.predicatePrefix + name; this.objectPrefix = ""; } diff --git a/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java b/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java index 03b566eba..90038a6f8 100644 --- a/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java +++ b/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java @@ -76,7 +76,7 @@ public enum YaCyMetadata implements Vocabulary { public final static byte[] HASH_PREFIX = ASCII.getBytes("http://yacy.net/hash#"); public final static int HASH_PREFIX_LENGTH = HASH_PREFIX.length; - public final static String IDENTIFIER = "http://yacy.net/vocabularies/yacymetadata#"; + public final static String NAMESPACE = "http://yacy.net/vocabularies/yacymetadata#"; public final static String PREFIX = "yacy"; private final String predicate; @@ -89,12 +89,12 @@ public enum YaCyMetadata implements Vocabulary { } private YaCyMetadata() { - this.predicate = IDENTIFIER + this.name(); + this.predicate = NAMESPACE + this.name(); } @Override public String getURLStub() { - return IDENTIFIER; + return NAMESPACE; } @Override