--- ImageArchive/ImageArchive.py 2003/12/04 19:02:59 1.3 +++ ImageArchive/ImageArchive.py 2004/01/06 16:06:24 1.10 @@ -20,10 +20,42 @@ def getText(nodelist): return rc -class ImageDigilib(SimpleItem,Persistent,Implicit): +class ImageDigilib(Folder,Persistent,Implicit): """Anzeige object fuer digilib""" meta_type="ImageDigilib" + leiden_meta_fields=['image_id','date','country','place','people','description','photographer'] + + manage_options = Folder.manage_options+( + + {'label':'Add Metadata','action':'addMetaObjectForm'}, + + ) + + def addMetaObject(self,id,RESPONSE=None): + """Add an MetaObject""" + objectType=getattr(self.Control_Panel.Products.ImageMetaData,self.genericMetaDataType) + + 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) + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + + + + def addMetaObjectForm(self): + """Add Form""" + pt=PageTemplateFile('Products/ImageArchive/addMetaObject.zpt').__of__(self) + return pt() + + def __init__(self,id,filename,meta=None): self.id=id self.title=filename @@ -45,6 +77,7 @@ class ImageDigilib(SimpleItem,Persistent 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) + @@ -65,16 +98,21 @@ class ImageDigilib(SimpleItem,Persistent ## f.close() ## os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 150 &"% self.ImageViewerPath) + #DEVEL:take nausikaa for server solution path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores" - #path="/thumbs"+self.ImageViewerPath+"/"+thumbname - self.REQUEST.SESSION['string']=""% path + #path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname + self.REQUEST.SESSION['string']=""% path pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) return pt() def index_html(self): """show image""" + #DEVELOP: take first one for server + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/digilib.jsp?fn="+self.ImageViewerPath+"/"+self.filename + + #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename #self.REQUEST.SESSION['string']=""% path #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) return self.REQUEST.RESPONSE.redirect(path) @@ -100,8 +138,18 @@ def manage_AddImageDigilib(self,id,fileu class ImageCollection(Folder, Persistent, Implicit): """Sammelordner für Bilder""" meta_type="ImageCollection" + + genericMetaDataType="leiden_meta" + + leiden_meta_fields=['image_id','date','country','place','people','description','photographer'] + defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP + + def scaleThumbs(self): + """scale thumbs""" + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + return "RESCALING STARTED" def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString): self.id=id @@ -113,11 +161,92 @@ class ImageCollection(Folder, Persistent manage_options = Folder.manage_options+( {'label':'Main Config','action':'ImageCollection_config'}, {'label':'Import','action':'ImportFiles'}, - {'label':'Recalculate Metadate','action':'recalculateMeta'}, - + {'label':'Recalculate Metadata','action':'recalculateMeta'}, + {'label':'Import Metadata','action':'importMetaForm'}, + {'label':'Rescale thumbs','action':'scaleThumbs'}, ) + def importMetaForm(self): + """import metadata""" + pt=PageTemplateFile('Products/ImageArchive/importMeta.zpt').__of__(self) + return pt() + + def importMeta(self,fileupload,tag): + """import""" + filedata=fileupload.read() + dom=xml.dom.minidom.parseString(filedata) + rows=dom.getElementsByTagName(tag) + #print "ROWS",rows + request=self.REQUEST + for row in rows: + + for a in self.leiden_meta_fields: + self.REQUEST[a]=getText(row.getElementsByTagName(a)[0].childNodes) + + image_id=self.REQUEST['image_id'] + if (not hasattr(self,image_id)) & (not image_id==""): + #print image_id + newObj=ImageCollection(str(image_id),image_id,'','','') + self._setObject(str(image_id),newObj) + + id="leiden_meta_data_file" + self.REQUEST['id']=id + #objectType=getattr(self.Control_Panel.Products.ImageMetaData,self.genericMetaDataType) + #objectCreate=objectType.createInObjectManager(id,request) + #href="http://localhost:8080/tests/testcollection/manage_addProduct/ImageMetaData/leiden_meta_factory/" + try: + addID=getattr(self,image_id) + objectCreate=addID.manage_addProduct['ImageMetaData'].leiden_meta_add(id) + #getattr(self,image_id)._setObject(id,objectCreate) + obj=getattr(addID,id) + obj.propertysheets.meta.manage_editProperties(request) + except: + """nothing""" + return "OK" + + + def nextImage(self,request,selected=None): + """show nextimage""" + ids=self.show_thumbs() + if request.SESSION.has_key("filename"): + filename=request.SESSION["filename"] + try: + nr=ids.index(filename) + except: + nr=0 + else: + nr=0 + + if nr==len(ids)-1: + return "" + else: + if selected: + return "next image" + else: + return "next image" + + def prevImage(self,request,selected=None): + """show nextimage""" + #return self.getId() + ids=self.show_thumbs() + if request.SESSION.has_key("filename"): + filename=request.SESSION["filename"] + try: + nr=ids.index(filename) + except: + nr=0 + else: + nr=0 + + if nr==0: + return "" + else: + if selected: + return "previous image" + else: + return "previous image" + def meta_default(self,filename): """url der metadaten""" return self.defaultMetaString % filename @@ -138,8 +267,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') @@ -169,7 +300,7 @@ class ImageCollection(Folder, Persistent pt=PageTemplateFile('Products/ImageArchive/addImage.zpt').__of__(self) return pt() - def addImage2(self,fileupload,meta,use_default,RESPONSE=None): + def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None): """Add""" #print "FU",fileupload @@ -178,6 +309,8 @@ class ImageCollection(Folder, Persistent meta=self.meta_default(fileupload.filename) except: meta=None + else: + meta=None manage_AddImageDigilib(self,fileupload.filename,fileupload,meta=meta) return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fileupload.filename) @@ -203,7 +336,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): @@ -221,11 +354,14 @@ class ImageCollection(Folder, Persistent newObj=ImageDigilib(file,file) #print newObj,file #print newObj - self._setObject(file,newObj) + try: + self._setObject(file,newObj) + except: + """nothing yet""" #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 ImageCollection_config(self): @@ -262,6 +398,85 @@ class ImageCollection(Folder, Persistent ids.sort() return ids + def firstSets(self,selected=None): + ids=self.show_thumbs() + if selected: + return "first sets" + else: + return "first sets" + + def lastSets(self,selected=None): + ids=self.show_thumbs() + colRows=self.getColTimesRow() + + if colRows[1]: + nr=len(ids)-colRows[0]*colRows[1] + else: + nr=0 + + if nr<0: + nr=0 + + if selected: + return "last set" + else: + return "last sets" + + + + def nextSets(self,selected=None): + """show nextimage""" + ids=self.show_thumbs() + colRows=self.getColTimesRow() + if colRows[1]: + + if self.REQUEST.SESSION.has_key("filename"): + filename=self.REQUEST.SESSION["filename"] + try: + nr=ids.index(filename)+colRows[0]*colRows[1] + if nr>=len(ids): + nr=len(ids)-1 + except: + nr=0 + else: + nr=0 + + if nr==len(ids)-1: + return "" + else: + if selected: + return "next set" + else: + return "next set" + + def prevSets(self,selected=None): + + """show nextimage""" + #return self.getId() + ids=self.show_thumbs() + colRows=self.getColTimesRow() + if colRows[1]: + if self.REQUEST.SESSION.has_key("filename"): + filename=self.REQUEST.SESSION["filename"] + try: + nr=ids.index(filename)-colRows[0]*colRows[1] + if nr<0: + nr=0 + except: + nr=0 + else: + nr=0 + + if ids.index(filename)==0: + return "" + else: + if selected: + return "previous sets" + else: + return "previous sets" + else: + return "" + def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" ids=self.show_selected_thumbs() @@ -270,9 +485,76 @@ class ImageCollection(Folder, Persistent self.REQUEST.SESSION['number']=range(number) return range(number+1) - def show_thumbs_rows(self,numberOfColumns): + def setColTimesRowForm(self): + """form for matrix setting""" + pt=PageTemplateFile('Products/ImageArchive/selectColTimesRow.zpt').__of__(self) + return pt() + + def setDone(self): + """done""" + + pt=PageTemplateFile('Products/ImageArchive/changedColTimesRow.zpt').__of__(self) + return pt() + + def setColTimesRow(self,cols,rows): + """set coltimes row""" + RESPONSE=self.REQUEST.RESPONSE + if not rows: + rows=100000 + if rows="": + rows=100000 + RESPONSE.setCookie("ImageViewerRows",rows) + RESPONSE.setCookie("ImageViewerCols",cols) + + RESPONSE.redirect(self.REQUEST['URL1']+"/setDone") + + def getColTimesRow(self): + + REQUEST=self.REQUEST + """matrix""" + if REQUEST.cookies.has_key("ImageViewerRows"): + + try: + rows=int(REQUEST.cookies["ImageViewerRows"]) + except: + rows=20 + else: + rows=20 + + if REQUEST.cookies.has_key("ImageViewerCols"): + print "COLS",REQUEST.cookies["ImageViewerCols"] + cols=int(REQUEST.cookies["ImageViewerCols"]) + else: + cols=4 + print cols,rows + return (cols,rows) + + + def show_thumbs_rows(self,numberOfColumns,numberOfRows=None,startId=None): """Ausgabe anzahl""" - ids=self.show_thumbs() + + idsAll=self.show_thumbs() + + if self.REQUEST.SESSION.has_key("filename"): + filename=self.REQUEST.SESSION["filename"] + try: + startId=filename + except: + startId=idsAll[0] + else: + startId=idsAll[0] + + + print "NOR:",numberOfRows + + if numberOfRows: + startPic=idsAll.index(startId) + endPic=startPic+numberOfColumns*numberOfRows + ids=idsAll[startPic:endPic] + else: + ids=idsAll + + self.REQUEST.SESSION['ids']=ids number=int(len(ids)/numberOfColumns)+1 @@ -286,6 +568,7 @@ class ImageCollection(Folder, Persistent return ids[(row-1)*numberOfColumns:row*numberOfColumns] else: return ids[(row-1)*numberOfColumns:] + def thumblistSelected_old(self): """main template collection""" pt=PageTemplateFile('Products/ImageArchive/thumbselected.zpt').__of__(self) @@ -306,12 +589,29 @@ class ImageCollection(Folder, Persistent pt=PageTemplateFile('Products/ImageArchive/thumb2.zpt').__of__(self) return pt() + def navig_selected_html(self): + """navigation""" + #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] + pt=PageTemplateFile('Products/ImageArchive/navigation_selected.zpt').__of__(self) + return pt() + def navig_html(self): """navigation""" + #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] pt=PageTemplateFile('Products/ImageArchive/navigation.zpt').__of__(self) return pt() + def selection(self): + """show only selected""" + if self.REQUEST.has_key('filename'): + filen=self.REQUEST['filename'] + else: + filen="" + self.REQUEST.SESSION['filename']=filen + pt=PageTemplateFile('Products/ImageArchive/overview_selected2.zpt').__of__(self) + return pt() + def index_html(self): """main template collection""" if self.REQUEST.has_key('filename'):