--- ImageArchive/ImageArchive.py 2003/12/04 20:49:44 1.4 +++ ImageArchive/ImageArchive.py 2003/12/05 13:32:29 1.5 @@ -43,7 +43,7 @@ class ImageDigilib(SimpleItem,Persistent f.write(filedata) f.close() os.chmod(filename,0644) - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageStoragePath) @@ -138,8 +138,10 @@ class ImageCollection(Folder, Persistent def xmlinput(self,url): """Anzeige von ausgewaehlten thumbs""" #return url - xmldoc=urllib.urlopen(url).read() + url=urllib.unquote(url) + xmldoc=urllib.urlopen(url).read() + #print url dom=xml.dom.minidom.parseString(xmldoc) images=dom.getElementsByTagName('imagename') @@ -203,7 +205,7 @@ class ImageCollection(Folder, Persistent #print ret #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) #print self.ImageStoragePath - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageStoragePath) RESPONSE.redirect('manage_main') def ImportFiles(self,RESPONSE=None): @@ -228,7 +230,7 @@ class ImageCollection(Folder, Persistent #print ret #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) #print self.ImageStoragePath - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + print os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageStoragePath) RESPONSE.redirect('manage_main') def ImageCollection_config(self):