--- ImageArchive/ImageArchive.py 2006/05/16 10:28:08 1.81
+++ ImageArchive/ImageArchive.py 2006/05/17 21:42:49 1.88
@@ -1,7 +1,7 @@
genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config
-
+from Ft.Xml.Domlette import NonvalidatingReader
from OFS.Folder import Folder
from OFS.OrderedFolder import OrderedFolder
from OFS.SimpleItem import SimpleItem
@@ -390,11 +390,11 @@ class ImageDigilib(Folder,Persistent,Imp
"""hack"""
#scale thumb
- self.scaleThumbs()
+ #self.scaleThumbs()
#scale standard
- self.scaleWorkingVersions()
+ #self.scaleWorkingVersions()
@@ -480,11 +480,11 @@ class ImageDigilib(Folder,Persistent,Imp
#scale thumb
- self.scaleThumbs()
+ #self.scaleThumbs()
#scale standard
- self.scaleWorkingVersions()
+ #self.scaleWorkingVersions()
if RESPONSE:
@@ -532,11 +532,11 @@ class ImageDigilib(Folder,Persistent,Imp
pass
#scale thumb
- self.scaleThumbs()
+ #self.scaleThumbs()
#scale standard
- self.scaleWorkingVersions()
+ #self.scaleWorkingVersions()
if _rename:
self.renameImage(file.filename)
@@ -1075,11 +1075,11 @@ class ImageCollection(OrderedFolder, Per
#scale thumb
- self.scaleThumbs()
+ #self.scaleThumbs()
#scale standard
- self.scaleWorkingVersions()
+ #self.scaleWorkingVersions()
RESPONSE.redirect('manage_main')
@@ -1163,7 +1163,7 @@ class ImageCollection(OrderedFolder, Per
#scale thumb
- self.scaleThumbs()
+ #self.scaleThumbs()
#scale standard
@@ -1631,7 +1631,7 @@ class ImageCollection(OrderedFolder, Per
def getImageByName(self,filename,onlyName=None):
"""get filename"""
- print repr(filename)
+ #print repr(filename)
#FIXME: umlaute in filename
fn=getattr(self,repr(filename),None)
if not fn:
@@ -1754,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"""
@@ -1827,15 +1870,38 @@ class ImageCollectionMD(ImageCollection,
def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):
"""search"""
- #context.ZSQLFind(_table='vision_main')
- urlTmp=REQUEST['URL1']
- url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
+ rc=[]
+ fnIds={}
+ for found in self.ZSQLInlineSearch(args=self.REQUEST.form):
+ key=getattr(found,self.imageCollectionConfig.getKey())
+ key=self.getImageByName(key,onlyName="yes")
+ rc.append((key,'',0))
+ fnIds[key]=('',0)
+
+ rc.sort()
+ self.REQUEST.SESSION['filenames']=rc
+ self.REQUEST.SESSION['filenamesIds']=fnIds
- if xml is None:
- RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
+ overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+
+ if overview:
+ return overview[0][1]()
else:
- RESPONSE.redirect(url)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+ #urlTmp=REQUEST['URL1']
+
+ #url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
+
+ #if xml is None:
+ # RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
+ #else:
+ # RESPONSE.redirect(url)
def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None):
"""main template collection"""
@@ -1876,13 +1942,13 @@ class ImageCollectionMD(ImageCollection,
self.REQUEST.SESSION['filename']=filen[0:]
- if not self.REQUEST.SESSION['filename']=="":
- url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
- if mode=="view":
- self.REQUEST.RESPONSE.redirect(url)
- elif mode=="download":
- self.REQUEST.RESPONSE.redirect(url+"/download")
-
+# if not self.REQUEST.SESSION['filename']=="":
+# url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
+# if mode=="view":
+# self.REQUEST.RESPONSE.redirect(url)
+# elif mode=="download":
+# self.REQUEST.RESPONSE.redirect(url+"/download")
+#
if self.REQUEST.has_key('showall'):
self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
@@ -1896,8 +1962,7 @@ class ImageCollectionMD(ImageCollection,
if overview and (generic =='No'):#
- print "selected"
- print repr(overview[0][1])
+
return overview[0][1]()
else:
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
@@ -2013,24 +2078,26 @@ class ImageCollectionMD(ImageCollection,
xmldoc=urllib.urlopen(url).read()
#return xmldoc
try:
- dom=xml.dom.minidom.parseString(xmldoc)
+ dom=NonvalidatingReader.parseUri(url)
+
except:
return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)
- images=dom.getElementsByTagName('image')
+ images=dom.xpath("//image")
rc=[]
fnIds={}
for image in images:
- imagename=image.getElementsByTagName('imagename')[0]
+
+ imagename=image.xpath('./imagename')[0]
- idnr=image.getElementsByTagName('idnr')[0]
+ idnr=image.xpath('./idnr')[0]
id=getText(idnr.childNodes)
try:
- numberOfPages=image.getElementsByTagName('numberOfPages')[0]
+ numberOfPages=image.xpath('./numberOfPages')[0]
except:
numberOfPages=None