diff -r 62e97cd13730 -r ff4d2d4f1fb0 src/p4l/management/commands/import_record.py --- a/src/p4l/management/commands/import_record.py Wed Aug 28 15:29:18 2013 +0200 +++ b/src/p4l/management/commands/import_record.py Wed Aug 28 18:45:41 2013 +0200 @@ -1,16 +1,14 @@ # -*- coding: utf-8 -*- +from django.core.management import BaseCommand +from django.db import reset_queries, transaction +from optparse import make_option +from p4l.models import Record, Language from p4l.utils import show_progress, get_code_from_language_uri -from p4l.models import Record, Language from rdflib import Graph, Namespace, BNode, URIRef from rdflib.plugins.sparql import prepareQuery -from django.core.management import BaseCommand -from optparse import make_option +import logging import xml.etree.cElementTree as ET -from django.db import reset_queries, transaction -import traceback -import logging -import sys logger = logging.getLogger(__name__) @@ -297,7 +295,7 @@ record.volumeIssues, graph, ['volume', 'number', 'lang'], - "SELECT ?v ?n (lang(COALESCE(?v, ?n)) as ?lang) WHERE { [ iiep:volumeIssue ?bnode ]. OPTIONAL { ?bnode iiep:volume ?v }. OPTIONAL { ?bnode iiep:number ?v }}", + "SELECT ?v ?n (lang(COALESCE(?v, ?n)) as ?lang) WHERE { [ iiep:volumeIssue ?bnode ]. OPTIONAL { ?bnode iiep:volume ?v }. OPTIONAL { ?bnode iiep:number ?n }}", convert={'lang':lambda l: self.convert_lang(l, default_language_code)} ) @@ -335,7 +333,7 @@ context = ET.iterparse(records_url, events=("end",)) i = 0 - for event,elem in context: + for _,elem in context: if elem.tag == "{%s}Record" % IIEP: i += 1 writer = show_progress(i, total_records, "Processing record nb %d " % i, 50, writer=writer)