# HG changeset patch
# User cavaliet
# Date 1403772245 -7200
# Node ID f01235a1dcc26d028bc0461be226d8a220741ca2
# Parent  7a7035d3f7c9fd0bab179dbf340ee95f49b43069
correct ontology requests

diff -r 7a7035d3f7c9 -r f01235a1dcc2 src/hdalab/management/commands/fill_tag_years.py
--- a/src/hdalab/management/commands/fill_tag_years.py	Wed Jun 25 17:34:54 2014 +0200
+++ b/src/hdalab/management/commands/fill_tag_years.py	Thu Jun 26 10:44:05 2014 +0200
@@ -24,11 +24,10 @@
         writer = None
         
         for i,tag in enumerate(qs):
-            #writer = show_progress(i+1, total, tag.label, 50, writer)
+            writer = show_progress(i+1, total, tag.label, 50, writer)
             start = None
             end = None
             range = re.findall("^(Années )?(-?\d+)\-?(\d+)?( en France| au cinéma)?$", tag.label)
-            print "0 " + tag.label.encode("utf8") + ", " + tag.dbpedia_uri.encode("utf8")
             # S'il s'agit d'une année ou d'un ensemble d'années
             if range:
                 start = int(range[0][1])
@@ -37,7 +36,6 @@
                     end = start + 10
                 if range[0][2]:
                     end = int(range[0][2])
-                print "1 start " + str(start) + ", end" + str(end)
             else:
                 if tag.dbpedia_uri:
                     dbptitle = tag.dbpedia_uri[dbptstart:]
@@ -51,7 +49,6 @@
                         else:
                             start = 1 + 100*(val-1)
                         end = start + 100
-                        print "2 start " + str(start) + ", end" + str(end)
             
             if start != None and end != None:
                 ty = TagYears.objects.create(tag=tag, start_year=start, end_year=end)
diff -r 7a7035d3f7c9 -r f01235a1dcc2 src/hdalab/management/commands/geojson_transform.py
--- a/src/hdalab/management/commands/geojson_transform.py	Wed Jun 25 17:34:54 2014 +0200
+++ b/src/hdalab/management/commands/geojson_transform.py	Thu Jun 26 10:44:05 2014 +0200
@@ -45,22 +45,14 @@
             
         start = 0
         while start < len(uri_list):
-#             sparql = """
-#                 PREFIX dbpedia-owl: <http://dbpedia.org/ontology/>
-#                 SELECT ?source ?target
-#                 WHERE {
-#                     ?source dbpedia-owl:wikiPageRedirects ?target .
-#                     Filter (?source in (<%s>)) .
-#                 }
-#             """ % '>, <'.join(uri_list[start:start + grp])
             sparql = """
-                PREFIX dbpedia-owl: <%s>
+                PREFIX dbpedia-owl: <http://dbpedia.org/ontology/>
                 SELECT ?source ?target
                 WHERE {
                     ?source dbpedia-owl:wikiPageRedirects ?target .
                     Filter (?source in (<%s>)) .
                 }
-            """ % ((settings.DBPEDIA_URI_TEMPLATE % ( 'ontology', '' )), '>, <'.join(uri_list[start:start + grp]))
+            """ % '>, <'.join(uri_list[start:start + grp])
             endpoint.setQuery(sparql)
             results = endpoint.query().convert()
             
diff -r 7a7035d3f7c9 -r f01235a1dcc2 src/hdalab/management/commands/import_hdabo_db.py
--- a/src/hdalab/management/commands/import_hdabo_db.py	Wed Jun 25 17:34:54 2014 +0200
+++ b/src/hdalab/management/commands/import_hdabo_db.py	Thu Jun 26 10:44:05 2014 +0200
@@ -25,7 +25,7 @@
     def handle(self, *args, **options):        
         
         if len(args) == 0:
-            data_path = os.path.abspath(os.path.join(os.path.basename(__file__),'../../../../data'))
+            data_path = os.path.abspath(os.path.join(os.path.abspath(__file__),'../../../../../data'))
         else:
             data_path = args[0]
         
diff -r 7a7035d3f7c9 -r f01235a1dcc2 src/hdalab/management/commands/query_dbpedia.py
--- a/src/hdalab/management/commands/query_dbpedia.py	Wed Jun 25 17:34:54 2014 +0200
+++ b/src/hdalab/management/commands/query_dbpedia.py	Thu Jun 26 10:44:05 2014 +0200
@@ -143,8 +143,7 @@
                 labels = {}
                 thumbnail = None
                 with transaction.commit_on_success():
-                    #endpoint.setQuery("select distinct ?y where {<%s>  <http://dbpedia.org/ontology/abstract> ?y}" % (tag.dbpedia_uri))
-                    endpoint.setQuery("select distinct ?y where {<%s>  <%s> ?y}" % (settings.DBPEDIA_URI_TEMPLATE % ( 'ontology', 'abstract' ), tag.dbpedia_uri))
+                    endpoint.setQuery("select distinct ?y where {<%s>  <http://dbpedia.org/ontology/abstract> ?y}" % (tag.dbpedia_uri))
                     res_abstracts = endpoint.queryAndConvert()
                     for _,_,o in res_abstracts.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)):
                         abstracts[o.language] = (unicode(o), True)
@@ -154,8 +153,7 @@
                     for _,_,o in res_labels.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)):
                         labels[o.language] = (unicode(o), True)
                             
-                    #endpoint.setQuery("select distinct ?y where {<%s>  <http://dbpedia.org/ontology/thumbnail> ?y} limit 1" % (tag.dbpedia_uri))
-                    endpoint.setQuery("select distinct ?y where {<%s>  <%s> ?y} limit 1" % (settings.DBPEDIA_URI_TEMPLATE % ( 'ontology', 'thumbnail' ), tag.dbpedia_uri))
+                    endpoint.setQuery("select distinct ?y where {<%s>  <http://dbpedia.org/ontology/thumbnail> ?y} limit 1" % (tag.dbpedia_uri))
                     res_thumbnails = endpoint.queryAndConvert()
                     for _,_,o in res_thumbnails.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)):
                         thumbnail = unicode(o)
diff -r 7a7035d3f7c9 -r f01235a1dcc2 src/hdalab/static/hdalab/js/gomina.js
--- a/src/hdalab/static/hdalab/js/gomina.js	Wed Jun 25 17:34:54 2014 +0200
+++ b/src/hdalab/static/hdalab/js/gomina.js	Thu Jun 26 10:44:05 2014 +0200
@@ -892,7 +892,7 @@
             addFilter('tag', ui.item.original_label);
         }
     })
-    .data("autocomplete")._renderItem = function(ul, item) {
+    .data("ui-autocomplete")._renderItem = function(ul, item) {
         var _contents = acTemplate({
             item: item,
             inputvalue: $("#tagsearch").val()