--- a/web/hdabo/wp_utils.py Mon Jan 09 03:19:43 2012 +0100
+++ b/web/hdabo/wp_utils.py Tue Jan 17 00:18:49 2012 +0100
@@ -26,6 +26,7 @@
return True
return False
+
def query_wikipedia_title(site, label=None, pageid=None):
params = {'action':'query', 'prop':'info|categories|langlinks', 'inprop':'url', 'lllimit':'500', 'cllimit':'500', 'rvprop':'ids'}
@@ -39,7 +40,7 @@
response = wpquery.query()
original_response = response
def return_null_result():
- return { 'new_label': None, 'status': Tag.TAG_URL_STATUS_DICT["null_result"], 'wikipedia_url': None, 'pageid': None, 'dbpedia_uri': None, 'revision_id': None, 'response': response }
+ return { 'new_label': None, 'alternative_label': None, 'status': Tag.TAG_URL_STATUS_DICT["null_result"], 'wikipedia_url': None, 'pageid': None, 'alternative_wikipedia_url': None, 'alternative_pageid': None, 'dbpedia_uri': None, 'revision_id': None, 'response': response }
query_dict = response['query']
@@ -164,7 +165,16 @@
def process_tag(site, tag, verbosity=0):
wp_res = query_wikipedia_title(site, label=tag.label)
- new_label, status, url, pageid, response, dbpedia_uri, revision_id = wp_res['new_label'], wp_res['status'], wp_res['wikipedia_url'], wp_res['pageid'], wp_res['response'], wp_res["dbpedia_uri"], wp_res["revision_id"]
+ new_label = wp_res['new_label']
+ alternative_label= wp_res['alternative_label']
+ status = wp_res['status']
+ url = wp_res['wikipedia_url']
+ alternative_url = wp_res['alternative_wikipedia_url']
+ pageid = wp_res['pageid']
+ alternative_pageid = wp_res['alternative_pageid']
+ response = wp_res['response']
+ dbpedia_uri = wp_res["dbpedia_uri"]
+ revision_id = wp_res["revision_id"]
if verbosity >= 2 :
print "response from query to %s with parameters %s :" % (site.apibase, repr(new_label))
@@ -179,6 +189,9 @@
tag.wikipedia_url = url
tag.wikipedia_pageid = pageid
tag.dbpedia_uri = dbpedia_uri
+ tag.alternative_label = alternative_label
+ tag.alternative_wikipedia_url = alternative_url
+ tag.alternative_wikipedia_pageid = alternative_pageid
tag.save()