--- ImageArchive/ImageArchive.py 2004/03/20 10:46:52 1.20
+++ ImageArchive/ImageArchive.py 2004/07/27 13:36:36 1.25
@@ -38,8 +38,7 @@ class ImageDigilib(Folder,Persistent,Imp
request=self.REQUEST
objectCreate=objectType.createObjectManager(id,request)
- #for field in self.leiden_meta_fields:
- # self.REQUEST[field]=argv[field]
+
self._setObject(id,objectCreate)
objectCreate.propertysheets.meta.manage_editProperties(request)
@@ -74,7 +73,11 @@ class ImageDigilib(Folder,Persistent,Imp
f=open(filename,"w")
f.write(filedata)
f.close()
- os.chmod(filename,0644)
+ try:
+ os.chmod(filename,0644)
+ except:
+ """hack"""
+
os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)
@@ -83,7 +86,7 @@ class ImageDigilib(Folder,Persistent,Imp
def download(self):
"""download"""
- path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,highres"
+ path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires"
#self.REQUEST.SESSION['string']="![](\"%s\")
"% path
#pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
return self.REQUEST.RESPONSE.redirect(path)
@@ -110,7 +113,7 @@ class ImageDigilib(Folder,Persistent,Imp
"""show image"""
#DEVELOP: take first one for server
- path="http://nausikaa2.rz-berlin.mpg.de:18080/digitallibrary/digilib.jsp?lv=1&fn="+self.ImageViewerPath+"/"+self.filename
+ path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+self.filename
#path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
#self.REQUEST.SESSION['string']=""% path
@@ -164,9 +167,22 @@ class ImageCollection(Folder, Persistent
{'label':'Recalculate Metadata','action':'recalculateMeta'},
{'label':'Import Metadata','action':'importMetaForm'},
{'label':'Rescale thumbs','action':'scaleThumbs'},
+ {'label':'Weight (ECHO)','action':'weightForm'},
)
+ def weightForm(self):
+ """Weight"""
+ pt=PageTemplateFile('Products/ImageArchive/zpt/changeWeight.zpt').__of__(self)
+ return pt()
+ def changeWeight(self,weight,RESPONSE=None):
+ """Change weight"""
+ self.weight=weight
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
def importMetaForm(self):
"""import metadata"""
pt=PageTemplateFile('Products/ImageArchive/zpt/importMeta.zpt').__of__(self)
@@ -490,7 +506,35 @@ class ImageCollection(Folder, Persistent
return "previous sets"
else:
return ""
-
+
+ def showRuler(self,selected=None):
+ """show ruler"""
+ showall =self.REQUEST.SESSION.get('showall','no')
+ if showall=='no':
+ ids=self.show_thumbs()
+ colRows=self.getColTimesRow()
+ num=int(len(ids)/(colRows[0]*colRows[1]))
+ a=colRows[0]*colRows[1]
+ if num/a+1>1:
+
+ ret="Show thumbnail group no:"
+ for i in range(num/a+1):
+ k=i*a
+ if selected:
+ href=self.REQUEST['URL1']+"/selection?filename="+ids[k]
+ else:
+ href=self.REQUEST['URL1']+"?filename="+ids[k]
+
+ ret+="""%i """%(href,i)
+
+ else:
+ ret=""
+ ret+="""show all """%self.REQUEST['URL1']
+ else:
+ ret="""show groups """%self.REQUEST['URL1']
+
+ return ret
+
def show_thumbs_selected_rows(self,numberOfColumns):
"""Ausgabe anzahl"""
ids=self.show_selected_thumbs()
@@ -524,7 +568,7 @@ class ImageCollection(Folder, Persistent
RESPONSE.redirect(self.REQUEST['URL1']+"/setDone")
- def getColTimesRow(self):
+ def getColTimesRow(self,showall='No'):
"""coltimesrow"""
REQUEST=self.REQUEST
@@ -534,20 +578,25 @@ class ImageCollection(Folder, Persistent
try:
rows=int(REQUEST.cookies["ImageViewerRows"])
except:
- rows=None
+ rows=6
else:
- rows=None
+ rows=6
if REQUEST.cookies.has_key("ImageViewerCols"):
#print "COLS",REQUEST.cookies["ImageViewerCols"]
cols=int(REQUEST.cookies["ImageViewerCols"])
else:
- cols=3
+ cols=2
idsnumber=len(self.show_thumbs())
if rows:
if cols*rows >idsnumber:
rows=int(idsnumber/cols)+1
+
+ #print cols,rows
+ if showall=='yes':
+ rows=int(idsnumber/cols)+1
+
return (cols,rows)
@@ -558,30 +607,38 @@ class ImageCollection(Folder, Persistent
if self.REQUEST.SESSION.has_key("filename"):
filename=self.REQUEST.SESSION["filename"]
+
+
try:
startId=filename
+ if startId=="":
+ startId=idsAll[0][0:]
except:
- startId=idsAll[0]
+ startId=idsAll[0][0:]
else:
- startId=idsAll[0]
+ startId=idsAll[0][0:]
- print "NOR:",numberOfRows
+
if numberOfRows:
+
+ startPic=idsAll.index(startId)
try:
+
startPic=idsAll.index(startId)
endPic=startPic+numberOfColumns*numberOfRows
ids=idsAll[startPic:endPic]
except:
ids=idsAll
else:
+
ids=idsAll
-
+
self.REQUEST.SESSION['ids']=ids
number=int(len(ids)/numberOfColumns)+1
-
+
return range(number+1)
def show_thumbs_columns(self,row,numberOfColumns):
@@ -613,6 +670,12 @@ class ImageCollection(Folder, Persistent
pt=PageTemplateFile('Products/ImageArchive/zpt/thumb2.zpt').__of__(self)
return pt()
+ def thumblistNewWindow(self):
+ """Thumbs mit clik neues Fenster oeffnen"""
+ pt=PageTemplateFile('Products/ImageArchive/zpt/thumbNewWindow.zpt').__of__(self)
+ return pt()
+
+
def navig_selected_html(self):
"""navigation"""
#self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
@@ -642,7 +705,16 @@ class ImageCollection(Folder, Persistent
filen=self.REQUEST['filename']
else:
filen=""
+
self.REQUEST.SESSION['filename']=filen
+
+ if self.REQUEST.has_key('showall'):
+
+ self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
+ else:
+ self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')
+
+
pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self)
return pt()
@@ -666,6 +738,10 @@ class ImageCollectionIFrame(ImageCollect
meta_type="ImageCollectionIFrame"
label=ImageCollection.title
+ def getImageTag(self):
+ """ hack : method needed by echo_content"""
+ return ""
+
def rotate(self,angle,url,RESPONSE):
"""rotate"""