--- ImageArchive/ImageArchive.py 2009/01/06 16:07:10 1.106 +++ ImageArchive/ImageArchive.py 2012/08/28 09:46:32 1.109 @@ -3,7 +3,7 @@ genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config -from Ft.Xml.Domlette import NonvalidatingReader +#from Ft.Xml.Domlette import NonvalidatingReader from OFS.Folder import Folder from OFS.OrderedFolder import OrderedFolder from OFS.SimpleItem import SimpleItem @@ -326,7 +326,7 @@ class ImageDigilib(Folder,Persistent,Imp def isAccessible(self): """gives true if obejct is accessible taking the rights of the user into account""" - logTemp("isaccessible") + logTime("isaccessible") #TODO: implement rights, currently true if external and false if internal, and true if user has role authenticated username=self.REQUEST['AUTHENTICATED_USER'] @@ -1292,8 +1292,8 @@ class ImageCollection(OrderedFolder, Per if os.path.isdir(os.path.join(self.getImageStoragePath(),file)): ImageStoragePath=os.path.join(self.getImageStoragePath(),file) imageViewerPath=os.path.join(self.ImageViewerPath,file) - manage_AddImageCollection(self,file,file,self.getImageStoragePath(),imageViewerPath,self.defaultMetaString) - + #manage_AddImageCollection(self,file,file,self.getImageStoragePath(),imageViewerPath,self.defaultMetaString) + manage_AddImageCollection(self,file,file,imageViewerPath,self.defaultMetaString,self.destBasis,self.srcBasis,self.serverPath) obj=getattr(self,file) obj.ImportStructure() else: @@ -2296,7 +2296,8 @@ class ImageCollectionMD(ImageCollection, xmldoc=urllib.urlopen(url).read() #return xmldoc try: - dom=NonvalidatingReader.parseUri(url) + #dom=NonvalidatingReader.parseUri(url) + pass except: return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)