summaryrefslogtreecommitdiffstats
path: root/parsers
Commit message (Collapse)AuthorAgeFilesLines
* [svn] Brief code cleanup.substantialnoninfringinguser2009-07-036-18/+7
|
* [svn] Fix leftover from expo -> core rename, and add databaseReset.py to ↵substantialnoninfringinguser2009-07-021-7/+3
| | | | README.txt
* [svn] Renaming troggle.expo to troggle.core. To do this, used:substantialnoninfringinguser2009-07-026-12/+7
| | | | | | perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py` and then manually checked each change (had to remove a couple)
* [svn] Add photos wiki syntaxes: e.g.substantialnoninfringinguser2009-07-021-3/+3
| | | | | | [[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"
* [svn] Whoops, forgot to add the file in last revision.substantialnoninfringinguser2009-06-141-0/+48
|
* [svn] Added beginnings subcaves parser. This required importing more ↵substantialnoninfringinguser2009-06-141-0/+7
| | | | information from cavetab, namely the location where the main cave page appeared on the old expo website.
* [svn] Added detection of noinfo in cave parser. It sets the non_public flag ↵substantialnoninfringinguser2009-06-101-0/+5
| | | | to true, and the view then shows nonpublic.html instead of the cave if the user isn't logged in.
* [svn] codemirrorgoatchurch2009-06-091-4/+5
|
* [svn] Removed redundant fields "date" and "place" from Persontrip model. A ↵substantialnoninfringinguser2009-06-091-5/+10
| | | | 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.
* [svn] fix importssubstantialnoninfringinguser2009-05-231-6/+6
|
* [svn] switched from dodgy manually writing to logfile to using python's ↵substantialnoninfringinguser2009-05-222-33/+23
| | | | logging module, which seems great
* [svn] minor logfile mistakesubstantialnoninfringinguser2009-05-211-1/+1
|
* [svn] Updates to allow subcave tree with nice admin.substantialnoninfringinguser2009-05-211-4/+21
|
* [svn]substantialnoninfringinguser2009-05-194-25/+30
|
* [svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.substantialnoninfringinguser2009-05-171-11/+7
| | | | - Fix problems in QM parsing script
* [svn] Make the workaround to avoid parsing interlaced pngs actually work ↵substantialnoninfringinguser2009-05-151-2/+5
| | | | (see issue # 14)
* [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and ↵substantialnoninfringinguser2009-05-141-2/+0
| | | | | | 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.
* [svn] Dynamic thumbnail generation for photos and survey scans using ↵substantialnoninfringinguser2009-05-131-11/+33
| | | | | | 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
* [svn] Fixes to deal with reorganization of expo surveys repository. Now that ↵substantialnoninfringinguser2009-05-131-44/+51
| | | | | | | 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
* [svn] fix it for real this timesubstantialnoninfringinguser2009-05-134-4/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8327 by cucc @ 5/3/2009 6:18 AM
* [svn] fix import naming mistakesubstantialnoninfringinguser2009-05-134-4/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8326 by cucc @ 5/3/2009 6:17 AM
* [svn] Weeks of local changes.substantialnoninfringinguser2009-05-134-84/+169
| | | | | | | | | | | - 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
* [svn] Logbook entries are now at /YYYY-MM-DD/slug .substantialnoninfringinguser2009-05-131-1/+6
| | | | | 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
* [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the ↵substantialnoninfringinguser2009-05-131-2/+2
| | | | | | | 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
* [svn] Reverted the reverts from 8267. Fixed the next / previous trip in ↵substantialnoninfringinguser2009-05-132-23/+19
| | | | | | | | 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
* [svn] Got QM pages working.substantialnoninfringinguser2009-05-131-2/+6
| | | | | 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
* [svn] revert some of the changes (href element) so that the links worksubstantialnoninfringinguser2009-05-132-17/+24
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM
* [svn] Further attempts to make troggle work on windows using surveys stored ↵substantialnoninfringinguser2009-05-131-6/+18
| | | | | | | | | | | 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
* [svn] Added new abstract base class TroggleModel. Any fields or methods that ↵substantialnoninfringinguser2009-05-131-2/+0
| | | | | | | 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
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8255 by aaron @ 2/23/2009 4:16 AM
* [svn] Photo file handling and mugshots parsing sorted.substantialnoninfringinguser2009-05-131-50/+57
| | | | | 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
* [svn]substantialnoninfringinguser2009-05-135-66/+70
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM
* [svn] My crusade to make our project more Djangoic.substantialnoninfringinguser2009-05-132-22/+15
| | | | | | | | | 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
* [svn] make worksubstantialnoninfringinguser2009-05-132-3/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8236 by julian @ 1/30/2009 5:40 PM
* [svn] yorkshire work with tunnel integrationsubstantialnoninfringinguser2009-05-132-51/+51
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
* [svn] cave maps to all logbook entry trips done theresubstantialnoninfringinguser2009-05-132-124/+134
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
* [svn] made index of peoplesubstantialnoninfringinguser2009-05-131-6/+13
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
* [svn] merge the trip table to have surveys by datesubstantialnoninfringinguser2009-05-132-7/+27
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
* [svn] another import statement that caused errors on framos.lawoftheland. ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | does work find on my machine though. Wonder what the difference is. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8206 by aaron @ 1/19/2009 5:59 PM
* [svn] fixed broken import statementsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8205 by aaron @ 1/19/2009 5:51 PM
* [svn] survey block objectsubstantialnoninfringinguser2009-05-133-14/+79
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
* [svn] MOre work on abstracting the file locations on scanned survey notessubstantialnoninfringinguser2009-05-131-5/+8
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8190 by julian @ 1/18/2009 9:04 PM
* [svn] new person expeditionsubstantialnoninfringinguser2009-05-133-4/+41
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM
* [svn] Got rid of data relating to specific machinessubstantialnoninfringinguser2009-05-131-13/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8187 by julian @ 1/18/2009 6:15 PM
* [svn] changed import to work one level lowersubstantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8185 by julian @ 1/18/2009 5:20 PM
* [svn] modified import to take it down a levelsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8184 by julian @ 1/18/2009 5:18 PM
* [svn] modified import settings to import troggle.settings as settingssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8183 by julian @ 1/18/2009 5:12 PM
* [svn] Julian playing with the logbooks and expoyearssubstantialnoninfringinguser2009-05-132-141/+191
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
* [svn] Continued file abstracted work, to get survey files from either hard ↵substantialnoninfringinguser2009-05-131-6/+7
| | | | | | disk or the web. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8173 by julian @ 1/18/2009 12:45 AM
* [svn] Modifications to allow survey files to be pulled from another server. ↵substantialnoninfringinguser2009-05-131-5/+16
| | | | | | By providing directory listing and download functions,. which could also be used by tunnel Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8172 by julian @ 1/17/2009 11:25 PM