TRansX speedup for import + remove fossil profiles

This commit is contained in:
Philip Sargent
2020-07-22 23:06:15 +01:00
parent fbf5daff0e
commit 070157eacb
5 changed files with 394 additions and 381 deletions

View File

@@ -7,6 +7,7 @@ from django.db import connection, close_old_connections, connections
from django.contrib.auth.models import User
from django.http import HttpResponse
#from django.urls import reverse, resolve
from django.db import transaction
import troggle.settings
import troggle.parsers.caves
@@ -19,37 +20,47 @@ import troggle.parsers.subcaves
def import_caves():
print("-- Importing Caves to ",end="")
print(django.db.connections.databases['default']['NAME'])
troggle.parsers.caves.readcaves()
# wrap the entire import in a transaction
with transaction.atomic():
troggle.parsers.caves.readcaves()
def import_people():
print("-- Importing People (folk.csv) to ",end="")
print(django.db.connections.databases['default']['NAME'])
troggle.parsers.people.LoadPersonsExpos()
with transaction.atomic():
troggle.parsers.people.LoadPersonsExpos()
def import_surveyscans():
print("-- Importing Survey Scans")
troggle.parsers.surveys.LoadListScans()
with transaction.atomic():
troggle.parsers.surveys.LoadListScans()
def import_logbooks():
print("-- Importing Logbooks")
troggle.parsers.logbooks.LoadLogbooks()
with transaction.atomic():
troggle.parsers.logbooks.LoadLogbooks()
def import_QMs():
print("-- Importing old QMs for 161, 204, 234 from CSV files")
troggle.parsers.QMs.Load_QMs()
with transaction.atomic():
troggle.parsers.QMs.Load_QMs()
def import_survex():
# when this import is moved to the top with the rest it all crashes horribly
import troggle.parsers.survex
with transaction.atomic():
import troggle.parsers.survex
print("-- Importing Survex and Entrance Positions")
print(" - Survex Blocks")
troggle.parsers.survex.LoadSurvexBlocks()
with transaction.atomic():
troggle.parsers.survex.LoadSurvexBlocks()
print(" - Survex entrances x/y/z Positions")
troggle.parsers.survex.LoadPositions()
with transaction.atomic():
troggle.parsers.survex.LoadPositions()
def import_loadpos():
# when this import is moved to the top with the rest it all crashes horribly
import troggle.parsers.survex
with transaction.atomic():
import troggle.parsers.survex
print(" - Survex entrances x/y/z Positions")
troggle.parsers.survex.LoadPositions()