--- ImageArchive/ImageArchive.py 2005/10/07 10:51:38 1.64 +++ ImageArchive/ImageArchive.py 2005/10/17 19:20:49 1.67 @@ -1,3 +1,8 @@ + +genericServerPath="http://content.mpiwg-berlin.mpg.de/zogilib_images" +#genericServerPath="http://127.0.0.1:8080/zogilib_images" + + from OFS.Folder import Folder from OFS.SimpleItem import SimpleItem from Globals import Persistent,package_home @@ -124,9 +129,14 @@ class generateSet: self.response+=(str("
Error in File: %s (possible missing)
\n"%filename))
else:
if self.version=="working":
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
+ requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString
+
else:
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&mo=rawfile,hires"
+ requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&mo=rawfile,hires"
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString
+
+
image=urllib.urlopen(path).read()
@@ -169,7 +179,9 @@ class generateSet:
self.response+=str("
Error in File: %s (missing?)
\n"%filename)
else:
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires"
+
+ requestString=self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires"
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString
image=urllib.urlopen(path).read()
@@ -295,6 +307,7 @@ class ImageDigilib(Folder,Persistent,Imp
self.filename=filename
self.meta=meta
+
def getMeta(self):
"""ausgabe der metadaten"""
return self.meta
@@ -348,7 +361,10 @@ class ImageDigilib(Folder,Persistent,Imp
def download(self,fmt="&mo=rawfile,hires",suffix=None):
"""download"""
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+fmt
+
+ requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+fmt
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString
+
if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(self.filename):
filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename
@@ -368,16 +384,16 @@ class ImageDigilib(Folder,Persistent,Imp
#return self.REQUEST.RESPONSE.redirect(path)
def updateImageForm(self):
- """form"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self)
- return pt()
+ """form"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self)
+ return pt()
security.declareProtected('View management screens','renameImageForm')
def renameImageForm(self):
- """form"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self)
- return pt()
+ """form"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self)
+ return pt()
security.declareProtected('View management screens','renameImage')
def renameImage(self,newname,RESPONSE=None):
@@ -482,8 +498,9 @@ class ImageDigilib(Folder,Persistent,Imp
def thumb(self,url=None):
"""show thumb"""
thumbname=os.path.splitext(self.filename)[0]+".jpg"
+ requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
self.REQUEST.SESSION['string']=""% path
if url:
@@ -497,8 +514,11 @@ class ImageDigilib(Folder,Persistent,Imp
"""show thumb mit Metadaten erwarten image in ImageCollectionMD
"""
thumbname=os.path.splitext(self.filename)[0]+".jpg"
-
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
+
+ requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString
+
+
self.REQUEST.SESSION['string']=""% path
if url:
@@ -513,12 +533,29 @@ class ImageDigilib(Folder,Persistent,Imp
return pt()
+ def image(self,dw=None,dh=None):
+ """show image only with scaler"""
+ str=[]
+ if (not dw) and (not dh):
+ str.append("mo=file")
+ if dw:
+ str.append("dw=%s"%dw)
+ if dh:
+ str.append("dw=%s"%dh)
+
+ str.append("lv=2&fn=%s"%self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0])
+
+
+ requestString="&".join(str)
+
+ self.REQUEST.RESPONSE.redirect(getattr(self,'serverPath',genericServerPath)+"/scaledImage?"+requestString)
+
def index_html(self):
- """show image"""
+ """show image with zogilib"""
#DEVELOP: take first one for server
#path="http://127.0.0.1:8080/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
- path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
+ path=getattr(self,'serverPath',genericServerPath)+"?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
return self.REQUEST.RESPONSE.redirect(path)
@@ -550,7 +587,7 @@ class ImageCollection(Folder, Persistent
security=ClassSecurityInfo()
#scalerPath="http://127.0.0.1:18080/digitallibrary/servlet/Scaler/?fn="
- scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="
+ #scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="
zipThreads={}
zipThreads2={}
@@ -564,7 +601,7 @@ class ImageCollection(Folder, Persistent
def getScalerPath(self):
"""get ScalerPath"""
- return self.scalerPath
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="
def getImageViewerPath(self):
"""get ImageViewerPath"""
@@ -684,12 +721,13 @@ class ImageCollection(Folder, Persistent
- def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString):
+ def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath=genericServerPath):
self.id=id
self.title=title
self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
+ self.serverPath=serverPath
optTMP= Folder.manage_options
@@ -822,7 +860,7 @@ class ImageCollection(Folder, Persistent
def xmlinput(self,url):
- """Anzeige von ausgewaehlten thumbs"""
+ """Anzeige