Merge pull request #111 from AKSW/feature/fixVocabURI

Change vocab uri to http://quit.aksw.org/vocab/

Author: splattater

config.example.ttl

@@ -1,5 +1,5 @@
 @prefix conf: <http://my.quit.conf/> .
-@prefix quit: <http://quit.aksw.org/> .
+@prefix quit: <http://quit.aksw.org/vocab/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
 
@@ -32,4 +32,4 @@ conf:default1 a <Graph> ;
 conf:aksw a <Binding> ;
   quit:prefix "aksw" ;
   quit:namespace <http://aksw.org/> .
-  quit:graphFile "default.nq" .
+  quit:graphFile "default.nq" .

docker/config.ttl

@@ -1,5 +1,5 @@
 @base <http://my.quit.conf/> .
-@prefix quit: <http://quit.aksw.org/> .
+@prefix quit: <http://quit.aksw.org/vocab/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
 

quit/conf.py

@@ -50,11 +50,11 @@ def __init__(
         self.graphs = {}
         self.files = {}
 
-        self.quit = Namespace('http://quit.aksw.org/')
+        self.quit = Namespace('http://quit.aksw.org/vocab/')
         self.nsMngrSysconf = NamespaceManager(self.sysconf)
-        self.nsMngrSysconf.bind('', 'http://quit.aksw.org/', override=False)
+        self.nsMngrSysconf.bind('', 'http://quit.aksw.org/vocab/', override=False)
         self.nsMngrGraphconf = NamespaceManager(self.sysconf)
-        self.nsMngrGraphconf.bind('', 'http://quit.aksw.org/', override=False)
+        self.nsMngrGraphconf.bind('', 'http://quit.aksw.org/vocab/', override=False)
 
         try:
             self.__initstoreconfig(
@@ -225,7 +225,7 @@ def __readGraphIriFile(self, graphfile):
 
     def __setgraphsfromconf(self):
         """Set all URIs and file paths of graphs that are configured in config.ttl."""
-        nsQuit = 'http://quit.aksw.org/'
+        nsQuit = 'http://quit.aksw.org/vocab/'
         query = 'SELECT DISTINCT ?graphuri ?filename WHERE { '
         query += '  ?graph a <' + nsQuit + 'Graph> . '
         query += '  ?graph <' + nsQuit + 'graphUri> ?graphuri . '
@@ -310,7 +310,7 @@ def getConfigMode(self):
         Returns:
             A string containig the mode.
         """
-        nsQuit = 'http://quit.aksw.org/'
+        nsQuit = 'http://quit.aksw.org/vocab/'
         property = URIRef(nsQuit + 'configMode')
 
         for s, p, o in self.sysconf.triples((None, property, None)):
@@ -324,7 +324,7 @@ def getRepoPath(self):
         Returns:
             A string containig the path of the git repo.
         """
-        nsQuit = 'http://quit.aksw.org/'
+        nsQuit = 'http://quit.aksw.org/vocab/'
         storeuri = URIRef('http://my.quit.conf/store')
         property = URIRef(nsQuit + 'pathOfGitRepo')
 
@@ -337,7 +337,7 @@ def getDefaultBranch(self):
         Returns:
             A string containing the branch name.
         """
-        nsQuit = 'http://quit.aksw.org/'
+        nsQuit = 'http://quit.aksw.org/vocab/'
         storeuri = URIRef('http://my.quit.conf/store')
         property = URIRef(nsQuit + 'defaultBranch')
 
@@ -352,7 +352,7 @@ def getGlobalFile(self):
         Returns:
             The filename of the graph file where unassigned graphs should be stored.
         """
-        nsQuit = 'http://quit.aksw.org/'
+        nsQuit = 'http://quit.aksw.org/vocab/'
         storeuri = URIRef('http://my.quit.conf/store')
         property = URIRef(nsQuit + 'globalFile')
 
@@ -361,7 +361,7 @@ def getGlobalFile(self):
 
     def getOrigin(self):
         """Get the URI of Git remote from configuration."""
-        nsQuit = 'http://quit.aksw.org/'
+        nsQuit = 'http://quit.aksw.org/vocab/'
         storeuri = URIRef('http://my.quit.conf/store')
         property = URIRef(nsQuit + 'origin')
 
@@ -490,7 +490,7 @@ def setRepoPath(self, path):
         return
 
     def getBindings(self):
-        ns = Namespace('http://quit.aksw.org/')
+        ns = Namespace('http://quit.aksw.org/vocab/')
         q = """SELECT DISTINCT ?prefix ?namespace WHERE {{
             {{
                 ?ns a <{binding}> ;

quit/namespace.py

@@ -4,9 +4,9 @@
 
 # missing namespaces
 PROV = Namespace('http://www.w3.org/ns/prov#')
-QUITD = Namespace('http://quit.aksw.org/')
+QUITD = Namespace('http://quit.aksw.org/vocab/')
 
-QUIT = Namespace('http://quit.aksw.org/')
+QUIT = Namespace('http://quit.aksw.org/vocab/')
 
 # simplified properties
 is_a = RDF.type

quit/provenance.py

@@ -58,7 +58,7 @@ def run(self, quads=None, branch_or_ref='master'):
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX aksw: <http://aksw.org/>
-            PREFIX quit: <http://quit.aksw.org/>
+            PREFIX quit: <http://quit.aksw.org/vocab/>
             PREFIX prov: <http://www.w3.org/ns/prov#>
             PREFIX foaf: <http://xmlns.com/foaf/0.1/>
             SELECT ?s ?p ?o ?context ?hex ?name ?email ?date WHERE {

tests/samples/applicationTests/config.ttl

@@ -1,4 +1,4 @@
-@base <http://quit.aksw.org/> .
+@base <http://quit.aksw.org/vocab/> .
 @prefix conf: <http://my.quit.conf/> .
 
 conf:store a <QuitStore> ;

tests/samples/configuration_test/config.ttl

@@ -1,4 +1,4 @@
-@base <http://quit.aksw.org/> .
+@base <http://quit.aksw.org/vocab/> .
 @prefix conf: <http://my.quit.conf/> .
 
 conf:store a <QuitStore> ;

vocab/config-shapes.ttl

@@ -1,4 +1,4 @@
-@prefix quit: <http://quit.aksw.org/> .
+@prefix quit: <http://quit.aksw.org/vocab/> .
 @prefix qshapes: <http://quit.aksw.org/shapes/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .

vocab/provenance-shapes.ttl

@@ -1,4 +1,4 @@
-@prefix quit: <http://quit.aksw.org/> .
+@prefix quit: <http://quit.aksw.org/vocab/> .
 @prefix qshapes: <http://quit.aksw.org/shapes/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .

vocab/vocab.ttl

@@ -1,4 +1,4 @@
-@prefix quit: <http://quit.aksw.org/> .
+@prefix quit: <http://quit.aksw.org/vocab/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .