2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-29 21:31:54 +00:00
Commit Graph

130 Commits

Author SHA1 Message Date
Wookey
963259d6e3 Allow comma in starcommands (*,fix) (comma is default valid *set blank) 2014-07-01 02:26:26 +01:00
Wookey
9d9fad2ae4 Fix survex parser to allow whitespace between * and command (as survex
does).
2014-07-01 02:12:34 +01:00
expoonserver
042507cb91 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
81d9d7533e 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
7437ac1d38 Add checking for compass too
Only print filenames on error by default
2013-05-22 02:33:47 +01:00
Wookey
b002ca6cc7 Add error check in place where parser died 2013-05-22 02:10:58 +01:00
wookey
fb495119ab 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
631ac20c12 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
6060ae1c08 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
25a73c4ab7 Bug fixing of cave and entrance forms removal of slugs 2012-08-14 22:51:15 +02:00
Martin Green
52736ca1b3 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
484f8f76cc 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
0c20ef2a04 Fix up parser paths so everything is found 2012-08-05 00:26:05 +02:00
Martin Green
19055d01fb New parser for new cave format 2012-06-10 16:56:12 +01:00
Martin Green
9024520184 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
58a2f5340b 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
ded3d58da1 rest of martin's changes, without reverting lineend issues 2011-07-11 23:28:23 +01:00
Martin Green
27e224619e Do not make an entrance redirect for entrances without there own pages 2011-07-11 22:37:49 +01:00
Wookey
78cedb2070 remove all the DOS linefeeds 2011-07-11 02:10:22 +01:00
Martin Green
861daee66f 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
06efab7d73 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
e8eb877229 Changed to regex to make 2003 expo logbooks parse 2011-07-10 23:45:45 +01:00
Martin Green
f318105a9b Added editing of flat pages. Added slugfields to models to refer to them. 2011-06-02 19:16:16 +01:00
Martin Green
a26310767b edit logbooks, new logbook format, increased database normalisation 2011-05-01 19:32:41 +01:00
Martin Green
d38a767d7c 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
9043cef847 rolled back a bad update 2009-09-14 23:23:09 +01:00
expo
df97991143 get survey scans into database 2009-09-14 23:09:50 +01:00
goatchurch
24d90bae75 make 2008 logbook correctly parse 2009-09-14 22:52:46 +01:00
goatchurch
517d291636 able to save sketches up from tunnel 2009-09-13 17:27:46 +01:00
goatchurch
12cf3a6d53 tunnelfiles scheme added 2009-09-11 23:56:47 +01:00
goatchurch
b80168c099 modelviz added 2009-09-11 09:04:59 +01:00
goatchurch
ece3b79e5d survey scans features added 2009-09-10 22:07:31 +01:00
goatchurch
8050476c8a parsing 2009-09-08 23:05:04 +01:00
expo
65cebce198 get rid of photo 2009-08-29 18:08:55 +01:00
goatchurch
e4496e4cd8 [svn] latest hacking for various statistics 2009-08-05 11:58:36 +01:00
goatchurch
60dcb82ef6 [svn] now with ability to make new svx file 2009-08-01 07:31:27 +01:00
goatchurch
b135ab64e7 [svn] full checkin. animations disabled, sorry 2009-07-27 13:43:43 +01:00
substantialnoninfringinguser
57ede091c4 [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
5b3a951be3 [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
84c973f291 [svn] Pareser for cave descriptions 2009-07-04 17:19:30 +01:00
martin speleo
0f8eb4d4e2 [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
c377d0376f [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
b816463d1d [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
96533882c7 [svn] Added cavedescription and new subcave.
Changed parsers/survex to read *title into subcave
2009-07-04 00:28:28 +01:00
martin speleo
64db29fa98 [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
83fa1ea9ac [svn] Brief code cleanup. 2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
6daf57d8fe [svn] Fix leftover from expo -> core rename, and add databaseReset.py to README.txt 2009-07-02 22:31:28 +01:00
substantialnoninfringinguser
e565a6b73b [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
5baddea474 [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
504a70f82b [svn] Whoops, forgot to add the file in last revision. 2009-06-14 04:36:19 +01:00