From 0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Wed, 13 May 2009 05:39:52 +0100 Subject: [svn] survey block object Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM --- expo/models_survex.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'expo/models_survex.py') diff --git a/expo/models_survex.py b/expo/models_survex.py index 80e5f5b..4b65357 100644 --- a/expo/models_survex.py +++ b/expo/models_survex.py @@ -6,6 +6,8 @@ class SurvexBlock(models.Model): name = models.CharField(max_length=100, blank=True, null=True) parent = models.ForeignKey('SurvexBlock', blank=True, null=True) text = models.TextField() + + # non-useful representation of incomplete data start_year = models.IntegerField(blank=True, null=True) start_month = models.IntegerField(blank=True, null=True) start_day = models.IntegerField(blank=True, null=True) @@ -13,8 +15,13 @@ class SurvexBlock(models.Model): end_month = models.IntegerField(blank=True, null=True) end_day = models.IntegerField(blank=True, null=True) - person = models.ManyToManyField('Person', through='PersonRole', blank=True, null=True) + date = models.DateField(blank=True, null=True) + survexpath = models.CharField(max_length=100) + + # superfluous + person = models.ManyToManyField('Person', through='PersonRole', blank=True, null=True) + # code for where in the survex data files this block sits begin_file = models.CharField(max_length=200) begin_char = models.IntegerField() end_file = models.CharField(max_length=200, blank=True, null=True) @@ -25,8 +32,8 @@ class SurvexBlock(models.Model): def filecontents(self): f = os.path.join(settings.SURVEX_DATA, self.begin_file) - fin = open(f) - res = fin.read() + fin = open(f, "rb") + res = fin.read().decode("latin1") fin.close() return res @@ -43,4 +50,5 @@ class PersonRole(models.Model): class Role(models.Model): name = models.CharField(max_length=50) def __unicode__(self): - return unicode(self.name) \ No newline at end of file + return unicode(self.name) + -- cgit v1.2.3