mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2025-01-31 15:32:35 +00:00
[svn] Converted screen output display to ASCII, so that I could run the script
via SSH on a server Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8171 by julian @ 1/17/2009 8:36 PM
This commit is contained in:
parent
ecc4e1dc13
commit
a366161a24
@ -74,9 +74,11 @@ def make_model(name, parent, iter_lines, sf, c, l):
|
|||||||
survex_block = m,
|
survex_block = m,
|
||||||
role = models.Role.objects.get(name = roles[role])).save()
|
role = models.Role.objects.get(name = roles[role])).save()
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
print "Person not found: " + name + " in " + file_
|
print ("Person not found: " + name + " in " + file_).encode('ascii', 'xmlcharrefreplace')
|
||||||
except AssertionError, inst:
|
except AssertionError, inst:
|
||||||
print inst, ": ", file_year[0]
|
print (unicode(inst) + ": " + unicode(file_year[0])).encode('ascii', 'xmlcharrefreplace')
|
||||||
|
except models.Expedition.DoesNotExist:
|
||||||
|
print "Expo"+str(file_year[1]).encode('ascii', 'xmlcharrefreplace')
|
||||||
|
|
||||||
m.end_file = survex_file
|
m.end_file = survex_file
|
||||||
m.end_char = count
|
m.end_char = count
|
||||||
@ -112,7 +114,7 @@ def make_model(name, parent, iter_lines, sf, c, l):
|
|||||||
if h:
|
if h:
|
||||||
team.append((survex_file, h.groups()))
|
team.append((survex_file, h.groups()))
|
||||||
else:
|
else:
|
||||||
print "Role not found: " + line + " in: " + sf
|
print ("Role not found: " + line + " in: " + sf).encode('ascii', 'xmlcharrefreplace')
|
||||||
m.text = m.text + line
|
m.text = m.text + line
|
||||||
saveEnd(survex_file, count)
|
saveEnd(survex_file, count)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user