# HG changeset patch # User casties # Date 1370618388 -7200 # Node ID 9d8f202e3895e42c23f919b8e92d9ce38e9a64df # Parent 485bf377913a7deb26710d9262bfb6accd59835a fix bug when image uploads have same filename. diff -r 485bf377913a -r 9d8f202e3895 MPIWGProjects.py --- a/MPIWGProjects.py Fri Jun 07 16:29:34 2013 +0200 +++ b/MPIWGProjects.py Fri Jun 07 17:19:48 2013 +0200 @@ -721,6 +721,24 @@ if not fileHd: fileHd = file(os.path.join(package_home(globals()), 'blank.gif')) + filename = filename.replace(' ','_') + + while filename in self.objectIds(spec='MPIWGProject_image'): + # file with this name exists + fs = filename.split('.') + try: + part = fs[-2] + # assume next-to-last part is name + if part[-2] == '_': + # *_n -- increment n + fs[-2] = part[:-1] + chr(ord(part[-1]) + 1) + else: + fs[-2] += '_1' + + filename = '.'.join(fs) + except: + filename += '_1' + newImage = MPIWGProject_image(filename, filename, fileHd) self._setObject(filename, newImage)