--- ImageArchive/ImageArchive.py 2006/05/25 15:49:42 1.94 +++ ImageArchive/ImageArchive.py 2006/07/20 10:41:40 1.97 @@ -779,6 +779,7 @@ class ImageCollection(OrderedFolder, Per #ret=scaleStr + #zLOG.LOG("ImageCollection:scale",zLOG.INFO,scaleStr) ret=os.popen2(scaleStr,1)[1].read() if RESPONSE: @@ -930,9 +931,9 @@ class ImageCollection(OrderedFolder, Per dest=os.path.join(self.scaledBasis,'thumb') self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=100,RESPONSE=RESPONSE) #ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) - if RESPONSE: - RESPONSE.write(ret.read()) - RESPONSE.write("\n") + #if RESPONSE: + # RESPONSE.write(ret.read()) + # RESPONSE.write("\n") return "RESCALING STARTED" @@ -1604,16 +1605,17 @@ class ImageCollection(OrderedFolder, Per return ret - def show_thumbs_selected_rows(self,numberOfColumns): + def show_thumbs_selected_rows(self,numberOfColumns,start=0,max=10000): """Ausgabe anzahl""" ids=self.show_selected_thumbs() if not ids: return None self.REQUEST.SESSION['ids']=ids - number=int(len(ids)/numberOfColumns)+1 - self.REQUEST.SESSION['number']=range(number) - return range(number+1) + number=min(start+int(len(ids)/numberOfColumns)+1,max) + + self.REQUEST.SESSION['number']=range(start,number) + return range(start,number+1) def setColTimesRowForm(self): """form for matrix setting""" @@ -1786,13 +1788,13 @@ class ImageCollection(OrderedFolder, Per #FIXME: umlaute in filename fn=getattr(self,repr(filename),None) if not fn: - filenameM=filename.split(".")[0] + filenameM=os.path.splitext(filename)[0] founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib']) for found in founds: - foundM=found[0].split(".")[0] + foundM=os.path.splitext(found[0])[0] if filenameM.lower()==foundM.lower(): if onlyName: @@ -2468,4 +2470,4 @@ def manage_AddImageZogiLib(self,id=None, def manage_AddImageZogiLibForm(self): """to be done""" - + \ No newline at end of file