--- ImageArchive/ImageArchive.py	2003/12/10 19:01:58	1.7
+++ ImageArchive/ImageArchive.py	2004/01/06 15:44:13	1.8
@@ -98,16 +98,21 @@ class ImageDigilib(Folder,Persistent,Imp
 ##             f.close()
 ##             os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 150 &"% self.ImageViewerPath)
             
+        #DEVEL:take nausikaa for server solution
         
         path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores"
-        #path="/thumbs"+self.ImageViewerPath+"/"+thumbname
-        self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path
+        #path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname
+        self.REQUEST.SESSION['string']="<img width=100 border=\"0\" src=\"%s\">"% path
         pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
         return pt()
     
     def index_html(self):
         """show image"""
+        #DEVELOP: take first one for server
+        
         path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/digilib.jsp?fn="+self.ImageViewerPath+"/"+self.filename
+
+        #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
         #self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
         #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
         return self.REQUEST.RESPONSE.redirect(path)
@@ -181,7 +186,7 @@ class ImageCollection(Folder, Persistent
 
             image_id=self.REQUEST['image_id']
             if (not hasattr(self,image_id)) & (not image_id==""):
-                print image_id
+                #print image_id
                 newObj=ImageCollection(str(image_id),image_id,'','','')
                 self._setObject(str(image_id),newObj)
 
@@ -393,6 +398,85 @@ class ImageCollection(Folder, Persistent
         ids.sort()
         return ids
 
+    def firstSets(self,selected=None):
+        ids=self.show_thumbs()
+        if selected:
+            return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[0]+"\" target=\"_top\">first sets</a>"
+        else:
+            return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[0]+"\" target=\"_top\">first sets</a>"
+
+    def lastSets(self,selected=None):
+        ids=self.show_thumbs()
+        colRows=self.getColTimesRow()
+        
+        if colRows[1]:
+            nr=len(ids)-colRows[0]*colRows[1]
+        else:
+            nr=0
+            
+        if nr<0:
+            nr=0
+        
+        if selected:
+            return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">last set</a>"
+        else:
+            return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">last sets</a>"
+
+        
+                
+    def nextSets(self,selected=None):
+        """show nextimage"""
+        ids=self.show_thumbs()
+        colRows=self.getColTimesRow()
+        if colRows[1]:
+            
+            if self.REQUEST.SESSION.has_key("filename"):
+                filename=self.REQUEST.SESSION["filename"]
+                try:
+                    nr=ids.index(filename)+colRows[0]*colRows[1]
+                    if nr>=len(ids):
+                        nr=len(ids)-1
+                except:
+                    nr=0
+            else:
+                nr=0
+
+            if nr==len(ids)-1:
+                return ""
+            else:
+                if selected:
+                    return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">next set</a>"
+                else:
+                    return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">next set</a>"
+
+    def prevSets(self,selected=None):
+        
+        """show nextimage"""
+        #return self.getId()
+        ids=self.show_thumbs()
+        colRows=self.getColTimesRow()
+        if colRows[1]:
+            if self.REQUEST.SESSION.has_key("filename"):
+                filename=self.REQUEST.SESSION["filename"]
+                try:
+                    nr=ids.index(filename)-colRows[0]*colRows[1]
+                    if nr<0:
+                        nr=0
+                except:
+                    nr=0
+            else:
+                nr=0
+
+            if ids.index(filename)==0:
+                return ""
+            else:
+                if selected:
+                    return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
+                else:
+                    return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
+        else:
+            return ""
+            
     def show_thumbs_selected_rows(self,numberOfColumns):
         """Ausgabe anzahl"""
         ids=self.show_selected_thumbs()
@@ -401,9 +485,73 @@ class ImageCollection(Folder, Persistent
         self.REQUEST.SESSION['number']=range(number)
         return range(number+1)
 
-    def show_thumbs_rows(self,numberOfColumns):
+    def setColTimesRowForm(self):
+        """form for matrix setting"""
+        pt=PageTemplateFile('Products/ImageArchive/selectColTimesRow.zpt').__of__(self)
+        return pt()
+
+    def setDone(self):
+        """done"""
+        
+        pt=PageTemplateFile('Products/ImageArchive/changedColTimesRow.zpt').__of__(self)
+        return pt()
+
+    def setColTimesRow(self,cols,rows):
+        """set coltimes row"""
+        RESPONSE=self.REQUEST.RESPONSE
+        
+        RESPONSE.setCookie("ImageViewerRows",rows)
+        RESPONSE.setCookie("ImageViewerCols",cols)
+
+        RESPONSE.redirect(self.REQUEST['URL1']+"/setDone")
+        
+    def getColTimesRow(self):
+        
+        REQUEST=self.REQUEST
+        """matrix"""
+        if REQUEST.cookies.has_key("ImageViewerRows"):
+            
+            try:
+                rows=int(REQUEST.cookies["ImageViewerRows"])
+            except:
+                rows=None
+        else:
+            rows=None
+            
+        if REQUEST.cookies.has_key("ImageViewerCols"):
+            print "COLS",REQUEST.cookies["ImageViewerCols"]
+            cols=int(REQUEST.cookies["ImageViewerCols"])
+        else:
+            cols=4
+        print cols,rows
+        return (cols,rows)
+                
+        
+    def show_thumbs_rows(self,numberOfColumns,numberOfRows=None,startId=None):
         """Ausgabe anzahl"""
-        ids=self.show_thumbs()
+
+        idsAll=self.show_thumbs()
+        
+        if self.REQUEST.SESSION.has_key("filename"):
+            filename=self.REQUEST.SESSION["filename"]
+            try:
+                startId=filename
+            except:
+                startId=idsAll[0]
+        else:
+            startId=idsAll[0]
+            
+
+        print "NOR:",numberOfRows
+
+        if numberOfRows:
+            startPic=idsAll.index(startId)
+            endPic=startPic+numberOfColumns*numberOfRows
+            ids=idsAll[startPic:endPic]
+        else:
+            ids=idsAll
+
+            
         self.REQUEST.SESSION['ids']=ids
         number=int(len(ids)/numberOfColumns)+1
         
@@ -417,6 +565,7 @@ class ImageCollection(Folder, Persistent
             return ids[(row-1)*numberOfColumns:row*numberOfColumns]
         else:
             return ids[(row-1)*numberOfColumns:]
+        
     def thumblistSelected_old(self):
         """main template collection"""
         pt=PageTemplateFile('Products/ImageArchive/thumbselected.zpt').__of__(self)