version 1.64, 2005/10/07 10:51:38
|
version 1.67, 2005/10/17 19:20:49
|
Line 1
|
Line 1
|
|
|
|
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.Folder import Folder |
from OFS.SimpleItem import SimpleItem |
from OFS.SimpleItem import SimpleItem |
from Globals import Persistent,package_home |
from Globals import Persistent,package_home |
Line 124 class generateSet:
|
Line 129 class generateSet:
|
self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%filename)) |
self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%filename)) |
else: |
else: |
if self.version=="working": |
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: |
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() |
image=urllib.urlopen(path).read() |
|
|
|
|
Line 169 class generateSet:
|
Line 179 class generateSet:
|
self.response+=str("<p>Error in File: %s (missing?)<br>\n"%filename) |
self.response+=str("<p>Error in File: %s (missing?)<br>\n"%filename) |
|
|
else: |
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() |
image=urllib.urlopen(path).read() |
|
|
Line 295 class ImageDigilib(Folder,Persistent,Imp
|
Line 307 class ImageDigilib(Folder,Persistent,Imp
|
self.filename=filename |
self.filename=filename |
self.meta=meta |
self.meta=meta |
|
|
|
|
def getMeta(self): |
def getMeta(self): |
"""ausgabe der metadaten""" |
"""ausgabe der metadaten""" |
return self.meta |
return self.meta |
Line 348 class ImageDigilib(Folder,Persistent,Imp
|
Line 361 class ImageDigilib(Folder,Persistent,Imp
|
|
|
def download(self,fmt="&mo=rawfile,hires",suffix=None): |
def download(self,fmt="&mo=rawfile,hires",suffix=None): |
"""download""" |
"""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): |
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 |
filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename |
Line 482 class ImageDigilib(Folder,Persistent,Imp
|
Line 498 class ImageDigilib(Folder,Persistent,Imp
|
def thumb(self,url=None): |
def thumb(self,url=None): |
"""show thumb""" |
"""show thumb""" |
thumbname=os.path.splitext(self.filename)[0]+".jpg" |
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']="<img border=\"0\" src=\"%s\">"% path |
self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path |
if url: |
if url: |
Line 498 class ImageDigilib(Folder,Persistent,Imp
|
Line 515 class ImageDigilib(Folder,Persistent,Imp
|
""" |
""" |
thumbname=os.path.splitext(self.filename)[0]+".jpg" |
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']="<img border=\"0\" src=\"%s\">"% path |
self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path |
if url: |
if url: |
Line 513 class ImageDigilib(Folder,Persistent,Imp
|
Line 533 class ImageDigilib(Folder,Persistent,Imp
|
return pt() |
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): |
def index_html(self): |
"""show image""" |
"""show image with zogilib""" |
#DEVELOP: take first one for server |
#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://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) |
return self.REQUEST.RESPONSE.redirect(path) |
|
|
|
|
Line 550 class ImageCollection(Folder, Persistent
|
Line 587 class ImageCollection(Folder, Persistent
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
|
|
#scalerPath="http://127.0.0.1:18080/digitallibrary/servlet/Scaler/?fn=" |
#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={} |
zipThreads={} |
zipThreads2={} |
zipThreads2={} |
Line 564 class ImageCollection(Folder, Persistent
|
Line 601 class ImageCollection(Folder, Persistent
|
|
|
def getScalerPath(self): |
def getScalerPath(self): |
"""get ScalerPath""" |
"""get ScalerPath""" |
return self.scalerPath |
path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn=" |
|
|
def getImageViewerPath(self): |
def getImageViewerPath(self): |
"""get ImageViewerPath""" |
"""get ImageViewerPath""" |
Line 684 class ImageCollection(Folder, Persistent
|
Line 721 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.id=id |
self.title=title |
self.title=title |
self.ImageStoragePath=ImageStoragePath |
self.ImageStoragePath=ImageStoragePath |
self.ImageViewerPath=ImageViewerPath |
self.ImageViewerPath=ImageViewerPath |
self.defaultMetaString=defaultMetaString |
self.defaultMetaString=defaultMetaString |
|
self.serverPath=serverPath |
|
|
optTMP= Folder.manage_options |
optTMP= Folder.manage_options |
|
|
Line 822 class ImageCollection(Folder, Persistent
|
Line 860 class ImageCollection(Folder, Persistent
|
|
|
|
|
def xmlinput(self,url): |
def xmlinput(self,url): |
"""Anzeige von ausgewaehlten thumbs""" |
"""Anzeige <n ausgewaehlten thumbs""" |
#return url |
#return url |
|
|
url=urllib.unquote(url) |
url=urllib.unquote(url) |
Line 884 class ImageCollection(Folder, Persistent
|
Line 922 class ImageCollection(Folder, Persistent
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImage.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImage.zpt')).__of__(self) |
return pt() |
return pt() |
|
|
def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None): |
def addImage2(self,fileupload,fileName=None,meta=None,use_default=None,RESPONSE=None): |
"""Add""" |
"""Add""" |
|
|
#print "FU",fileupload |
#print "FU",fileupload |
Line 896 class ImageCollection(Folder, Persistent
|
Line 934 class ImageCollection(Folder, Persistent
|
meta=None |
meta=None |
else: |
else: |
meta=None |
meta=None |
|
|
|
if fileName: |
|
fn=fileName |
|
else: |
fn=splitPath(fileupload.filename) |
fn=splitPath(fileupload.filename) |
|
|
manage_AddImageDigilib(self,fn,fileupload,meta=meta) |
manage_AddImageDigilib(self,fn,fileupload,meta=meta) |
|
|
|
if RESPONSE: |
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) |
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) |
#return self.REQUEST['URL1']+'/'+fileupload.filename |
#return self.REQUEST['URL1']+'/'+fileupload.filename |
|
|
Line 1596 class ImageZogiLib(ImageDigilib):
|
Line 1640 class ImageZogiLib(ImageDigilib):
|
ImageViewerPath und ImageStoragePath und wenn vorhanden Pfad zur Collection |
ImageViewerPath und ImageStoragePath und wenn vorhanden Pfad zur Collection |
werden zusaetzlich abgespeichert |
werden zusaetzlich abgespeichert |
""" |
""" |
|
#TODO: scaler path notwendig? |
meta_type="ImageZogiLib" |
meta_type="ImageZogiLib" |
|
|
manage_options=ImageDigilib.manage_options+( |
manage_options=ImageDigilib.manage_options+( |