version 1.88, 2006/05/17 21:42:49
|
version 1.89, 2006/05/22 13:54:37
|
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 522 class ImageDigilib(Folder,Persistent,Imp
|
Line 522 class ImageDigilib(Folder,Persistent,Imp
|
zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath)) |
zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath)) |
|
|
#lesen des upload files und schreiben |
#lesen des upload files und schreiben |
filedata=file.read() |
filedata=_fileupload.read() |
f=open(imagePath,"w") # if we wanted to have filename=id we should do it here! |
f=open(imagePath,"w") # if we wanted to have filename=id we should do it here! |
f.write(filedata) |
f.write(filedata) |
f.close() |
f.close() |
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(_fileupload.filename) |
|
|
|
|
args=self.REQUEST.form |
args=self.REQUEST.form |
Line 789 class ImageCollection(OrderedFolder, Per
|
Line 789 class ImageCollection(OrderedFolder, Per
|
"""scale thumbs""" |
"""scale thumbs""" |
|
|
#scale thumbs |
#scale thumbs |
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) |
ret=os.popen("/docuserver/libs/scaleomat/scaleomat.pl -src=/docuserver/images/ -dir=%s -dest=/docuserver/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("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) |
ret=os.popen("/docuserver/libs/scaleomat/scaleomat.pl -src=/docuserver/images -dir=%s -dest=/docuserver/scaled/small -scaleto=1000 &"% self.ImageViewerPath) |
|
|
|
ret=os.popen("/docuserver/libs/scaleomat/scaleomat.pl -src=/docuserver/images -dir=%s -dest=/docuserver/scaled/medium -scaleto=2000 &"% self.ImageViewerPath) |
|
|
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(ret.read()) |
RESPONSE.write(ret.read()) |
RESPONSE.write("\n") |
RESPONSE.write("\n") |
Line 1075 class ImageCollection(OrderedFolder, Per
|
Line 1078 class ImageCollection(OrderedFolder, Per
|
|
|
#scale thumb |
#scale thumb |
|
|
#self.scaleThumbs() |
self.scaleThumbs() |
|
|
#scale standard |
#scale standard |
|
|
#self.scaleWorkingVersions() |
self.scaleWorkingVersions() |
|
|
|
|
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
Line 1129 class ImageCollection(OrderedFolder, Per
|
Line 1132 class ImageCollection(OrderedFolder, Per
|
|
|
#scale thumb |
#scale thumb |
|
|
#self.scaleThumbs() |
self.scaleThumbs() |
|
|
#scale standard |
#scale standard |
|
|
#self.scaleWorkingVersions() |
self.scaleWorkingVersions() |
|
|
if RESPONSE: |
if RESPONSE: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
Line 1163 class ImageCollection(OrderedFolder, Per
|
Line 1166 class ImageCollection(OrderedFolder, Per
|
|
|
#scale thumb |
#scale thumb |
|
|
#self.scaleThumbs() |
self.scaleThumbs() |
|
|
#scale standard |
#scale standard |
|
|
Line 1789 class ImageCollectionMD(ImageCollection,
|
Line 1792 class ImageCollectionMD(ImageCollection,
|
#scale thumb |
#scale thumb |
|
|
|
|
#self.scaleThumbs() |
self.scaleThumbs() |
|
|
#scale standard |
#scale standard |
|
|
#self.scaleWorkingVersions() |
self.scaleWorkingVersions() |
|
|
if RESPONSE: |
if RESPONSE: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
Line 2084 class ImageCollectionMD(ImageCollection,
|
Line 2087 class ImageCollectionMD(ImageCollection,
|
return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc) |
return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc) |
|
|
|
|
images=dom.xpath("//image") |
imagenames=dom.xpath("//imagename") |
rc=[] |
rc=[] |
fnIds={} |
fnIds={} |
for image in images: |
for imagename in imagenames: |
|
|
imagename=image.xpath('./imagename')[0] |
#imagename=image.xpath('./imagename')[0] |
|
#print "im",imagename |
|
|
|
|
|
|
|
idnr=imagename.xpath('../idnr')[0] |
idnr=image.xpath('./idnr')[0] |
|
id=getText(idnr.childNodes) |
id=getText(idnr.childNodes) |
try: |
try: |
numberOfPages=image.xpath('./numberOfPages')[0] |
numberOfPages=imagename.xpath('../numberOfPages')[0] |
except: |
except: |
numberOfPages=None |
numberOfPages=None |
|
|
Line 2113 class ImageCollectionMD(ImageCollection,
|
Line 2116 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=="": |
|
#print "a" |
text=self.getImageByName(text,onlyName="yes") |
text=self.getImageByName(text,onlyName="yes") |
|
#print "b" |
try: |
try: |
rc.append((str(text),id,nop)) |
rc.append((str(text),id,nop)) |
fnIds[str(text)]=(id,nop) |
fnIds[str(text)]=(id,nop) |
Line 2121 class ImageCollectionMD(ImageCollection,
|
Line 2126 class ImageCollectionMD(ImageCollection,
|
rc.append((repr(text),id,nop)) |
rc.append((repr(text),id,nop)) |
fnIds[repr(text)]=(id,nop) |
fnIds[repr(text)]=(id,nop) |
|
|
|
#print "done" |
rc.sort() |
rc.sort() |
self.REQUEST.SESSION['filenames']=rc |
self.REQUEST.SESSION['filenames']=rc |
self.REQUEST.SESSION['filenamesIds']=fnIds |
self.REQUEST.SESSION['filenamesIds']=fnIds |