get rid of photo

1 files changed, 6 insertions, 6 deletions

diff --git a/parsers/surveys.py b/parsers/surveys.py
index fc7fb7f..ff78355 100644
--- a/parsers/surveys.py
+++ b/parsers/surveys.py
@@ -25,11 +25,11 @@ def get_or_create_placeholder(year):
     return placeholder_logbook_entry

 

 def readSurveysFromCSV():

-    try:

-        surveytab = open(os.path.join(settings.SURVEYS, "Surveys.csv"))

+    try:   # could probably combine these two

+        surveytab = open(os.path.join(settings.SURVEY_SCANS, "Surveys.csv"))

     except IOError:

-        import cStringIO, urllib

-        surveytab = cStringIO.StringIO(urllib.urlopen(settings.SURVEYS + "download/Surveys.csv").read())

+        import cStringIO, urllib  

+        surveytab = cStringIO.StringIO(urllib.urlopen(settings.SURVEY_SCANS + "/Surveys.csv").read())

     dialect=csv.Sniffer().sniff(surveytab.read())

     surveytab.seek(0,0)

     surveyreader = csv.reader(surveytab,dialect=dialect)

@@ -87,7 +87,7 @@ def listdir(*directories):
 # add survey scans

 def parseSurveyScans(year, logfile=None):

 #    yearFileList = listdir(year.year)

-    yearPath=os.path.join(settings.SURVEY_SCANS, year.year)

+    yearPath=os.path.join(settings.SURVEY_SCANS, "years", year.year)

     yearFileList=os.listdir(yearPath)

     print yearFileList

     for surveyFolder in yearFileList:

@@ -145,4 +145,4 @@ def isInterlacedPNG(filePath): #We need to check for interlaced PNGs because the
     if 'interlace' in file.info:

         return file.info['interlace']

     else:

-        return False
\ No newline at end of file
+        return False