c38aa357b7
Better error msg for overwriting 3d files
2021-11-05 23:51:10 +02:00
df43aae33d
2021 docm update re logbook imports
2021-11-05 23:01:10 +02:00
b461b87df6
fix unneeded runs of survex on survex mport
2021-11-05 22:59:54 +02:00
Philip Sargent
3cc9fe4dd9
fix for server
2021-05-09 01:13:53 +01:00
Philip Sargent
e42cb582c7
1988, 1989 still bad
2021-05-09 00:55:37 +01:00
Philip Sargent
41ed15f47f
1987 crashes too..
2021-05-07 21:43:46 +01:00
Philip Sargent
d916d4125c
1989 crashes mysql too. duh.
2021-05-07 21:22:40 +01:00
Philip Sargent
4877a7ddc4
omit 1988 logbook, crashes mysql
2021-05-07 21:00:06 +01:00
Philip Sargent
47d9d7d242
Parse all logbooks
2021-05-06 21:07:19 +01:00
Philip Sargent
d374779c47
dwg upload and django admin extra search
2021-05-05 00:35:10 +01:00
Philip Sargent
1638f97d0c
moved functions between files
2021-05-04 20:57:16 +01:00
Philip Sargent
90bb0759a0
Drawing files upload form
2021-05-04 02:46:56 +01:00
Philip Sargent
fd95bb8198
split surveys->scans + drawings
2021-05-03 20:36:29 +01:00
Philip Sargent
51da26564f
chnage img fix to import, not display
2021-05-02 15:50:20 +01:00
Philip Sargent
a9ffae9b87
Fix images in single logbook entries
2021-05-02 14:50:46 +01:00
Philip Sargent
03a5f5989e
chipping away bug in personexpedition, remove role
2021-04-30 00:24:36 +01:00
Philip Sargent
e5cf1b5289
download logbook in standard HTML works
2021-04-28 02:43:09 +01:00
Philip Sargent
cb6619a90a
buxfixes
2021-04-28 00:50:26 +01:00
Philip Sargent
5e478c7eb0
Imports in control panel work again
2021-04-27 20:44:24 +01:00
Philip Sargent
13f3057185
bugfixes
2021-04-27 14:51:04 +01:00
Philip Sargent
e236e792ec
todo: parsing caves
2021-04-27 00:32:01 +01:00
Philip Sargent
49b9225b6e
rename scansfolder to wallet
2021-04-26 19:50:03 +01:00
Philip Sargent
7f64670f36
reanme manyscansfolders to manywallets
2021-04-26 19:22:29 +01:00
Philip Sargent
7dd5840353
reanem tunnelcontains to dwgcontains
2021-04-26 18:54:17 +01:00
Philip Sargent
d43ce1bdb2
rename TUNNEL_DATA as DRAWINGS_DATA
2021-04-26 18:42:10 +01:00
Philip Sargent
bd647b99ec
rename tunnelname as dwgname
2021-04-26 18:37:59 +01:00
Philip Sargent
0997fd0901
rename ScansFolder class as Wallet
2021-04-26 18:18:16 +01:00
Philip Sargent
dc840c9bc7
tunnelpath to dwgpath
2021-04-26 18:11:14 +01:00
Philip Sargent
37403a7234
renamed tunnel to drawing or dwg
2021-04-26 18:08:42 +01:00
Philip Sargent
9e11c0814e
missing entrance .html file now handled differently
2021-04-26 17:23:23 +01:00
Philip Sargent
72fa8a5883
Making entrances work for pending caves
2021-04-26 02:10:45 +01:00
Philip Sargent
a656ada67a
Fixing cave edit form and cave creation parser
2021-04-25 04:04:53 +01:00
Philip Sargent
8128870d57
more robust logbooks parsing
2021-04-24 01:23:55 +01:00
Philip Sargent
b979bdb560
slug too long for field
2021-04-23 16:31:52 +01:00
Philip Sargent
b7659a477c
Deep fix, nonunique ids in logbookentries fixed
2021-04-23 16:11:50 +01:00
Philip Sargent
343d6cf350
delete old forms, templates. fix logdataissues
2021-04-23 11:43:25 +01:00
Philip Sargent
dbd186e299
make ?reload private and clean old error msgs
2021-04-23 03:07:21 +01:00
Philip Sargent
b4ba3c40eb
catch unknown scotsman error
2021-04-20 22:58:41 +01:00
Philip Sargent
f8b613e0aa
prospect and moving code to better places
2021-04-17 01:41:06 +01:00
Philip Sargent
16ef4fa9fb
split out prospecting guide code
2021-04-16 03:05:39 +01:00
Philip Sargent
540ce7c076
bug fix in error message
2021-04-15 18:06:04 +01:00
Philip Sargent
27491c933a
enabled mugshots & blurb in people pages
2021-04-15 17:51:01 +01:00
Philip Sargent
38a63641bc
abort messages when parsing caves
2021-04-15 01:52:09 +01:00
Philip Sargent
c2c7de4c59
more cave parsing data fixes
2021-04-14 22:50:47 +01:00
Philip Sargent
d598a6d0f5
better integration of svx file DatIssues
2021-04-14 21:08:06 +01:00
Philip Sargent
db3addc819
Detects missing svx and description files
2021-04-14 18:24:08 +01:00
Philip Sargent
4a13232467
stop being so verbose
2021-04-14 00:12:27 +01:00
Philip Sargent
2f03f77ce4
rename function more accurately
2021-04-13 23:52:56 +01:00
Philip Sargent
daf58e9e45
replace assert() with message logging
2021-04-13 22:27:01 +01:00
Philip Sargent
0820d7c0dc
Docstrings for all modules
2021-04-13 01:37:42 +01:00
Philip Sargent
267741fa8b
fixing typos and changes in importing
2021-04-13 01:13:08 +01:00
Philip Sargent
7bc73d1ca8
move models_survex to models/survex.py
2021-04-13 00:50:12 +01:00
Philip Sargent
957169d9aa
move models_caves to models/caves.py
2021-04-13 00:47:17 +01:00
Philip Sargent
5b3b0e67e9
create core/models/ directroy
2021-04-13 00:43:57 +01:00
Philip Sargent
304bbd230a
deprecated non-raw regex
2021-04-13 00:18:30 +01:00
Philip Sargent
2a1710596a
moving save_carefully()
2021-04-13 00:11:08 +01:00
Philip Sargent
b602f3ae13
creating core/utils.py
2021-04-12 23:58:48 +01:00
Philip Sargent
a7e59b2bb0
clear cache on parsing & 2.2.19 notes
2021-04-10 02:12:13 +01:00
Philip Sargent
cb5b80353d
Therion files now handled
2021-04-08 01:09:06 +01:00
Philip Sargent
b7d54111ba
Import Therion files too
2021-04-07 21:53:43 +01:00
Philip Sargent
785d6360cd
Now compat with Dj2.0.13 & 1.11.29
2021-04-06 22:50:57 +01:00
Philip Sargent
409037bdf3
tiny tidyings
2021-04-05 14:01:15 +01:00
Philip Sargent
8707e4a819
fix missing slug field in pending caves
2021-04-03 00:34:34 +01:00
Philip Sargent
7cccf4daf1
move *_views files to /views/*
2021-03-31 21:51:17 +01:00
Philip Sargent
0f024b27f0
Replace assert() with DataIssue message
2021-03-29 02:06:19 +01:00
Philip Sargent
70684a29c6
1982 giving problems. Caved ID issue suspected.
2021-03-24 22:00:51 +00:00
Philip Sargent
06c4d026f8
skip years crashing parser
2021-03-24 21:40:52 +00:00
Philip Sargent
9a91487375
pathlib for path management & cavelist fixes
2021-03-24 15:46:35 +00:00
Philip Sargent
7f37327bcd
Fixing cave list webpage
2021-03-24 00:55:36 +00:00
Philip Sargent
5836c6ff90
Importing old logbooks
2021-02-06 00:18:48 +00:00
Philip Sargent
3574dd4b1e
Fix skipped import error messages for drawings
2020-07-29 22:54:53 +01:00
Philip Sargent
95b9daca80
remove commented out code, more comments
2020-07-29 22:54:09 +01:00
Philip Sargent
809633bdd3
Fixed QMs in Admin control panel &remv. OtherCave
2020-07-23 02:16:08 +01:00
Philip Sargent
3e3cae507c
More transactions enabled.
2020-07-22 23:36:46 +01:00
Philip Sargent
1ef5924f0c
Two more transactions
2020-07-22 23:27:25 +01:00
Philip Sargent
070157eacb
TRansX speedup for import + remove fossil profiles
2020-07-22 23:14:10 +01:00
Philip Sargent
427afa9ebd
Removing foissil: subcave and flatpages-redirects
2020-07-22 23:14:09 +01:00
Philip Sargent
f131509c56
3dtopos to survexpos + comments
2020-07-20 22:53:26 +01:00
Philip Sargent
90dfa516da
*team format updates
2020-07-09 18:06:03 +01:00
Philip Sargent
37620b4dbc
*units factor x and feet
2020-07-08 00:00:56 +01:00
Philip Sargent
71b5383090
parse 2006 logbook from html
2020-07-07 19:07:45 +01:00
Philip Sargent
52afb9f466
units conversion not quite working
2020-07-07 02:46:18 +01:00
Philip Sargent
efc43b0863
*units in feet and metres, subcaves
2020-07-07 01:35:58 +01:00
Philip Sargent
ff3cdb10dc
extra error printout and remove old code
2020-07-06 21:46:58 +01:00
Philip Sargent
d27a74c97b
per svxfile debug printing enabled
2020-07-06 21:46:19 +01:00
Philip Sargent
d2833d26cc
fix schema and try cache caves import
2020-07-06 20:27:31 +01:00
Philip Sargent
8530b0643d
person attribution of surveyed length working
2020-07-06 01:24:43 +01:00
Philip Sargent
3f9971d2ee
title and wallet folders working in /survexfile/258
2020-07-05 17:22:26 +01:00
Philip Sargent
5be41c8163
splays and alias splays implemented
2020-07-04 13:31:46 +01:00
Philip Sargent
51d0daafdd
QM placeholder logbook entries sorted out
2020-07-04 01:10:53 +01:00
Philip Sargent
5ed6271c08
rename variables and leglength calc
2020-07-04 01:10:17 +01:00
Philip Sargent
abbe8d467b
refactored LinearLoad(), output unchanged
2020-07-03 18:08:59 +01:00
Philip Sargent
fd6f0b0a35
stack-based state of *data fixed
2020-07-03 17:22:15 +01:00
Philip Sargent
67f66b72e8
State push/pop working
2020-07-03 14:53:36 +01:00
Philip Sargent
9a514e7d3f
rebuild all .3d files and progress on compass/clino/tape
2020-07-02 16:25:51 +01:00
Philip Sargent
df434cd399
SurvexBlocks now importing in deatil
2020-07-01 22:49:38 +01:00
Philip Sargent
8cc768e5b6
fix survexdirectories to ref files properly
2020-07-01 17:41:09 +01:00
Philip Sargent
514887d19f
Fix needed for pending caves with no xml file
2020-06-30 17:59:53 +01:00
Philip Sargent
f76e0d3a16
rename Tunnel files to Drawings files - phase 1
2020-06-30 15:52:29 +01:00
Philip Sargent
0a57ac3132
all SurvexDirectory set OK, pending caves made
2020-06-30 15:39:24 +01:00
Philip Sargent
be2b17ea85
More debugging and warnings
2020-06-30 15:24:42 +01:00
Philip Sargent
39f042240d
Fix SurvexDirectory import
2020-06-29 21:16:13 +01:00
Philip Sargent
a60a495c83
Creating forgotten caves & better GetCaveLookup()
2020-06-29 21:15:42 +01:00
Philip Sargent
459ed11b58
avoiding problem in KH QMs import
2020-06-28 15:57:40 +01:00
Philip Sargent
bf1c683fd0
fixing parent blocks & titles
2020-06-28 14:42:26 +01:00
Philip Sargent
122cdd7fc8
replace GetCaveByReference
2020-06-28 01:50:34 +01:00
Philip Sargent
899ba13df4
working and refactored
2020-06-27 19:00:26 +01:00
Philip Sargent
467baec7da
Renaming functions
2020-06-27 18:00:24 +01:00
Philip Sargent
4716eaa4b6
Working. More fault checking.
2020-06-27 17:55:59 +01:00
Philip Sargent
c55716df08
move function (correctly this time)
2020-06-27 12:08:02 +01:00
Philip Sargent
e2713cfe2d
recursive scan *import to make linear filelist
2020-06-27 00:50:40 +01:00
Philip Sargent
030c49ff7c
rewritten QM loading from SVX files
2020-06-25 03:17:56 +01:00
Philip Sargent
d3654266ee
Better error msgs, one bug fix
2020-06-25 02:10:20 +01:00
Philip Sargent
04f14c91f0
rearrange ref and comment detection
2020-06-24 22:46:18 +01:00
Philip Sargent
664c18ebbe
refactor team and ignore sections
2020-06-24 19:07:11 +01:00
Philip Sargent
3645c98685
extract *date function
2020-06-24 17:55:42 +01:00
Philip Sargent
45bbfce4d3
extract *ref, ;ref and ;QMs to functions
2020-06-24 14:49:39 +01:00
Philip Sargent
bb69cc073a
start refactor survex import
2020-06-24 14:10:13 +01:00
Philip Sargent
dc5a53376d
exploring recusrive behaviour
2020-06-24 02:33:43 +01:00
Philip Sargent
6bf762b72f
bin Makesurvexstation, survextitle, survexEquate
2020-06-24 01:57:20 +01:00
Philip Sargent
d6c4ffca5a
tunnelfile.scans name change for compatibility
2020-06-24 00:36:32 +01:00
Philip Sargent
c91aa4be47
Simple renaming too-similar variables
2020-06-24 00:18:01 +01:00
Philip Sargent
9cd70b31ac
simple rename survexscansfolder to scansfolder
2020-06-23 23:46:33 +01:00
Philip Sargent
b64c779a58
rename SurvexScansFolders and tidy survex parser
2020-06-23 23:34:08 +01:00
Philip Sargent
674cea629d
clean up import statements: more specific
2020-06-22 00:03:23 +01:00
Philip Sargent
b35a0b0d26
Fully working dj 1.11.29
2020-06-19 16:39:05 +01:00
Philip Sargent
2c469718f6
caves, scans, survex work in databaseRest
2020-06-19 00:26:15 +01:00
Philip Sargent
d9c6986a89
static files redone
2020-06-18 21:50:16 +01:00
Philip Sargent
222d85f052
regex deprecation warning
2020-06-18 10:59:11 +01:00
Philip Sargent
94e5a06a15
clean up survexlegs
2020-06-16 19:27:32 +01:00
Philip Sargent
9f5e779b5e
remove Survey & virtual survey wallet - never used
2020-06-16 16:17:35 +01:00
Philip Sargent
1b693da5ed
break recursive import cycle
2020-06-16 16:07:36 +01:00
Philip Sargent
453af2851b
Stop storing all SurvexStations
2020-06-15 03:28:51 +01:00
Philip Sargent
d4deea2019
remove tinyMCE more
2020-06-14 10:05:25 +01:00
Philip Sargent
fb0438d352
bugfix returning multiple object catch
2020-06-13 01:26:28 +01:00
Philip Sargent
44fe6a8b89
cleanup and better DatIssue msgs
2020-06-13 01:24:46 +01:00
Philip Sargent
269b8840ad
import fixes & statistics table
2020-06-12 18:10:07 +01:00
Philip Sargent
092c8bb913
stopped storing survex legs
2020-06-12 14:06:03 +01:00
Philip Sargent
d807e3de7d
Object storage as alternative to SQL
2020-06-08 21:33:32 +01:00
Philip Sargent
9237a6262e
Make import robust against duplicate kataster numbers
2020-06-07 17:49:58 +01:00
Philip Sargent
fda50ed570
attempt to simplify wnt horribly wrong
2020-06-06 22:51:55 +01:00
Philip Sargent
90dc3dac3b
Change troggle horizontal menu items
2020-06-01 17:41:41 +01:00
Philip Sargent
8c4c2ad1cf
Progress dots on importing data
2020-06-01 00:42:48 +01:00
Philip Sargent
5d89cf9474
Delete SURVEYS.CSV code
2020-05-31 21:03:40 +01:00
Philip Sargent
69d2c0887c
Adding progress dots to import print output and fix SURVEY_SCANS
2020-05-31 19:23:07 +01:00
Philip Sargent
8e577022b2
Reducing input print output
2020-05-31 19:21:54 +01:00
Philip Sargent
3264b6edef
bug fix in logbook parser
2020-05-30 20:31:20 +01:00
Philip Sargent
01e098339e
Imposrt mad more specific
2020-05-30 12:35:15 +01:00
Philip Sargent
d857cc9084
format tidy & normalise paths in survex *inlcude
2020-05-30 02:35:05 +01:00
Philip Sargent
6a755598b2
Moved classes to models_caves and fixed imports
2020-05-28 04:54:53 +01:00
Philip Sargent
df3917a677
Expunge cavetab
2020-05-28 02:20:50 +01:00
Philip Sargent
cb4128436c
expung imagekit and clean import lists
2020-05-28 01:38:35 +01:00
Philip Sargent
6cc578435c
Refactor to avoid loading unused surveystations
2020-05-28 01:16:45 +01:00
Philip Sargent
c9657aeb8c
preparing to clean up LoadPos
2020-05-26 16:41:11 +01:00
Philip Sargent
50d753a87b
Convert codebase for python3 usage
2020-05-24 20:56:27 +01:00
Philip Sargent
b69bdcd126
tidying and prep for python3
2020-05-24 13:35:47 +01:00
Philip Sargent
40ad04b79f
unused code commented out
2020-05-24 13:30:39 +01:00
Philip Sargent
15d0d05185
bugfix
2020-05-20 13:40:09 +01:00
Philip Sargent
e017c6effc
Indented msgs for recursive file traversal
2020-05-15 21:45:23 +01:00
Philip Sargent
d4ac28af18
Remove PHOTOS_ROOT and DPhoto class
2020-05-15 21:32:55 +01:00
Philip Sargent
931aa4e3cb
add mysql startup documentation
2020-05-14 19:37:46 +01:00
Philip Sargent
ccc5813b3f
indent recursion and update comments
2020-05-14 17:21:34 +01:00
Philip Sargent
e4290c4ab0
adding *ref to troggle svx parser
2020-05-13 19:57:07 +01:00
Philip Sargent
39c622d5bf
dbReset now loads into memory first (fast err checking), then into db
2020-04-30 23:15:57 +01:00
Philip Sargent
ecf92e2079
getting the LoadPos to work better
2020-04-28 21:50:53 +01:00
Philip Sargent
b4c0c4d219
Understanding and speeding up LoadPos
2020-04-28 18:26:08 +01:00
Philip Sargent
4be8c81291
reducing clutter in output
2020-04-28 01:18:57 +01:00
Philip Sargent
a8460065a4
Thorough spring clean and profiling
2020-04-27 23:51:41 +01:00
b123f6ada7
Dumps loaded data into a .sql file
2020-04-16 20:36:42 +01:00
e5c288c764
get the profile display working & bug fix
2020-04-15 23:29:59 +01:00
78f8ea2b5b
bug fixed for new logbook
2020-04-13 17:35:58 +01:00
e08b4275a9
2010 is html format not wiki format.
...
Or at least, now it is.
2020-04-12 23:03:00 +01:00
ac9f3cf061
New cacheing for parsed logbooks. All logbooks load in 75 seconds now.
2020-04-12 22:29:30 +01:00
79a31a41f9
Fixed bad import of surveyscans references from tunnel files
2020-04-11 00:36:27 +01:00
d71e31417b
scanned image files importing
2020-04-09 02:40:32 +01:00
53b797fb53
Validation of mugshot or blrub file added
2020-04-01 19:58:31 +01:00
Philip Sargent
b07c888c7a
debug for crashing tunnel import
2020-02-25 14:22:50 +00:00
Sam Wenham
e77aa9fb84
Changes needed to stop the survex parser having to go through the data twice
...
Taken from the Django 1.10 upgrade branch
2020-02-21 15:57:07 +00:00
Philip Sargent
2fc60f9f74
Fixing logbooks with parse errors
2020-02-20 15:26:33 +00:00
Philip Sargent
c5055e7f34
backport order of operations in reset() and change logbook parser to do paragraphs differently
2020-02-20 14:13:38 +00:00
Sam Wenham
a26109cb30
Allow comments against names in logbooks in brackets
...
Convert accent chars in names into simple chars as this is what people enter in the logbook
2019-07-11 12:29:38 +01:00
Sam Wenham
2ebb37552f
Just commit the logbook parser this time (can we move to git now!!!)
2019-06-26 21:21:37 +01:00
Sam Wenham
97426a0ddb
Backed out changeset: 4552f42bdf54
2019-06-26 20:57:24 +01:00
Sam Wenham
8a1be45aac
Remove this stupid hard coded name match
2019-06-26 20:56:08 +01:00
expo on server
02d3cc84d5
Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded.
2019-06-26 03:32:18 +01:00
Sam Wenham
b42249890e
Updating caves and entrances is no longer nuclear!
...
Big overhaul of people processing, fullname added to the model
lastname is now names -1 unless you only have one (yes you Wookey)
this allows for Jon Arne Toft and Wookey to live it the same DB
names can now have html chars in them, this should be real unicode but that can
only happen when we go to Python 3!
2019-04-19 22:52:54 +01:00
Sam Wenham
cc313246bb
missed objects
2019-04-18 19:27:23 +01:00
Sam Wenham
bfe018cde6
Clear data issues for logbooks before reloading
2019-04-18 19:26:09 +01:00
Sam Wenham
23df89cf31
Fix CSRF issues in svx form
...
Set date formats
Add DataIssue model and add errors to it to allow us to give people a list of
stuff to fix
2019-04-14 22:45:31 +01:00
Sam Wenham
d1d0c24ed8
Sort people by notability
...
Better errors and tidy
Nicer date formats
2019-04-02 02:04:38 +01:00
Wookey
b3089fafe9
Merge lots of troggle fixes
2019-04-02 00:57:54 +01:00
Wookey
e913a56a6b
folk.csv has moved into 'folk' dir out of 'noinfo'
2019-04-02 00:57:13 +01:00
Sam Wenham
10f1cdb458
Better error messages
2019-03-31 16:44:58 +01:00
Sam Wenham
9df91b221b
Support html and wiki logbook entrys
...
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
2019-03-31 15:39:53 +01:00
Sam Wenham
a4532a29da
Update new management command for DB reset
...
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
2019-03-30 13:58:38 +00:00
Sam Wenham
b4296f1736
Fix people list
...
Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit
2019-03-09 18:21:10 +00:00
Sam Wenham
1bac650aee
There is no point having two functions do basicaly the same thing so make the
...
load all logbooks call load logbook(expo)
Remove the return message from load logbook as it isn't used
2019-03-09 11:18:44 +00:00
Sam Wenham
9fc80bed35
Make the logbook parser a little more sane
...
Move the parser to expo mapping to settings
Set a default parser
Iterate over the expo years rather than the mapping list!
2019-03-06 23:20:34 +00:00
Sam Wenham
77a6015ad6
Fix the All Survex page to work with 1623 area
2019-02-25 20:13:28 +00:00
Sam Wenham
b4f4db5754
Deal better with the wallet letter number combo of 2019#X01
2019-02-24 18:55:30 +00:00
Sam Wenham
e6fa54d0e5
Fix survey scans
...
Remove the assert for folders in survey wallets, this does mean currently they
will be ignored by troggle.
2019-02-24 16:46:02 +00:00
Sam Wenham
f16b4e3f47
Make the suryeys importer not explode
2019-02-24 14:29:14 +00:00
Sam Wenham
4ad5b68433
Make things more compatiable with newer python
...
Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk
2019-02-24 13:03:34 +00:00
expoonserver
9802f45452
Add missing linefeed on survey-parsing error message
2018-06-18 23:43:20 +01:00
expoonserver
1ad58d6b5d
Make sure that cave parser only reads .html files in cave_data dir (to stop foo~ causing 'duplicate cave' error)
2018-06-18 23:17:05 +01:00
Sam Wenham
798ae591c6
Django 1.7 mostly working. Big refactor so probably bugs
2018-04-15 16:28:13 +01:00
Sam Wenham
7877efba0a
Up to 1.6.11 on stretch. New manage.py. Some tidying
2018-04-15 12:00:59 +01:00
Sam Wenham
c939013b14
Add ref as a valid survex command to prevent errors
2018-04-14 16:13:21 +01:00
expoonserver
6652e3f160
remove code saying we can't do interlaced pngs. It's fine now.
2015-10-02 15:07:03 +01:00
Sam Wenham
7056f9a8b2
Remove balkonhoehle from the QM parser as this will need a lot of effort to get working
2015-06-28 12:28:18 +01:00
expo
03cad0a37f
Survex parser fix to avoid allocation on error (by martin).
2015-06-24 04:09:19 +01:00
DWalker
e84d990366
Add in balkon hoehle QM list
2015-05-25 21:55:54 +01:00
Wookey
fe6750e824
Fix up obvious URLs containing subarea names (smkridge)
2015-04-08 03:40:57 +01:00
Sam Wenham
4560e0da84
Revert all of this the date is needed and is a not null in the db
2015-01-26 21:53:32 +00:00
Sam Wenham
f9c2e0e170
One more try
2015-01-26 21:15:17 +00:00
Sam Wenham
cf413dd03c
Ooops that wasn't right
2015-01-26 21:13:47 +00:00
Sam Wenham
4965678443
Don't assert an error on bad date formats
2015-01-26 21:12:27 +00:00
Sam Wenham
67f94f9436
A little more verbosity
2015-01-19 22:48:50 +00:00
Sam Wenham
1186662960
Add a little verbosity
2015-01-19 22:41:48 +00:00
Sam Wenham
3010961383
Try and ignore files that don't end .html (We really need to change to .xml) eg .html.orig!!
...
Change the index on troggle to move on with the year
2015-01-19 21:28:35 +00:00
Wookey
f4f1b3ca6d
Allow comma in starcommands (*,fix) (comma is default valid *set blank)
2014-07-01 02:26:26 +01:00
Wookey
4a93790c7e
Fix survex parser to allow whitespace between * and command (as survex
...
does).
2014-07-01 02:12:34 +01:00
expoonserver
b1d6e1c3d5
Replace assert on unrecognised commands with print, so that a minor
...
parsing issue doesn't completely kill a parsing update.
Add parsing for requires and alias commands.
2014-06-26 02:34:19 +01:00
wookey
3f98470af8
Add a function for running people parser
...
And comments on how logbooks can't be read in until 'year' exists in database
2013-06-25 15:59:19 +01:00
Wookey
3057d2a232
Add checking for compass too
...
Only print filenames on error by default
2013-05-22 02:33:47 +01:00
Wookey
d1ac659d4f
Add error check in place where parser died
2013-05-22 02:10:58 +01:00
wookey
bb1989d0f0
Add some exception checking to parsers/caves.py so that missing entrance
...
slugs don't blow up the import. Also reduce the noise, so
you just get a warning about missing slugs printed out
2012-09-24 23:23:38 +01:00
wookey
418e5e1d3f
Add debug for which entrance file was being read so we get a clue where to look when 'databasereset newcaves' falls over
2012-09-24 22:38:35 +01:00
Wookey
3b12e6d975
Add some debug to cave parser as it's easy to make it fail
...
e.g. by referring to slugs that don't exist.
2012-09-24 22:29:18 +01:00
Martin
1a0e577606
Bug fixing of cave and entrance forms removal of slugs
2012-08-14 22:51:15 +02:00
Martin Green
79b7d32664
Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis.
2012-08-10 19:02:13 +02:00
expo
dd66ad835a
Fixed directory names for the survey scans such that surveys could be found. It did not seem possible to simply change the localsettings.py file to get it to work.
2012-08-08 11:29:15 +02:00
expo
05004aa874
Fix up parser paths so everything is found
2012-08-05 00:26:05 +02:00
Martin Green
c2029df3c9
New parser for new cave format
2012-06-10 16:56:12 +01:00
Martin Green
711fefb0da
Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags.
2012-06-10 14:59:21 +01:00
Wookey
ae693ca4c5
Add 2010 and 2011 logbooks to parsing list (can we make this auto
...
somehow - by agreeing a logbook format, or letting it guess)?
2011-09-15 12:12:18 +01:00
Wookey
c23fcc5b06
rest of martin's changes, without reverting lineend issues
2011-07-11 23:28:23 +01:00
Martin Green
10799e2ce3
Do not make an entrance redirect for entrances without there own pages
2011-07-11 22:37:49 +01:00
Wookey
dc1327674c
remove all the DOS linefeeds
2011-07-11 02:10:22 +01:00
Martin Green
65c55f0f21
Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves.
2011-07-11 00:15:59 +01:00
Martin Green
a128401d49
Added parsing of all.svx, along side parsing individual caves.
...
Added the making and parsing of all.pos to determine the location of stations.
Mare work is required so the caves are parsed and stored only once.
Survex parsing appears to include bugs, that print out errors.
2011-07-11 00:01:12 +01:00
Martin Green
69ab1e0249
Changed to regex to make 2003 expo logbooks parse
2011-07-10 23:45:45 +01:00
Martin Green
50545af223
Added editing of flat pages. Added slugfields to models to refer to them.
2011-06-02 19:16:16 +01:00
Martin Green
b001df1f53
edit logbooks, new logbook format, increased database normalisation
2011-05-01 19:32:41 +01:00
Martin Green
1cc7f2d92e
Allow survey scans to be scrapped with a file in the top level directory of the year
2011-05-01 19:20:25 +01:00
goatchurch
2435639498
rolled back a bad update
2009-09-14 23:23:09 +01:00
expo
2be3e4ce9d
get survey scans into database
2009-09-14 23:09:50 +01:00
goatchurch
1294444026
make 2008 logbook correctly parse
2009-09-14 22:52:46 +01:00
goatchurch
7578b65573
able to save sketches up from tunnel
2009-09-13 17:27:46 +01:00
goatchurch
ced45c92f7
tunnelfiles scheme added
2009-09-11 23:56:47 +01:00
goatchurch
f21cddb2d0
modelviz added
2009-09-11 09:04:59 +01:00
goatchurch
735b729a41
survey scans features added
2009-09-10 22:07:31 +01:00
goatchurch
c5b933f922
parsing
2009-09-08 23:05:04 +01:00
expo
29adaa03c6
get rid of photo
2009-08-29 18:08:55 +01:00
goatchurch
c66b5e2dad
[svn] latest hacking for various statistics
2009-08-05 11:58:36 +01:00
goatchurch
9077462893
[svn] now with ability to make new svx file
2009-08-01 07:31:27 +01:00
goatchurch
7158a79a34
[svn] full checkin. animations disabled, sorry
2009-07-27 13:43:43 +01:00
substantialnoninfringinguser
263b640641
[svn] Various bug fixes, using more raw_id fields in admin so it loads faster. I had to put onLoad="contentHeight();" back into the base template. This is a bad solution, I would rather use Martin's, but it wasn't working.
2009-07-22 16:18:00 +01:00
substantialnoninfringinguser
b9bbccfe00
[svn] * Make descriptions parser also replace links to descriptions from Cave models' underground_descriptions with wikilinks for valid (existing) links
...
* Make entrances searchable in admin by cave kataster number
2009-07-16 05:37:33 +01:00
martin speleo
aa26690e33
[svn] Pareser for cave descriptions
2009-07-04 17:19:30 +01:00
martin speleo
09581829d1
[svn] Changed addToArgsSurveyStation such that it does not pass a surveystation model to html_to_wiki. Which was unecessary as html_to_wiki returned it without modification. By removing it html_to_wiki can be cleaned up.
2009-07-04 17:08:48 +01:00
martin speleo
3afb94f5d2
[svn] Work on turn html pages into cavedescription models.py.
...
Moved parser/cavetabs html_to_wiki function to utils.py
Added databaseReset.py desc to refresh the cavedescriptions.
2009-07-04 16:42:17 +01:00
substantialnoninfringinguser
dd76a1a0be
[svn] * Adding JS fill in next QM number via ajax.
...
* Slight models cleanup- get rid of TroggleImageModel class, use mixin instead.
* Collect various troggle shared functions into utils.py
2009-07-04 08:27:49 +01:00
martin speleo
c132477f80
[svn] Added cavedescription and new subcave.
...
Changed parsers/survex to read *title into subcave
2009-07-04 00:28:28 +01:00
martin speleo
65ef255b99
[svn] Fixed the following of *includes by adding white space to the end of the regex.
2009-07-03 23:56:39 +01:00
substantialnoninfringinguser
8446047ab2
[svn] Brief code cleanup.
2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
205a73917d
[svn] Fix leftover from expo -> core rename, and add databaseReset.py to README.txt
2009-07-02 22:31:28 +01:00
substantialnoninfringinguser
ae3fe8cd42
[svn] Renaming troggle.expo to troggle.core. To do this, used:
...
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`
and then manually checked each change (had to remove a couple)
2009-07-02 20:43:18 +01:00
substantialnoninfringinguser
c0b274767b
[svn] Add photos wiki syntaxes: e.g.
...
[[display:centre photo:andyc.jpg]] where centre is a class applied to image, and andyc.jpg is the filename of a Photo model instance. Image will be displayed as thumbnail with link to full size image.
[[photo:andyc.jpg]] will produce a link to the admin page for the andyc.jpg Photo model instance.
[[photo:andyc.jpg Title of the link]] will produce a link to the admin page for the andyc.jpg Photo model instance with link text "Title of the link"
2009-07-02 04:10:51 +01:00
substantialnoninfringinguser
0306723c95
[svn] Whoops, forgot to add the file in last revision.
2009-06-14 04:36:19 +01:00
substantialnoninfringinguser
af9743026e
[svn] Added beginnings subcaves parser. This required importing more information from cavetab, namely the location where the main cave page appeared on the old expo website.
2009-06-14 04:33:19 +01:00
substantialnoninfringinguser
6d6991e266
[svn] Added detection of noinfo in cave parser. It sets the non_public flag to true, and the view then shows nonpublic.html instead of the cave if the user isn't logged in.
2009-06-10 17:47:05 +01:00
goatchurch
17175637dc
[svn] codemirror
2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
006becf6ca
[svn] Removed redundant fields "date" and "place" from Persontrip model. A PersonTrip's date and place are stored in its parent LogbookEntry. PersonTrips are the people who participate in the trip in a LogbookEntry, so it would make no sense to have different dates and places from the LogbookEntry they are foreignkeyed to.
2009-06-09 00:29:00 +01:00
substantialnoninfringinguser
97e423ba86
[svn] fix imports
2009-05-23 16:51:21 +01:00
substantialnoninfringinguser
f6d3a7c84e
[svn] switched from dodgy manually writing to logfile to using python's logging module, which seems great
2009-05-22 06:17:24 +01:00
substantialnoninfringinguser
83634fe95a
[svn] minor logfile mistake
2009-05-21 22:55:08 +01:00
substantialnoninfringinguser
891b3abb44
[svn] Updates to allow subcave tree with nice admin.
2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
2c2f11be39
[svn]
2009-05-19 06:32:42 +01:00
substantialnoninfringinguser
21c39f70de
[svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.
...
- Fix problems in QM parsing script
2009-05-17 04:31:23 +01:00
substantialnoninfringinguser
7566faf77b
[svn] Make the workaround to avoid parsing interlaced pngs actually work (see issue # 14)
2009-05-15 03:56:11 +01:00
substantialnoninfringinguser
e9e755b517
[svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and download buttons and made them work too.
...
Changed ordering on PersonExpeditions so that it is based on their expedition. That way, even if we don't have date info on when a user was on expo exactly, pages like personindex work correctly.
2009-05-14 06:19:46 +01:00
substantialnoninfringinguser
b31d022c1a
[svn] Dynamic thumbnail generation for photos and survey scans using imagekit, further improving registration system, other misc.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8336 by cucc @ 5/10/2009 11:05 PM
2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
919c7e932a
[svn] Fixes to deal with reorganization of expo surveys repository. Now that survey scans and Surveys.csv are in different directories, we have two settings variables, settings.SURVEYS for the root of the survey repo, and settings.SURVEY_SCANS for the surveyscans directory.
...
Fixed tab / indent muck in surveys parser. Commented out some "file abstraction" stuff for the time being.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8335 by cucc @ 5/10/2009 7:26 AM
2009-05-13 06:22:53 +01:00
substantialnoninfringinguser
e2e47e5876
[svn] fix it for real this time
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8327 by cucc @ 5/3/2009 6:18 AM
2009-05-13 06:18:09 +01:00
substantialnoninfringinguser
a19781d7dd
[svn] fix import naming mistake
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8326 by cucc @ 5/3/2009 6:17 AM
2009-05-13 06:17:09 +01:00
substantialnoninfringinguser
625b2156e3
[svn] Weeks of local changes.
...
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8324 by cucc @ 5/3/2009 5:56 AM
2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
6137f8baaa
[svn] Logbook entries are now at /YYYY-MM-DD/slug .
...
Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8308 by aaron @ 3/16/2009 7:27 PM
2009-05-13 06:09:55 +01:00
substantialnoninfringinguser
157f11b659
[svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated.
...
Various other little things, e.g. filled in the footer with links.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8305 by aaron @ 3/16/2009 8:53 AM
2009-05-13 06:08:04 +01:00
substantialnoninfringinguser
91e4f0f8c0
[svn] Reverted the reverts from 8267. Fixed the next / previous trip in personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things.
...
Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8274 by aaron @ 3/14/2009 8:38 AM
2009-05-13 06:02:42 +01:00
substantialnoninfringinguser
a4edfca30e
[svn] Got QM pages working.
...
Started scripts for exporting to old expo format.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8269 by aaron @ 3/12/2009 2:22 PM
2009-05-13 05:59:40 +01:00
substantialnoninfringinguser
90da85e856
[svn] revert some of the changes (href element) so that the links work
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8267 by julian @ 3/11/2009 10:44 AM
2009-05-13 05:58:58 +01:00
substantialnoninfringinguser
e8da6b9b8b
[svn] Further attempts to make troggle work on windows using surveys stored on an external server
...
settings.PHOTOS changed to setting.PHOTO_ROOT
Made databaseReset.py get info from external server if appropriate (hope this did not break linus disk based scripts)
Still needs more work, to get everything working
Auto create photos directory if it does not already exist
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8262 by julian @ 3/2/2009 1:30 AM
2009-05-13 05:58:18 +01:00
substantialnoninfringinguser
4b34241a16
[svn] Added new abstract base class TroggleModel. Any fields or methods that need to be added to multiple models should be added here.
...
Added edit links to caves, people, logbook entries, and people.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8260 by aaron @ 2/26/2009 5:28 AM
2009-05-13 05:56:56 +01:00
substantialnoninfringinguser
8916b460e1
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8255 by aaron @ 2/23/2009 4:16 AM
2009-05-13 05:55:00 +01:00
substantialnoninfringinguser
24dc7c5a0c
[svn] Photo file handling and mugshots parsing sorted.
...
Made URL settings more relative, less redundant.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8246 by aaron @ 2/18/2009 6:45 AM
2009-05-13 05:53:37 +01:00
substantialnoninfringinguser
25b695e53d
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8245 by aaron @ 2/17/2009 1:09 AM
2009-05-13 05:52:59 +01:00
substantialnoninfringinguser
d25fd97864
[svn] My crusade to make our project more Djangoic.
...
Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers.
Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views.
I also eliminated a couple of unnecessary methods and stuff like that.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8244 by aaron @ 2/16/2009 8:31 AM
2009-05-13 05:52:15 +01:00
substantialnoninfringinguser
b4d82ddeea
[svn] make work
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8236 by julian @ 1/30/2009 5:40 PM
2009-05-13 05:49:50 +01:00
substantialnoninfringinguser
cb52c47aa9
[svn] yorkshire work with tunnel integration
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8232 by julian @ 1/29/2009 11:40 PM
2009-05-13 05:48:47 +01:00
