expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-24 16:21:53 +00:00
Code Issues 19 Projects 3 Activity

add mysql startup documentation

Browse Source
This commit is contained in:
Philip Sargent 2020-05-14 19:37:46 +01:00
parent cc4017e481
commit 931aa4e3cb
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README.txt
View File

@ -25,14 +25,14 @@ smartencoding
unidecode unidecode
Install like this: Install like this:
sudo apt install pip # does not work on WSL1 Ubuntu 20.04. Have to install from source sudo apt install pip # does not work on Ubuntu 20.04. Have to install from source. Use 18.04
pip install django==1.7 pip install django==1.7
pip install django-tinymce==2.0.1 pip install django-tinymce==2.0.1
sudo apt install libfreetype6-dev sudo apt install libfreetype6-dev
pip install django-registration==2.0 pip install django-registration==2.0
pip install unidecode pip install unidecode
pip install --no-cache-dir pillow==2.7.0 # fails horribly on installing Ubuntu20.04 pip install --no-cache-dir pillow==2.7.0 # fails horribly on installing Ubuntu 20.04
pip install --no-cache-dir pillow # installs on Ubuntu20.04 , don't know if it works though pip install --no-cache-dir pillow # installs on Ubuntu 20.04 , don't know if it works though
If you want to use MySQL or Postgresql, download and install them. If you want to use MySQL or Postgresql, download and install them.
However, you can also use Django with Sqlite3, which is included in Python and thus requires no extra installation. However, you can also use Django with Sqlite3, which is included in Python and thus requires no extra installation.
@ -44,7 +44,25 @@ pip install pygraphviz # fails to install
pip install pyparsing pydot # installs fine pip install pyparsing pydot # installs fine
django extension graph_models # https://django-extensions.readthedocs.io/en/latest/graph_models.html django extension graph_models # https://django-extensions.readthedocs.io/en/latest/graph_models.html
MariaDB database
----------------
Start it up with
$ sudo mysql -u -p
when it will prompt you to type in the password. Get this by reading the settings.py file in use on the server.
then
> CREATE DATABASE troggle;
> use troggle;
> exit;
Note the semicolons.
You can check the status of the db service:
$ sudo systemctl status mysql
You can start and stop the db service with
$ sudo systemctl restart mysql.service
$ sudo systemctl stop mysql.service
$ sudo systemctl start mysql.service
Troggle itself Troggle itself
------------- -------------
@ -66,7 +84,7 @@ import process.
Setting up tables and importing legacy data Setting up tables and importing legacy data
------------------------------------------ ------------------------------------------
Run "python databaseReset.py reset" from the troggle directory. Run "sudo 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. Once troggle is running, you can also log in and then go to "Import / export" data under "admin" on the menu.

2
parsers/people.py
View File

@ -138,7 +138,7 @@ def GetPersonExpeditionNameLookup(expedition):
res = { } res = { }
duplicates = set() duplicates = set()
print("Calculating GetPersonExpeditionNameLookup for " + expedition.year) #print("Calculating GetPersonExpeditionNameLookup for " + expedition.year)
personexpeditions = models.PersonExpedition.objects.filter(expedition=expedition) personexpeditions = models.PersonExpedition.objects.filter(expedition=expedition)
htmlparser = HTMLParser() htmlparser = HTMLParser()
for personexpedition in personexpeditions: for personexpedition in personexpeditions: