--- ImageArchive/ImageArchive.py 2006/05/15 08:18:02 1.77
+++ ImageArchive/ImageArchive.py 2006/05/17 19:10:49 1.84
@@ -491,58 +491,68 @@ class ImageDigilib(Folder,Persistent,Imp
RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
- def updateImage(self,file,rename=None,RESPONSE=None):
- """lade neues Version des Bildes"""
- #teste ob Dokumenten ordner schon vorhanden
- #imagePath=os.path.join(self.ImageStoragePath,self.getId())
+ def updateImage(self,_fileupload,_rename=None,RESPONSE=None):
+ """lade neues Version des Bildes"""
+ #teste ob Dokumenten ordner schon vorhanden
+ #imagePath=os.path.join(self.ImageStoragePath,self.getId())
+
+ identifyField="filename"
+
+ if _fileupload and _fileupload.filename!="":
imagePath=os.path.join(self.ImageStoragePath,self.filename)
path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir")
-
+
if not os.path.exists(path):
- os.mkdir(path,0775)
- os.chmod(path,0775)
-
+ os.mkdir(path,0775)
+ os.chmod(path,0775)
+
versionNumber=getattr(self,'versionNumber',0)+1
-
+
#teste ob version schon existiert
-
+
while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.filename))):
- versionNumber+=1
-
+ versionNumber+=1
+
#kopieren der bestehenden Version in den Versions ordner.
imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename))
- try:
- #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
- os.rename(imagePath,imageNewPath)
- except:
- zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
-
+ try:
+ #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
+ os.rename(imagePath,imageNewPath)
+ except:
+ zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
+
#lesen des upload files und schreiben
filedata=file.read()
f=open(imagePath,"w") # if we wanted to have filename=id we should do it here!
f.write(filedata)
f.close()
try:
- os.chmod(imagePath,0664)
+ os.chmod(imagePath,0664)
except:
- """hack"""
+ pass
#scale thumb
-
- self.scaleThumbs()
+ self.scaleThumbs()
+
#scale standard
-
+
self.scaleWorkingVersions()
-
- if rename:
+
+ if _rename:
self.renameImage(file.filename)
-
- if RESPONSE:
- RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
+
+ args=self.REQUEST.form
+
+ args['-identify']=identifyField+"="+args['_identifyField']
+
+ self.ZSQLChange(args=args)
+
+ if RESPONSE:
+ RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
- return "done"
+ return "done"
security.declarePublic('thumb')
def thumb(self,url=None):
@@ -779,7 +789,7 @@ class ImageCollection(OrderedFolder, Per
"""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/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/docuserver/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
if RESPONSE:
RESPONSE.write(ret.read())
RESPONSE.write("\n")
@@ -791,7 +801,7 @@ class ImageCollection(OrderedFolder, Per
#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/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath)
if RESPONSE:
RESPONSE.write(ret.read())
RESPONSE.write("\n")
@@ -1065,11 +1075,11 @@ class ImageCollection(OrderedFolder, Per
#scale thumb
- self.scaleThumbs()
+ #self.scaleThumbs()
#scale standard
- self.scaleWorkingVersions()
+ #self.scaleWorkingVersions()
RESPONSE.redirect('manage_main')
@@ -1153,7 +1163,7 @@ class ImageCollection(OrderedFolder, Per
#scale thumb
- self.scaleThumbs()
+ #self.scaleThumbs()
#scale standard
@@ -1626,14 +1636,28 @@ class ImageCollection(OrderedFolder, Per
fn=getattr(self,repr(filename),None)
if not fn:
filenameM=filename.split(".")[0]
+
founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
+
+
for found in founds:
foundM=found[0].split(".")[0]
+
if filenameM.lower()==foundM.lower():
if onlyName:
return found[0]
else:
- return found[1]
+ return found[1]
+ #HACK teste noch ob am ende des filenames eventuell ein "_" und loesche das.
+ if foundM[-1]=="_":
+ foundM=foundM[0:-1]
+
+ if filenameM.lower()==foundM.lower():
+ if onlyName:
+ return found[0]
+ else:
+ return found[1]
+
if onlyName:
return filename
else:
@@ -1730,6 +1754,49 @@ class ImageCollectionMD(ImageCollection,
except:
pass
+
+ def ImportFiles(self,RESPONSE=None):
+ """Import the existing files of a folder"""
+ files=os.listdir(self.ImageStoragePath)
+ ret=""
+ #print self.__dict__
+ for file in files:
+ if not file[0]==".":
+ if self.__dict__.has_key(file):
+
+ ret=ret+"
"+file+" already exists!"
+ else:
+ ret=ret+"
"+file+" created!"
+ newObj=ImageDigilib(file,file)
+ #print newObj,file
+ #print newObj
+ try:
+ self._setObject(file,newObj)
+ except:
+ """nothing yet"""
+
+
+ args={}
+ args['_table']=self.imageCollectionConfig.getTable()
+ args[self.imageCollectionConfig.getKey()]=file
+
+ if not self.ZSQLInlineSearch(args=args):
+ self.ZSQLAdd(args=args)
+ #print ret
+ #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
+ #print self.ImageStoragePath
+
+ #scale thumb
+
+
+ #self.scaleThumbs()
+
+ #scale standard
+
+ #self.scaleWorkingVersions()
+
+ if RESPONSE:
+ RESPONSE.redirect('manage_main')
def addImage(self):
"""Add an Image"""
@@ -1737,7 +1804,7 @@ class ImageCollectionMD(ImageCollection,
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImageMD.zpt')).__of__(self)
return pt()
- def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None,**argv):
+ def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None):
"""Add"""
filenameKey="filename"
@@ -1755,9 +1822,10 @@ class ImageCollectionMD(ImageCollection,
manage_AddImageDigilib(self,fn,_fileupload,meta=meta)
- args[key]=_filename
+ args=self.REQUEST.form
+ args[filenameKey]=fn
- self.ZSQLAdd(args=argv)
+ self.ZSQLAdd(args=args)
if RESPONSE:
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
@@ -1805,7 +1873,7 @@ class ImageCollectionMD(ImageCollection,
#context.ZSQLFind(_table='vision_main')
urlTmp=REQUEST['URL1']
- url=urlTmp+'/searchResultXML?-table=vision_main&'+REQUEST['QUERY_STRING']
+ url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
if xml is None:
RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
@@ -1831,7 +1899,7 @@ class ImageCollectionMD(ImageCollection,
self.REQUEST.SESSION['filenames']=ret
#self.REQUEST.SESSION['filenamesIds']=fnIds
- overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
if overview and (generic =='No'):
@@ -1867,7 +1935,7 @@ class ImageCollectionMD(ImageCollection,
if selection:
#selection i.e. selection already stored at self.REQUEST.SESSION['filenames']
- overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
if overview and (generic =='No'):#
@@ -1881,7 +1949,7 @@ class ImageCollectionMD(ImageCollection,
#no filename then show overview
- overview=self.ZopeFind(self,obj_ids=['overviewMD.html'])
+ overview=self.ZopeFind(self,obj_ids=['overview.html'])
if overview and (generic == 'No'):
@@ -1900,6 +1968,9 @@ class ImageCollectionMD(ImageCollection,
if not selected and self.REQUEST.has_key('fn'):
imagename=self.REQUEST['fn'].split('/')[-1]
+
+ imagename=self.getImageByName(imagename,onlyName=True)
+
nr=self.getObjectPosition(imagename)
objects=self.objectIds()
@@ -1914,6 +1985,9 @@ class ImageCollectionMD(ImageCollection,
if not selected and self.REQUEST.has_key('fn'):
imagename=self.REQUEST['fn'].split('/')[-1]
+
+ imagename=self.getImageByName(imagename,onlyName=True)
+
nr=self.getObjectPosition(imagename)
objects=self.objectIds()
@@ -2207,4 +2281,4 @@ def manage_AddImageZogiLib(self,id=None,
def manage_AddImageZogiLibForm(self):
"""to be done"""
-
+
\ No newline at end of file