version 1.84, 2006/05/17 19:10:49
|
version 1.86, 2006/05/17 20:18:38
|
Line 390 class ImageDigilib(Folder,Persistent,Imp
|
Line 390 class ImageDigilib(Folder,Persistent,Imp
|
"""hack""" |
"""hack""" |
#scale thumb |
#scale thumb |
|
|
self.scaleThumbs() |
#self.scaleThumbs() |
|
|
#scale standard |
#scale standard |
|
|
self.scaleWorkingVersions() |
#self.scaleWorkingVersions() |
|
|
|
|
|
|
Line 480 class ImageDigilib(Folder,Persistent,Imp
|
Line 480 class ImageDigilib(Folder,Persistent,Imp
|
|
|
#scale thumb |
#scale thumb |
|
|
self.scaleThumbs() |
#self.scaleThumbs() |
|
|
#scale standard |
#scale standard |
|
|
self.scaleWorkingVersions() |
#self.scaleWorkingVersions() |
|
|
|
|
if RESPONSE: |
if RESPONSE: |
Line 532 class ImageDigilib(Folder,Persistent,Imp
|
Line 532 class ImageDigilib(Folder,Persistent,Imp
|
pass |
pass |
#scale thumb |
#scale thumb |
|
|
self.scaleThumbs() |
#self.scaleThumbs() |
|
|
#scale standard |
#scale standard |
|
|
self.scaleWorkingVersions() |
#self.scaleWorkingVersions() |
|
|
if _rename: |
if _rename: |
self.renameImage(file.filename) |
self.renameImage(file.filename) |
Line 789 class ImageCollection(OrderedFolder, Per
|
Line 789 class ImageCollection(OrderedFolder, Per
|
"""scale thumbs""" |
"""scale thumbs""" |
|
|
#scale thumbs |
#scale thumbs |
ret=os.popen("/docuserver/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/docuserver/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) |
ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(ret.read()) |
RESPONSE.write(ret.read()) |
RESPONSE.write("\n") |
RESPONSE.write("\n") |
Line 801 class ImageCollection(OrderedFolder, Per
|
Line 801 class ImageCollection(OrderedFolder, Per
|
|
|
#scale standard |
#scale standard |
|
|
ret=os.popen("/docuserver/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath) |
ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(ret.read()) |
RESPONSE.write(ret.read()) |
RESPONSE.write("\n") |
RESPONSE.write("\n") |
Line 1631 class ImageCollection(OrderedFolder, Per
|
Line 1631 class ImageCollection(OrderedFolder, Per
|
|
|
def getImageByName(self,filename,onlyName=None): |
def getImageByName(self,filename,onlyName=None): |
"""get filename""" |
"""get filename""" |
print repr(filename) |
|
#FIXME: umlaute in filename |
#FIXME: umlaute in filename |
fn=getattr(self,repr(filename),None) |
fn=getattr(self,repr(filename),None) |
if not fn: |
if not fn: |
Line 1919 class ImageCollectionMD(ImageCollection,
|
Line 1919 class ImageCollectionMD(ImageCollection,
|
|
|
self.REQUEST.SESSION['filename']=filen[0:] |
self.REQUEST.SESSION['filename']=filen[0:] |
|
|
if not self.REQUEST.SESSION['filename']=="": |
# if not self.REQUEST.SESSION['filename']=="": |
url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')() |
# url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')() |
if mode=="view": |
# if mode=="view": |
self.REQUEST.RESPONSE.redirect(url) |
# self.REQUEST.RESPONSE.redirect(url) |
elif mode=="download": |
# elif mode=="download": |
self.REQUEST.RESPONSE.redirect(url+"/download") |
# self.REQUEST.RESPONSE.redirect(url+"/download") |
|
# |
if self.REQUEST.has_key('showall'): |
if self.REQUEST.has_key('showall'): |
|
|
self.REQUEST.SESSION['showall']=self.REQUEST.get('showall') |
self.REQUEST.SESSION['showall']=self.REQUEST.get('showall') |
Line 1939 class ImageCollectionMD(ImageCollection,
|
Line 1939 class ImageCollectionMD(ImageCollection,
|
|
|
|
|
if overview and (generic =='No'):# |
if overview and (generic =='No'):# |
print "selected" |
|
print repr(overview[0][1]) |
|
return overview[0][1]() |
return overview[0][1]() |
else: |
else: |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) |
Line 2065 class ImageCollectionMD(ImageCollection,
|
Line 2064 class ImageCollectionMD(ImageCollection,
|
rc=[] |
rc=[] |
fnIds={} |
fnIds={} |
for image in images: |
for image in images: |
|
|
imagename=image.getElementsByTagName('imagename')[0] |
imagename=image.getElementsByTagName('imagename')[0] |
|
|
|
|
Line 2088 class ImageCollectionMD(ImageCollection,
|
Line 2088 class ImageCollectionMD(ImageCollection,
|
|
|
texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste |
texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste |
for text in texts: |
for text in texts: |
|
|
if not text=="": |
if not text=="": |
text=self.getImageByName(text,onlyName="yes") |
text=self.getImageByName(text,onlyName="yes") |
try: |
try: |
Line 2099 class ImageCollectionMD(ImageCollection,
|
Line 2100 class ImageCollectionMD(ImageCollection,
|
|
|
|
|
rc.sort() |
rc.sort() |
|
|
self.REQUEST.SESSION['filenames']=rc |
self.REQUEST.SESSION['filenames']=rc |
self.REQUEST.SESSION['filenamesIds']=fnIds |
self.REQUEST.SESSION['filenamesIds']=fnIds |
|
|