expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-01 06:11:51 +00:00
Code Issues 19 Projects 3 Activity
2,962 Commits 7 Branches 0 Tags 34 MiB
d3042264b3
Commit Graph

790 Commits

Author SHA1 Message Date
Philip Sargent
0b32d51ba3 bugfix 2022-11-23 00:49:47 +00:00
Philip Sargent
1a9e17a7e8 remove entry-type and tidy cache bits 2022-11-23 00:36:44 +00:00
Philip Sargent
259f85742a moved parser settings 2022-11-21 16:47:25 +00:00
Philip Sargent
a795707552 cache tidy and move settings into parser 2022-11-21 16:41:52 +00:00
Philip Sargent
bcb61f9cd9 remove cache and setdatesfromlogbook 2022-11-21 16:26:30 +00:00
Philip Sargent
4260b0f092 Removed misguided ObjStore as we do need multiuser db 2022-11-21 00:04:33 +00:00
Philip Sargent
4514eda311 make compatible with python 3.11 as well as 3.10 2022-11-18 20:42:03 +00:00
Philip Sargent
725c5ad0cd Updating comments 2022-11-17 01:24:39 +00:00
Philip Sargent
0b89979418 bug found by python 3.11 2022-11-15 23:56:35 +00:00
Philip Sargent
43bf2620f1 dump3d --legs future possibility 2022-11-15 22:25:39 +00:00
Philip Sargent
e0ac09d5ec add 'lastvisit' field to entrances, for the date 2022-10-12 23:12:55 +03:00
Philip Sargent
45f06293f5 Add 'foreign friends' to names alias list 2022-10-12 23:10:48 +03:00
Philip Sargent
ff8eaa241e *team parsing much improved. Copes with everything now. 2022-10-10 15:40:21 +03:00
Philip Sargent
52a035e4cf more fixes 2022-10-10 01:08:37 +03:00
Philip Sargent
8c8b6966a7 sort output, accept more comma use 2022-10-10 00:28:57 +03:00
Philip Sargent
861980a8e9 More fixes to name resolution checking 2022-10-09 23:50:32 +03:00
Philip Sargent
3c31c333f2 Widen the recognizer capabilities for names 2022-10-09 02:32:34 +03:00
Philip Sargent
e6ca20b1ed new report to make aliases visible 2022-10-09 00:17:53 +03:00
Philip Sargent
e9790e70d6 abbrv. names now accepted when parsing logbooks, survex 2022-10-08 01:52:10 +03:00
Philip Sargent
55bc042798 bugfixes 2022-10-08 00:48:21 +03:00
Philip Sargent
4e9680a3ad big changes to cope with survexblock not yet dated, no *date yet 2022-10-07 23:48:41 +03:00
Philip Sargent
f51d1e114e small chnages to name resolution 2022-10-07 23:47:05 +03:00
Philip Sargent
c76cd38d76 use generator when reading individual survex files too, saves anothe 6MB 2022-10-07 11:41:46 +03:00
Philip Sargent
b4c4f2aefc reduce mem use by 21.2MB by using a generator 2022-10-07 10:57:30 +03:00
Philip Sargent
70709c505c Fixing bugs and better error msgs 2022-10-06 21:02:15 +03:00
Philip Sargent
8d08a67302 strip spaces in pending caves list 2022-10-06 12:51:43 +03:00
Philip Sargent
29c5c82337 polishing outputs for importing unseen survex files 2022-10-05 23:18:11 +03:00
Philip Sargent
7e47fe1f30 Parse all files, not just those in the *include tree 2022-10-05 21:11:18 +03:00
Philip Sargent
9e5bdace2c make cache work even if timestamps wrong 2022-10-05 21:10:05 +03:00
Philip Sargent
a6e60c0bf7 working on loading all the non*inlcuded svx files 2022-10-04 00:00:55 +03:00
Philip Sargent
c8163ab0cd fix bug for wallet with empty fpath 2022-10-03 21:18:35 +03:00
Philip Sargent
b60e1f2493 rename data issue tag 2022-09-27 21:37:45 +03:00
Philip Sargent
78a62a1551 error msg was incorrect. fix. 2022-09-26 00:18:41 +03:00
Philip Sargent
2f64e2d4c1 FIx pending caves which had got a bit garbled 2022-09-25 21:43:00 +03:00
Philip Sargent
f3ecdd6d87 Cleaner monitoring output when importing wallets and scans 2022-09-24 00:17:51 +03:00
Philip Sargent
6e3fdd35c1 Replaced maintenance headache with cleaner folder walking 2022-09-23 23:43:34 +03:00
Philip Sargent
97b0ce8c96 removing technical debt, replace convoluted code 2022-09-23 00:49:40 +03:00
Philip Sargent
aa20692ad6 bugfixes and enabling older wallets to be found and listed 2022-09-22 22:41:42 +03:00
Philip Sargent
11b1d41a55 increase entires to 64 2022-09-22 00:22:09 +03:00
Philip Sargent
36995ec051 handling survex files not linked in completely 2022-09-20 02:36:40 +03:00
Philip Sargent
61f9863a06 bug fixes and coping with a list of cave ids in JSON 2022-09-20 01:02:06 +03:00
Philip Sargent
0611c3f00f documn improvements 2022-09-19 21:54:51 +03:00
Philip Sargent
2648bada30 remove URL field from wallet as seen and edited 2022-09-19 20:55:34 +03:00
Philip Sargent
d2c6c4d7fb find perps guilty of bad *ref brhaviour 2022-09-18 23:53:04 +03:00
Philip Sargent
68865a80ef Fixing bad date parsing, better warning msgs 2022-09-16 22:54:22 +03:00
Philip Sargent
f12d0bd580 Remove unneeded code now svx files have been edited 2022-09-15 22:55:16 +03:00
Philip Sargent
0853bbdd19 Many fixes and speedups 2022-08-30 17:58:49 +03:00
Philip Sargent
6daa96b69e correcting output comment 2022-08-30 17:30:46 +03:00
Philip Sargent
ab184bccf3 comment updates 2022-08-25 16:31:38 +03:00
Philip Sargent
79672dd4b3 bugfix 2022-08-25 16:12:13 +03:00
Philip Sargent
760abe1a9e cope with swapped people/title 2022-08-25 15:54:00 +03:00
Philip Sargent
7e9fd0f353 Better display of wallet names copied from svx files 2022-08-24 18:28:15 +03:00
Philip Sargent
96b2c6c9ed fix url for cave edit page in error msg 2022-08-24 14:15:40 +03:00
Philip Sargent
41c68aef26 detecting empty wallets where we only have JSON and no files 2022-08-16 20:02:28 +03:00
Philip Sargent
aaba4fd2a9 minor refactoring 2022-08-16 17:42:37 +03:00
Philip Sargent
3c13f62bd1 re-fettled scan upload, creates Wallet object earlier 2022-08-14 23:40:56 +03:00
Philip Sargent
284e044a03 Fix wallets scan upload faults 2022-08-14 22:52:14 +03:00
Philip Sargent
b093d00ff4 match therion files to wallets, scans names therein 2022-08-14 01:47:53 +03:00
Philip Sargent
8e93680146 personrole is not just about roles 2022-08-13 23:57:57 +03:00
Philip Sargent
edfba8d355 git commit edits to wallet data 2022-08-13 23:56:56 +03:00
Philip Sargent
25c425cff8 QMs grayed out for survex files 2014 and earlier 2022-08-07 23:41:45 +03:00
Philip Sargent
f33c6cc057 bugfix in new wallet 2022-08-06 22:23:39 +03:00
Philip Sargent
0fd3cf43e8 formatting 2022-08-01 17:32:49 +03:00
Philip Sargent
bc3da1182b starting jsn population when we know the data 2022-07-29 17:49:07 +03:00
Philip Sargent
7872e98cb2 fixing pending caves system to be cleaner 2022-07-28 18:36:57 +03:00
Philip Sargent
c29e240c2b creating new wallet now copies nd commits 2022-07-28 18:36:40 +03:00
Philip Sargent
93622b111f obscure bug fixed for lines ;*include 2022-07-28 15:15:11 +03:00
Philip Sargent
fea69c0371 Extend wallets by cave report 2022-07-28 01:48:22 +03:00
Philip Sargent
dd0fcc28dd update todo strings 2022-07-27 23:24:53 +03:00
Philip Sargent
3d7cb78e47 copies all wallet data to drawings repo as backup 2022-07-27 23:24:53 +03:00
Philip Sargent
039792e320 improve reifying process 2022-07-25 15:03:58 +03:00
Philip Sargent
cddcb0e321 fix minor bug in setting dummy entrance 2022-07-25 11:31:43 +03:00
Philip Sargent
476ee482fa Pending caves with 1626 properly 2022-07-25 02:57:00 +03:00
Philip Sargent
5007393536 better error handling 2022-07-23 20:05:58 +03:00
Philip Sargent
a1e538e93a making it work with 1626 no schonberg 2022-07-23 19:26:47 +03:00
Philip Sargent
7288bd9da3 add comment on point where it crashes 2022-07-22 13:42:04 +03:00
Philip Sargent
31b912f3ca bugfixes 2022-07-22 12:40:42 +03:00
Philip Sargent
38eb65ac0e remove unused code 2022-07-22 11:23:00 +03:00
Philip Sargent
796dbf1438 more dead chicken waving 2022-07-21 21:52:10 +03:00
Philip Sargent
f46942fadf typo again 2022-07-21 21:04:49 +03:00
Philip Sargent
3a52d790f0 typo 2022-07-21 21:03:54 +03:00
Philip Sargent
ce7dfd6510 working on MariaDB crash on server 2022-07-21 21:01:57 +03:00
Philip Sargent
931c33cfdb Clean DataIssues output, new therionrefs.log file 2022-07-21 19:01:04 +03:00
Philip Sargent
d058942084 revert, this was a bad idea 2022-07-20 21:04:59 +03:00
Philip Sargent
0a158db97d Trial QM tick mechanism in survex files 2022-07-20 20:47:29 +03:00
Philip Sargent
a215ebd62c fix QM regex for number and rearrange url code 2022-07-20 17:02:38 +03:00
Philip Sargent
549c1649b4 QMs now have working url to survexfile & tick description 2022-07-20 14:44:56 +03:00
Philip Sargent
2e14be61a2 bugfix 2022-07-19 20:54:46 +03:00
Philip Sargent
d9d75b3aee another attempt to avoid non-null parent pseudo error 2022-07-19 20:00:35 +03:00
Philip Sargent
1395ac76e9 Attempt fix to MariaDB crash in databasereset 2022-07-19 19:48:11 +03:00
Philip Sargent
145540caf5 more weirdness in circumventing MariaDB/Django misunderstandings 2022-07-17 16:08:01 +03:00
Philip Sargent
8aab01c126 cleaner zeroth cave setting 2022-07-15 16:44:02 +03:00
Philip Sargent
73e9ae54fa cleaner survexdirectory creation 2022-07-15 16:17:40 +03:00
Philip Sargent
b8355cbf8d fix bugs and tidyup in recent changes 2022-07-15 15:11:49 +03:00
Philip Sargent
86a18c3ebc catch nonUTF8 survex files, DataIssues url editor 2022-07-15 14:09:32 +03:00
Philip Sargent
91c9cf0c31 2019 logbook error fix 2022-07-09 01:55:11 +03:00
Philip Sargent
278a84a485 better error msg 2022-07-09 01:54:48 +03:00
Philip Sargent
8d31ab763d improve date parse eror messages 2022-07-09 01:30:49 +03:00
Philip Sargent
9803ebe2e8 fix bug in Area creation 2022-07-08 22:19:07 +03:00
Philip Sargent
ca5586fc42 Report badly formatted ;QM lines 2022-07-08 20:08:42 +03:00
Philip Sargent
d3572e18c3 QM reports all working 2022-07-06 17:35:08 +03:00
Philip Sargent
7dc3cc3b91 fix for individual QM display from survex 2022-07-06 15:38:53 +03:00
Philip Sargent
da4d7d6d5e shorten slug to fit 2022-07-06 11:10:50 +03:00
Philip Sargent
0ea3ed1ef2 Not quite so broken QMs from survex files 2022-07-05 22:40:58 +03:00
Philip Sargent
2bd617b543 Fixed QM report for survex-imported QMs 2022-07-05 20:24:51 +03:00
Philip Sargent
87fd260051 import diagnostics 2022-07-05 16:30:42 +03:00
Philip Sargent
5d7d2b82b2 Fixing non-null error, even though it should be allowed 2022-07-05 15:57:49 +03:00
Philip Sargent
779afc2f2a QM report pages now not crashing, working.. 2022-07-05 15:38:23 +03:00
Philip Sargent
b5f2d0641d Provide dummy expedition_id to keep MariaDB happy 2022-06-22 23:08:32 +03:00
Philip Sargent
3813b21dcf regularising _URL and _ROOT idiom 2022-04-18 22:48:49 +03:00
Philip Sargent
4b1012cbb4 comment out unused code prior to deletion 2022-04-07 01:13:54 +03:00
Philip Sargent
ed71fa48f1 cleaning unused settings 2022-04-06 21:01:31 +03:00
Philip Sargent
7f16bca7f7 Better error messaged and url 2022-03-29 15:31:25 +01:00
Philip Sargent
3617f9b6d9 bugfix and docum 2022-03-24 20:59:36 +00:00
Philip Sargent
a514355e5e to do updated 2022-03-24 01:16:43 +00:00
Philip Sargent
be410d4d9d minor refactoring 2022-03-24 01:05:50 +00:00
Philip Sargent
13ffe1fcc6 url to full logbooks fixed in logbookentry 2022-03-23 23:35:42 +00:00
Philip Sargent
9ccf5912d4 restored logbook cacheing 2022-03-23 22:55:59 +00:00
Philip Sargent
42b615d16b survex legs bug fix 2022-03-23 20:05:38 +00:00
Philip Sargent
8fd4f818b5 better err text for mysterious error 2022-03-22 02:24:26 +00:00
Philip Sargent
f1b206ad34 fixing bugs after wookey session 2022-03-22 02:22:15 +00:00
Philip Sargent
e4ee4abce8 missing print msg 2022-03-18 10:21:25 +00:00
Philip Sargent
251e3bf844 Bug fixes 2022-03-15 20:53:55 +00:00
Philip Sargent
3390f51049 Form creates wallet folder and contents.json 2022-03-15 17:04:43 +00:00
Philip Sargent
f99ebf84e9 running cavern on svx files improved 2022-03-11 16:22:37 +00:00
Philip Sargent
d6cc32ee9a Detect more survex errors 2022-03-07 16:23:20 +00:00
Philip Sargent
3ac617431f Make .3d files in same dir as .svx 2022-03-06 01:29:45 +00:00
Philip Sargent
7a58aac08e Drawings uploads git works 2022-03-05 22:16:03 +00:00
Philip Sargent
a3a65524b8 better errors for drawings parsing & upload 2022-03-05 20:29:01 +00:00
Philip Sargent
32377f4e6c Cave import & reports fixes 2022-03-05 12:20:26 +00:00
Philip Sargent
7f41017ce3 git merge failure caught in svx files 2022-03-03 00:26:04 +00:00
Philip Sargent
02d58d440e WORKING both py3.9.10 & 3.8.10 (dj2.2.25) 2022-03-02 23:19:48 +00:00
Philip Sargent
601fc2cffc WORKING Dj2.2.24 & 2.2.25 py3.7 2022-03-02 21:15:24 +00:00
Philip Sargent
af50d4912d Catch error if unfixed merges in survex files 2022-03-01 01:30:09 +00:00
Philip Sargent
1da2be03e6 Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new 2021-12-30 01:01:07 +00:00
Philip Sargent
5aac280618 Bug fix and extra comment 2021-12-30 00:56:09 +00:00
Philip Sargent
9b44ba3ef2 precompile regexes 2021-12-19 14:24:20 +00:00
Philip Sargent
8a43cf7dfb logbook cache reading broken - disabled 2021-11-11 22:57:49 +02:00
Philip Sargent
64f89be6a9 docm .3d file generation for CaveView 2021-11-06 23:57:51 +02:00
Philip Sargent
b72706356d fixed mistaken DataIssue report 2021-11-06 23:37:31 +02:00
Philip Sargent
c38aa357b7 Better error msg for overwriting 3d files 2021-11-05 23:51:10 +02:00
Philip Sargent
df43aae33d 2021 docm update re logbook imports 2021-11-05 23:01:10 +02:00
Philip Sargent
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
Philip Sargent
b123f6ada7 Dumps loaded data into a .sql file 2020-04-16 20:36:42 +01:00
Philip Sargent
e5c288c764 get the profile display working & bug fix 2020-04-15 23:29:59 +01:00
Philip Sargent
78f8ea2b5b bug fixed for new logbook 2020-04-13 17:35:58 +01:00
Philip Sargent
e08b4275a9 2010 is html format not wiki format. 
Or at least, now it is.
 2020-04-12 23:03:00 +01:00
Philip Sargent
ac9f3cf061 New cacheing for parsed logbooks. All logbooks load in 75 seconds now. 2020-04-12 22:29:30 +01:00
Philip Sargent
79a31a41f9 Fixed bad import of surveyscans references from tunnel files 2020-04-11 00:36:27 +01:00
Philip Sargent
d71e31417b scanned image files importing 2020-04-09 02:40:32 +01:00
Philip Sargent
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