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
