--- ImageArchive/ImageArchive.py	2005/03/18 16:57:21	1.49
+++ ImageArchive/ImageArchive.py	2005/04/10 13:01:45	1.50
@@ -801,6 +801,58 @@ class ImageCollection(Folder, Persistent
 	
 
         RESPONSE.redirect('manage_main')
+
+    def importStructure(self,path):
+        """import"""
+        splitted=os.path.split(path)
+        if os.path.isDir(path):
+            manage_AddImageCollection(self,splitted[1],splitted[1],path,self.ImageViewerPath,self.defaultMetaString,RESPONSE=None)
+            
+            obj=getattr(self,splitted[1])
+            obj.ImportFiles()
+
+    def ImportStructure(self,RESPONSE=None):
+        """Import the existing files of a folder"""
+        files=os.listdir(self.ImageStoragePath)
+        ret=""
+        #print self.__dict__
+
+
+        for file in files:
+
+            if os.path.isdir(os.path.join(self.ImageStoragePath,file)):
+                manage_AddImageCollection(self,file,file,os.path.join(self.ImageStoragePath,file),self.ImageViewerPath,self.defaultMetaString)
+            
+                obj=getattr(self,file)
+                obj.ImportStructure()
+            else:
+                if not file[0]==".":
+                    if self.__dict__.has_key(file):
+
+                        ret=ret+"<br>"+file+" already exists!"
+                    else:
+                        ret=ret+"<br>"+file+" created!"
+                        newObj=ImageDigilib(file,file)
+                        #print newObj,file
+                        #print newObj
+                        try:
+                            self._setObject(file,newObj)
+                        except:
+                            """nothing yet"""
+        #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 ImportFiles(self,RESPONSE=None):
         """Import the existing files of a folder"""
@@ -957,7 +1009,25 @@ class ImageCollection(Folder, Persistent
                         return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
             else:
                 return ""
+    def showFolders(self):
+        """show subfolders"""
+        ret=""
+        link=""" <a target="_top" href="%s">%s</a><br>"""
 
+        if self.aq_parent.meta_type=="ImageCollection":
+            ret+=link%(self.aq_parent.absolute_url(), "back ("+self.aq_parent.title+")")
+            ret+="<br>"
+            
+        iCs=self.ZopeFind(self,obj_metatypes="ImageCollection")
+        if not iCs:
+            return ret
+        else:
+            
+            link=""" <a target="_top" href="%s">%s</a><br>"""
+            for iC in iCs:
+                ret+=link%(iC[1].absolute_url(),iC[0])
+            ret+="<br>"
+            return ret
     def showRuler(self,selected=None):
         """show ruler"""
         showall =self.REQUEST.SESSION.get('showall','no')