# HG changeset patch # User ymh # Date 1416157782 -3600 # Node ID 46ad324f6fe4d720e604748168198806e7075bbb # Parent d162cb0c43869c08108e1e7214a9edf82785dd28 Correct qery_dbpedia and improve model. diff -r d162cb0c4386 -r 46ad324f6fe4 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Fri Nov 14 17:06:02 2014 +0100 +++ b/.settings/org.eclipse.core.resources.prefs Sun Nov 16 18:09:42 2014 +0100 @@ -4,7 +4,6 @@ encoding//src/hdabo/management/commands/clean_tags.py=utf-8 encoding//src/hdabo/management/commands/diff_csv.py=utf-8 encoding//src/hdabo/management/commands/import_csv.py=utf-8 -encoding//src/hdabo/management/commands/import_rdf.py=utf-8 encoding//src/hdabo/management/commands/import_tag_popularity.py=utf-8 encoding//src/hdabo/management/commands/query_wikipedia.py=utf-8 encoding//src/hdabo/management/utils.py=utf-8 @@ -47,6 +46,7 @@ encoding//src/hdalab/migrations/0008_datasheet_insee.py=utf-8 encoding//src/hdalab/migrations/0011_auto__add_field_dbpediafieldstranslation_is_label_translated__add_fiel.py=utf-8 encoding//src/hdalab/migrations/0012_auto__add_hdalabrenkan.py=utf-8 +encoding//src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py=utf-8 encoding//src/hdalab/models/dataviz.py=utf-8 encoding//src/hdalab/settings.py=utf-8 encoding//src/hdalab/urls.py=utf-8 diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdabo/config.py.tmpl --- a/src/hdabo/config.py.tmpl Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdabo/config.py.tmpl Sun Nov 16 18:09:42 2014 +0100 @@ -1,3 +1,4 @@ +import logging import os BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/" diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/__init__.py --- a/src/hdalab/__init__.py Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdalab/__init__.py Sun Nov 16 18:09:42 2014 +0100 @@ -10,7 +10,7 @@ version = '%s pre-alpha' % version else: if VERSION[3] != 'final': - version = '%s %s %s' % (version, VERSION[3], VERSION[4]) + version = '%s-%s.%s' % (version, VERSION[3], VERSION[4]) return version diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/config.py.tmpl --- a/src/hdalab/config.py.tmpl Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdalab/config.py.tmpl Sun Nov 16 18:09:42 2014 +0100 @@ -4,6 +4,7 @@ @author: ymh ''' +import logging import os DEBUG = True @@ -58,3 +59,55 @@ GOOGLE_ANALYTICS_CODE = None +LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../../run/log/log.txt")) +LOG_LEVEL = logging.DEBUG +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters' : { + 'simple' : { + 'format': "%(asctime)s - %(levelname)s : %(message)s", + }, + 'semi-verbose': { + 'format': '%(levelname)s %(asctime)s %(module)s %(message)s' + }, + }, + 'handlers': { + 'mail_admins': { + 'level': 'ERROR', + 'class': 'django.utils.log.AdminEmailHandler' + }, + 'stream_to_console': { + 'level': LOG_LEVEL, + 'class': 'logging.StreamHandler' + }, + 'file': { + 'level': LOG_LEVEL, + 'class': 'logging.FileHandler', + 'filename': LOG_FILE, + 'formatter': 'semi-verbose', + }, + } , + 'loggers': { + 'hdabo': { + 'handlers': ['file'], + 'level': LOG_LEVEL, + 'propagate': True, + }, + 'hdalab': { + 'handlers': ['file'], + 'level': LOG_LEVEL, + 'propagate': True, + }, +# 'django.db.backends':{ +# 'handlers': ['file'], +# 'level': LOG_LEVEL, +# 'propagate': True, +# }, +# 'django.request': { +# 'handlers': ['file'], +# 'level': LOG_LEVEL, +# 'propagate': True, +# }, + } +} \ No newline at end of file diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/fields.py --- a/src/hdalab/fields.py Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdalab/fields.py Sun Nov 16 18:09:42 2014 +0100 @@ -7,9 +7,10 @@ @author: ymh ''' +from django.core.exceptions import ObjectDoesNotExist from django.db import models from django.db.models import fields as django_fields -from django.core.exceptions import ObjectDoesNotExist +from south.modelsinspector import add_introspection_rules class OneToOneField(models.OneToOneField): @@ -38,4 +39,14 @@ setattr(instance, self.cache_name, value) if value is not None: setattr(value, self.related.field.get_cache_name(), instance) - return value \ No newline at end of file + return value + +add_introspection_rules([ + ( + [OneToOneField], + [], # Positional arguments (not used) + { # Keyword argument + "related_default": ["related_default", {"default": None}], + }, + ), +], ["^hdalab\.fields\.OneToOneField"]) \ No newline at end of file diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/management/commands/fill_tag_years.py --- a/src/hdalab/management/commands/fill_tag_years.py Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdalab/management/commands/fill_tag_years.py Sun Nov 16 18:09:42 2014 +0100 @@ -15,6 +15,8 @@ class Command(NoArgsCommand): def handle_noargs(self, **options): self.style = no_style() + + TagYears.objects.all().delete() qs = Tag.objects.filter(category__label="Datation") total = qs.count() @@ -27,15 +29,15 @@ writer = show_progress(i+1, total, tag.label, 50, writer) start = None end = None - range = re.findall(u"^(Années )?(-?\d+)\-?(\d+)?( en France| au cinéma)?$", tag.label) + rng = re.findall(u"^(Années )?(-?\d+)\-?(\d+)?( en France| au cinéma)?$", tag.label) # S'il s'agit d'une année ou d'un ensemble d'années - if range: - start = int(range[0][1]) + if rng: + start = int(rng[0][1]) end = start - if range[0][0]: + if rng[0][0]: end = start + 10 - if range[0][2]: - end = int(range[0][2]) + if rng[0][2]: + end = int(rng[0][2]) else: if tag.dbpedia_uri: dbptitle = tag.dbpedia_uri[dbptstart:] diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/management/commands/query_dbpedia.py --- a/src/hdalab/management/commands/query_dbpedia.py Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdalab/management/commands/query_dbpedia.py Sun Nov 16 18:09:42 2014 +0100 @@ -5,24 +5,26 @@ @author: ymh ''' +from hdabo.models import Tag +from hdabo.utils import show_progress +from hdalab.models import DbpediaFields, TagLinks +from hdalab.models.dataviz import DbpediaFieldsTranslation +import logging +from optparse import make_option +import sys +import traceback + +from SPARQLWrapper import SPARQLWrapper, N3 +from django import db from django.conf import settings from django.core.management.base import NoArgsCommand from django.core.management.color import no_style - -from optparse import make_option -from django.conf import settings +from django.db import transaction from django.db.models import Count -from django.db import transaction -from hdabo.models import Tag -from hdalab.models import DbpediaFields, TagLinks -from hdabo.utils import show_progress -from rdflib.graph import Graph -from rdflib import URIRef -import traceback -import sys -from hdalab.models.dataviz import DbpediaFieldsTranslation -from django import db -from SPARQLWrapper import SPARQLWrapper, RDF +from rdflib import URIRef, Graph + + +logger = logging.getLogger(__name__) class Command(NoArgsCommand): ''' @@ -125,7 +127,7 @@ return #endpoint = SPARQLWrapper("http://dbpedia.org/sparql", returnFormat=RDF) - endpoint = SPARQLWrapper(settings.DBPEDIA_URI_TEMPLATE % ( 'sparql', '' ), returnFormat=RDF) + endpoint = SPARQLWrapper(settings.DBPEDIA_URI_TEMPLATE % ( 'sparql', '' ), returnFormat=N3) writer = None for i,tag in enumerate(queryset): @@ -144,27 +146,30 @@ thumbnail = None with transaction.commit_on_success(): endpoint.setQuery("select distinct ?y where {<%s> ?y}" % (tag.dbpedia_uri)) - res_abstracts = endpoint.queryAndConvert() + res_abstracts = Graph().parse(data=endpoint.queryAndConvert(), format='n3') for _,_,o in res_abstracts.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)): abstracts[o.language] = (unicode(o), True) - + logger.debug("Abstracts: %r" % abstracts) + endpoint.setQuery("select distinct ?y where {<%s> ?y}" % (tag.dbpedia_uri)) - res_labels = endpoint.queryAndConvert() + #res_labels = endpoint.queryAndConvert() + res_labels = Graph().parse(data=endpoint.queryAndConvert(), format='n3') for _,_,o in res_labels.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)): labels[o.language] = (unicode(o), True) - + logger.debug("Labels: %r" % labels) + endpoint.setQuery("select distinct ?y where {<%s> ?y} limit 1" % (tag.dbpedia_uri)) - res_thumbnails = endpoint.queryAndConvert() + res_thumbnails = Graph().parse(data=endpoint.queryAndConvert(), format='n3') for _,_,o in res_thumbnails.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)): thumbnail = unicode(o) #endpoint.setQuery('select distinct ?y where { <%s> ?p ?y . FILTER regex(?y, "^http://dbpedia.org/resource")}' % (tag.dbpedia_uri)) endpoint.setQuery('select distinct ?y where { <%s> ?p ?y . FILTER regex(?y, "^%s")}' % (tag.dbpedia_uri, settings.DBPEDIA_URI_TEMPLATE % ( 'resource', '' ))) - res_links = endpoint.queryAndConvert() + res_links = Graph().parse(data=endpoint.queryAndConvert(), format='n3') for _,_,o in res_links.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)): tagqs = Tag.objects.filter(dbpedia_uri=unicode(o)) if tagqs: - TagLinks.objects.get_or_create(subject=tag, object=tagqs[0]) + TagLinks.objects.get_or_create(subject=tag, object=tagqs[0]) ref_label_lang, (ref_label, _) = ('fr',labels['fr']) if 'fr' in labels else ('en',labels['en']) if 'en' in labels else labels.items()[0] if len(labels) > 0 else ('fr',(tag.label, True)) ref_abstract_lang, (ref_abstract, _) = ('fr',abstracts['fr']) if 'fr' in abstracts else ('en',abstracts['en']) if 'en' in abstracts else abstracts.items()[0] if len(abstracts) > 0 else ('fr',(None, 'True')) diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/management/commands/query_geo_inclusion.py --- a/src/hdalab/management/commands/query_geo_inclusion.py Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdalab/management/commands/query_geo_inclusion.py Sun Nov 16 18:09:42 2014 +0100 @@ -17,6 +17,9 @@ def handle_noargs(self, **options): self.style = no_style() + GeoInclusion.objects.all().delete() + Country.objects.all().delete() + qs = Tag.objects.filter(category__label="Localisation").exclude(dbpedia_uri = None) total = qs.count() @@ -48,13 +51,13 @@ if re.match(resourceprefix, resourceuri): countrytxt = re.findall('([^/]+$)', resourceuri)[0] - country, created = Country.objects.get_or_create(dbpedia_uri=resourceuri) + country, _ = Country.objects.get_or_create(dbpedia_uri=resourceuri) GeoInclusion.objects.get_or_create(tag=tag, country=country) if resourceuri == identityuri: countrytxt = '' - country, created = Country.objects.get_or_create(dbpedia_uri=tag.dbpedia_uri) + country, _ = Country.objects.get_or_create(dbpedia_uri=tag.dbpedia_uri) GeoInclusion.objects.get_or_create(tag=tag, country=country) else: diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py Sun Nov 16 18:09:42 2014 +0100 @@ -0,0 +1,323 @@ +# -*- coding: utf-8 -*- +from south.db import db +from south.v2 import SchemaMigration + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'DbpediaFields.tag' + db.alter_column(u'hdalab_dbpediafields', 'tag_id', self.gf('hdalab.fields.OneToOneField')(default=0, unique=True, related_default=lambda instance: None, to=orm['hdabo.Tag'])) + # Adding unique constraint on 'TagYears', fields ['tag'] + db.create_unique(u'hdalab_tagyears', ['tag_id']) + + + def backwards(self, orm): + # Removing unique constraint on 'TagYears', fields ['tag'] + db.delete_unique(u'hdalab_tagyears', ['tag_id']) + + + # Changing field 'DbpediaFields.tag' + db.alter_column(u'hdalab_dbpediafields', 'tag_id', self.gf('django.db.models.fields.related.OneToOneField')(unique=True, null=True, to=orm['hdabo.Tag'])) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'hdabo.author': { + 'Meta': {'object_name': 'Author'}, + 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), + 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.datasheet': { + 'Meta': {'object_name': 'Datasheet'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), + 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), + 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), + 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), + 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), + 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), + 'original_creation_date': ('django.db.models.fields.DateField', [], {}), + 'original_modification_date': ('django.db.models.fields.DateField', [], {}), + 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), + 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), + 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), + 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.datasheet_college_periods': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}), + 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) + }, + u'hdabo.datasheet_college_themes': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.datasheet_domains': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.datasheet_highschool_periods': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}), + 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) + }, + u'hdabo.datasheet_highschool_themes': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.datasheet_primary_periods': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}), + 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) + }, + u'hdabo.datasheet_primary_themes': { + 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sort_value': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.documentformat': { + 'Meta': {'object_name': 'DocumentFormat'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) + }, + u'hdabo.domain': { + 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'school_period': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.location': { + 'Meta': {'object_name': 'Location'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) + }, + u'hdabo.organisation': { + 'Meta': {'object_name': 'Organisation'}, + 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.tag': { + 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, + 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), + 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), + 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), + 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), + 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), + 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) + }, + u'hdabo.tagcategory': { + 'Meta': {'object_name': 'TagCategory'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) + }, + u'hdabo.taggedsheet': { + 'Meta': {'object_name': 'TaggedSheet'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), + 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), + 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + u'hdabo.timeperiod': { + 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'school_period': ('django.db.models.fields.IntegerField', [], {}) + }, + u'hdabo.user': { + 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'hdalab.country': { + 'Meta': {'object_name': 'Country'}, + 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'hdalab.datasheetextras': { + 'Meta': {'object_name': 'DatasheetExtras'}, + 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': u"orm['hdabo.Datasheet']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) + }, + 'hdalab.dbpediafields': { + 'Meta': {'object_name': 'DbpediaFields'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), + 'tag': ('hdalab.fields.OneToOneField', [], {'related_name': "'dbpedia_fields'", 'unique': 'True', 'related_default': 'None', 'to': u"orm['hdabo.Tag']"}), + 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) + }, + 'hdalab.dbpediafieldstranslation': { + 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_abstract_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_label_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), + 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) + }, + 'hdalab.geoinclusion': { + 'Meta': {'object_name': 'GeoInclusion'}, + 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.hdalabrenkan': { + 'Meta': {'object_name': 'HdalabRenkan'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['renkanmanager.Renkan']"}), + 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'hdalab.hdasession': { + 'Meta': {'object_name': 'HdaSession'}, + 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) + }, + 'hdalab.infoboxparameter': { + 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), + 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) + }, + 'hdalab.inseecoords': { + 'Meta': {'object_name': 'InseeCoords'}, + 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), + 'latitude': ('django.db.models.fields.FloatField', [], {}), + 'longitude': ('django.db.models.fields.FloatField', [], {}) + }, + 'hdalab.taginfobox': { + 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), + 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.taglinks': { + 'Meta': {'object_name': 'TagLinks'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': u"orm['hdabo.Tag']"}), + 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.tagwpcategory': { + 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, + 'hidden': ('django.db.models.fields.BooleanField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': u"orm['hdabo.Tag']"}), + 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'to': "orm['hdalab.WpCategory']"}) + }, + 'hdalab.tagyears': { + 'Meta': {'object_name': 'TagYears'}, + 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) + }, + 'hdalab.wpcategory': { + 'Meta': {'object_name': 'WpCategory'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) + }, + 'hdalab.wpcategoryinclusion': { + 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, + 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) + }, + 'renkanmanager.renkan': { + 'Meta': {'object_name': 'Renkan'}, + 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'default': "'thumbnails/renkan/renkan_default_icon.png'", 'max_length': '100'}), + 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}), + 'rk_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}) + } + } + + complete_apps = ['hdalab'] \ No newline at end of file diff -r d162cb0c4386 -r 46ad324f6fe4 src/hdalab/models/dataviz.py --- a/src/hdalab/models/dataviz.py Fri Nov 14 17:06:02 2014 +0100 +++ b/src/hdalab/models/dataviz.py Sun Nov 16 18:09:42 2014 +0100 @@ -12,7 +12,7 @@ class TagYears(models.Model): - tag = models.ForeignKey(Tag, related_name="years", blank=False, null=False, db_index=True) + tag = models.ForeignKey(Tag, related_name="years", blank=False, null=False, db_index=True, unique=True) start_year = models.IntegerField(blank=False, null=False, db_index=True) end_year = models.IntegerField(blank=False, null=False, db_index=True) @@ -46,7 +46,7 @@ class DbpediaFields(models.Model): dbpedia_uri = models.URLField(max_length=2048, blank=False, null=False, db_index=True, unique=False) - tag = fields.OneToOneField(Tag, blank=True, null=True, db_index=True, related_name="dbpedia_fields", related_default=lambda instance: None) + tag = fields.OneToOneField(Tag, db_index=True, related_name="dbpedia_fields", related_default=lambda instance: None) abstract = models.TextField(blank=True, null=True) thumbnail = models.URLField(max_length=2048, blank=True, null=True, db_index=False) label = models.CharField(max_length=2048, unique=False, blank=True, null=True) diff -r d162cb0c4386 -r 46ad324f6fe4 src/manage.py --- a/src/manage.py Fri Nov 14 17:06:02 2014 +0100 +++ b/src/manage.py Sun Nov 16 18:09:42 2014 +0100 @@ -3,7 +3,7 @@ import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hdabo.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hdalab.settings") from django.core.management import execute_from_command_line