--- a/src/hdalab/management/commands/query_geo_inclusion.py	Wed Jun 25 12:59:49 2014 +0200
+++ b/src/hdalab/management/commands/query_geo_inclusion.py	Wed Jun 25 17:34:54 2014 +0200
@@ -23,18 +23,11 @@
         #endpoint = SPARQLWrapper("http://dbpedia.org/sparql")
         endpoint = SPARQLWrapper(settings.DBPEDIA_URI_TEMPLATE % ( 'sparql', '' ))
         endpoint.setReturnFormat(JSON)
-#         sparqltext = """
-#             SELECT ?resource WHERE {
-#              { <%s> ?resource <http://dbpedia.org/ontology/Country> . }
-#             UNION
-#              { <%s> <http://dbpedia.org/ontology/country> ?resource . }
-#             }
-#         """
         sparqltext = """
             SELECT ?resource WHERE {
-             { <%s> ?resource <%s> . }
+             { <%s> ?resource <http://dbpedia.org/ontology/Country> . }
             UNION
-             { <%s> <%s> ?resource . }
+             { <%s> <http://dbpedia.org/ontology/country> ?resource . }
             }
         """
         #resourceprefix = "http://dbpedia.org/resource/"
@@ -44,7 +37,7 @@
         writer = None
         
         for i,tag in enumerate(qs):
-            endpoint.setQuery(sparqltext % (tag.dbpedia_uri, settings.DBPEDIA_URI_TEMPLATE % ( 'ontology', 'Country' ), tag.dbpedia_uri, settings.DBPEDIA_URI_TEMPLATE % ( 'ontology', 'country' )))
+            endpoint.setQuery(sparqltext % (tag.dbpedia_uri, tag.dbpedia_uri))
     
             results = endpoint.query().convert()['results']['bindings']