--- ImageArchive/ImageArchive.py	2005/03/18 14:28:00	1.48
+++ ImageArchive/ImageArchive.py	2005/04/10 13:32:28	1.51
@@ -801,6 +801,60 @@ 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)):
+                imageStoragePath=os.path.join(self.ImageStoragePath,file)
+                imageViewerPath=os.path.join(self.ImageViewerPath,file)
+                manage_AddImageCollection(self,file,file,imageStoragePath,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 +1011,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')
@@ -966,6 +1038,7 @@ class ImageCollection(Folder, Persistent
             return "<b>No entries</b>"
         
         if showall=='no':
+	    actualNr=0
             ids=self.show_thumbs()
             colRows=self.getColTimesRow()
             num=int(len(ids)/(colRows[0]*colRows[1]))
@@ -973,19 +1046,63 @@ class ImageCollection(Folder, Persistent
                 num+=1
             a=colRows[0]*colRows[1]
             #print num,num+1
+		
             if num>1:
 
-                ret="<b>Show thumbnail group no:</b></br>"
-                for i in range(num):
-                    if (operator.mod(i,10)==0) and i>0:
-                        ret +="<br/>" #alle 10 linebreak einfuegen
-                    k=i*a
-                    if selected:                
-                        href=self.REQUEST['URL1']+"/selection?filename="+ids[k]
-                    else:
-                        href=self.REQUEST['URL1']+"?filename="+ids[int(k)]
-
-                    ret+="""<a href="%s" target="_top">%i</a>&nbsp;&nbsp;"""%(href,i)
+                ret=""
+                if selected:
+	    		ret+="""<select onChange="parent.location.href='"""+self.REQUEST['URL1']+"""/selection?filename='+this.options[this.selectedIndex].value">"""
+                else:
+			ret+="""<select onChange="parent.location.href='"""+self.REQUEST['URL1']+"""?filename='+this.options[this.selectedIndex].value">"""
+		for i in range(num):
+			try:
+			  nr=ids.index(self.REQUEST.SESSION['filename'])
+			except:
+			  nr=0
+		        k=i*a	
+			if (k <= nr) and (nr < i*(a+1)):
+			   actualNr=i
+			   ret+="""<option value="%s" selected>%i</option>"""%(ids[k],i)
+			else:
+	    		   ret+="""<option value="%s">%i</option>"""%(ids[k],i)
+		ret+="</select>"	
+		anf="<b>Show thumbnail group no:</b></br>"
+		
+		
+		try:
+		  if selected:                
+                        href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr-1)*a]
+                  else:
+                        href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr-1)*a)]
+		
+		  anf+="""<a href="%s" target="_top">%s</a>&nbsp;&nbsp;"""%(href,"prev")
+		except:
+		  pass
+		ret=anf+ret
+		
+		try:
+		  
+		  if selected:                
+                        href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr+1)*a]
+                  else:
+                        href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr+1)*a)]
+		
+		  end="""<a href="%s" target="_top">%s</a>&nbsp;&nbsp;"""%(href,"next")
+		except:
+		  end=""
+		ret=ret+end
+
+
+                #for i in range(num):
+                #    
+                #        ret +="<br/>" #alle 10 linebreak einfuegen
+                #    k=i*a
+                #    if selected:                
+                #        href=self.REQUEST['URL1']+"/selection?filename="+ids[k]
+                #    else:
+                #        href=self.REQUEST['URL1']+"?filename="+ids[int(k)]
+	        #
+                #    ret+="""<a href="%s" target="_top">%i</a>&nbsp;&nbsp;"""%(href,i)
 
             else:
                 ret=""