diff --git a/core/models.py b/core/models.py index fa41f95..8527015 100644 --- a/core/models.py +++ b/core/models.py @@ -801,8 +801,8 @@ class DPhoto(TroggleImageModel): scansFileStorage = FileSystemStorage(location=settings.SURVEY_SCANS, base_url=settings.SURVEYS_URL) def get_scan_path(instance, filename): year=instance.survey.expedition.year - print "WN: ", type(instance.survey.wallet_number), instance.survey.wallet_number - number="%02d" % instance.survey.wallet_number + str(instance.survey.wallet_letter) #using %02d string formatting because convention was 2009#01 + #print "WN: ", type(instance.survey.wallet_number), instance.survey.wallet_number + number=str(instance.survey.wallet_number) + str(instance.survey.wallet_letter) #two strings formatting because convention is 2009#01 or 2009#X01 return os.path.join('./',year,year+r'#'+number,instance.contents+str(instance.number_in_wallet)+r'.jpg') class ScannedImage(TroggleImageModel):