expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-29 05:11:52 +00:00
Code Issues 19 Projects 3 Activity
2,178 Commits 7 Branches 0 Tags 34 MiB
f23764c486
Commit Graph

516 Commits

Author SHA1 Message Date
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