diff options
| -rw-r--r-- | localsettingsserver.py | 4 | ||||
| -rw-r--r-- | localsettingsubuntu.py | 4 | ||||
| -rw-r--r-- | parsers/surveys.py | 10 | ||||
| -rw-r--r-- | templates/dataformat/cave.xml | 2 | ||||
| -rw-r--r-- | templates/dataformat/entrance.xml | 2 |
5 files changed, 11 insertions, 11 deletions
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 diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml index 02aea31..19bc8a7 100644 --- a/templates/dataformat/cave.xml +++ b/templates/dataformat/cave.xml @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> <!-- Only put one cave in this file --> -<!-- If you edit this files, make sure you update the websites database --> +<!-- If you edit this file, make sure you update the websites database --> <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> diff --git a/templates/dataformat/entrance.xml b/templates/dataformat/entrance.xml index 29ff1e8..3ae5224 100644 --- a/templates/dataformat/entrance.xml +++ b/templates/dataformat/entrance.xml @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> <!-- Only put one entrance in this file --> -<!-- If you edit this files, make sure you update the websites database --> +<!-- If you edit this file, make sure you update the websites database --> <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> |