diff options
| author | Wookey <wookey@wookware.org> | 2016-01-27 04:27:38 +0000 |
|---|---|---|
| committer | Wookey <wookey@wookware.org> | 2016-01-27 04:27:38 +0000 |
| commit | b9597fbb5720cce1616c3eba94886ee2fc3296f4 (patch) | |
| tree | 1712c0c37c34a60263389b416709d89479a761d9 | |
| parent | edc65915541a0f337d7b506eb96495d955a1941e (diff) | |
| parent | 560b9bf985bfb20d536bebe4bba82c6df98d3de4 (diff) | |
| download | troggle-b9597fbb5720cce1616c3eba94886ee2fc3296f4.tar.gz troggle-b9597fbb5720cce1616c3eba94886ee2fc3296f4.tar.bz2 troggle-b9597fbb5720cce1616c3eba94886ee2fc3296f4.zip | |
Merge 'expofiles' instead of 'expoimages' config changes
| -rw-r--r-- | localsettingspotatohut.py | 4 | ||||
| -rw-r--r-- | localsettingsserver.py | 4 | ||||
| -rw-r--r-- | localsettingsubuntu.py | 4 | ||||
| -rw-r--r-- | parsers/surveys.py | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index e5e91d6..54318f8 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -33,8 +33,8 @@ CAVERN = 'cavern' THREEDTOPOS = '3dtopos' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' SURVEYS = REPOS_ROOT_PATH -SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' -FILES = REPOS_ROOT_PATH + 'expoimages' +SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/' +FILES = REPOS_ROOT_PATH + 'expofiles' PYTHON_PATH = '/home/expo/troggle/' diff --git a/localsettingsserver.py b/localsettingsserver.py index fe1b013..6edb968 100644 --- a/localsettingsserver.py +++ b/localsettingsserver.py @@ -31,8 +31,8 @@ CAVERN = 'cavern' THREEDTOPOS = '3dtopos' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' SURVEYS = REPOS_ROOT_PATH -SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' -FILES = REPOS_ROOT_PATH + 'expoimages' +SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/' +FILES = REPOS_ROOT_PATH + 'expofiles' PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/' diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index a50d208..9779555 100644 --- a/localsettingsubuntu.py +++ b/localsettingsubuntu.py @@ -30,8 +30,8 @@ CAVERN = 'cavern' THREEDTOPOS = '3dtopos' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' SURVEYS = REPOS_ROOT_PATH -SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' -FILES = REPOS_ROOT_PATH + 'expoimages' +SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/' +FILES = REPOS_ROOT_PATH + 'expofiles' EXPOWEB_URL = '/' SURVEYS_URL = '/survey_scans/' diff --git a/parsers/surveys.py b/parsers/surveys.py index 07e8cc2..df73ae0 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -129,11 +129,11 @@ def parseSurveyScans(expedition, logfile=None): survey=survey, new_since_parsing=False, ) - #print "Added scanned image at " + str(scanObj) - if scanFormat=="png": - if isInterlacedPNG(os.path.join(settings.SURVEY_SCANS, "surveyscans", file_)): - print file_+ " is an interlaced PNG. No can do." - continue + print "Added scanned image at " + str(scanObj) + #if scanFormat=="png": + #if isInterlacedPNG(os.path.join(settings.SURVEY_SCANS, "surveyscans", file_)): + # print file_+ " is an interlaced PNG. No can do." + #continue scanObj.save() # dead |