From 205a73917def9e29153bf653c134344223d632f6 Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Thu, 2 Jul 2009 22:31:28 +0100 Subject: [PATCH] [svn] Fix leftover from expo -> core rename, and add databaseReset.py to README.txt --- README.txt | 14 +++++++++++--- parsers/people.py | 10 +++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.txt b/README.txt index 8806217..93de045 100644 --- a/README.txt +++ b/README.txt @@ -25,7 +25,15 @@ If you want to work on the source code and be able to commit, you will need to u Next, you need to fill in your local settings. Copy either localsettingsubuntu.py or localsettingsserver.py to a new file called localsettings.py. Follow the instructions contained in the file to fill out your settings. +Setting up tables and importing legacy data +------------------------------------------ +Run "python databaseReset.py reset" from the troggle directory. + +Once troggle is running, you can also log in and then go to "Import / export" data under "admin" on the menu. + +Running a Troggle server +------------------------ +For high volume use, Troggle should be run using a web server like apache. However, a quick way to get started is to use the development server built into Django. + +To do this, run "python manage.py runserver" from the troggle directory. -Importing legacy data ---------------------- -Once troggle is running, log in and then go to "Import / export" data under "admin" on the menu \ No newline at end of file diff --git a/parsers/people.py b/parsers/people.py index cd9a661..a74e827 100644 --- a/parsers/people.py +++ b/parsers/people.py @@ -1,12 +1,8 @@ #.-*- coding: utf-8 -*- -import troggle.settings as settings -import troggle.expo.models as models -import csv -import re -import datetime -import os -import shutil +from django.conf import settings +import core.models as models +import csv, re, datetime, os, shutil from troggle.save_carefully import save_carefully # Julian: the below code was causing errors and it seems like a duplication of the above. Hope I haven't broken anything by commenting it. -Aaron