--- ImageArchive/ImageArchive.py	2008/08/18 13:27:42	1.105
+++ 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']
@@ -602,6 +602,7 @@ class ImageDigilib(Folder,Persistent,Imp
             newImagePath=oldNameBase+uploadFileExt
             
             f=open(newImagePath,"w") # if we wanted to have filename=id we should do it here!
+            logging.error("saving:"+newImagePath)
             f.write(filedata)
             f.close()
             try:
@@ -615,7 +616,7 @@ class ImageDigilib(Folder,Persistent,Imp
             #scale standard
     
             self.scaleWorkingVersions()
-            self.scaleToJpg()
+            #self.scaleToJpg()
             if _rename:
                 self.renameImage(_fileupload.filename)
         
@@ -1291,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:
@@ -2295,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)