expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-03-05 01:49:37 +00:00
Code Issues18 Projects3 Activity

Merge 'expofiles' instead of 'expoimages' config changes

Browse Source
This commit is contained in:
Wookey 2016-01-27 04:27:38 +00:00
commit 9ec3b9d1f7
4 changed files with 11 additions and 11 deletions

4
localsettingspotatohut.py

@ -33,8 +33,8 @@ CAVERN = 'cavern'
THREEDTOPOS = '3dtopos' THREEDTOPOS = '3dtopos'
EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/'
SURVEYS = REPOS_ROOT_PATH SURVEYS = REPOS_ROOT_PATH
SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/'
FILES = REPOS_ROOT_PATH + 'expoimages' FILES = REPOS_ROOT_PATH + 'expofiles'
PYTHON_PATH = '/home/expo/troggle/' PYTHON_PATH = '/home/expo/troggle/'

4
localsettingsserver.py

@ -31,8 +31,8 @@ CAVERN = 'cavern'
THREEDTOPOS = '3dtopos' THREEDTOPOS = '3dtopos'
EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/'
SURVEYS = REPOS_ROOT_PATH SURVEYS = REPOS_ROOT_PATH
SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/'
FILES = REPOS_ROOT_PATH + 'expoimages' FILES = REPOS_ROOT_PATH + 'expofiles'
PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/' PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/'

4
localsettingsubuntu.py

@ -30,8 +30,8 @@ CAVERN = 'cavern'
THREEDTOPOS = '3dtopos' THREEDTOPOS = '3dtopos'
EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/'
SURVEYS = REPOS_ROOT_PATH SURVEYS = REPOS_ROOT_PATH
SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/'
FILES = REPOS_ROOT_PATH + 'expoimages' FILES = REPOS_ROOT_PATH + 'expofiles'
EXPOWEB_URL = '/' EXPOWEB_URL = '/'
SURVEYS_URL = '/survey_scans/' SURVEYS_URL = '/survey_scans/'

10
parsers/surveys.py

@ -129,11 +129,11 @@ def parseSurveyScans(expedition, logfile=None):
survey=survey, survey=survey,
new_since_parsing=False, new_since_parsing=False,
) )
#print "Added scanned image at " + str(scanObj) print "Added scanned image at " + str(scanObj)
if scanFormat=="png": #if scanFormat=="png":
if isInterlacedPNG(os.path.join(settings.SURVEY_SCANS, "surveyscans", file_)): #if isInterlacedPNG(os.path.join(settings.SURVEY_SCANS, "surveyscans", file_)):
print file_+ " is an interlaced PNG. No can do." # print file_+ " is an interlaced PNG. No can do."
continue #continue
scanObj.save() scanObj.save()
# dead # dead