--- OSAS/OSA_system/OSAS_search.py 2004/07/09 16:55:19 1.3 +++ OSAS/OSA_system/OSAS_search.py 2004/07/09 17:56:14 1.5 @@ -190,10 +190,10 @@ class OSAS_search(SimpleItem): res.append(r) else: res = results - # filter on count - resgroup = res[start:end] # new total count (because of filter) rescnt = len(res) + # filter on count + resgroup = res[start:end] return (resgroup, rescnt) @@ -236,6 +236,7 @@ class OSAS_search(SimpleItem): (resgroup, nres) = self.filterResults(self.REQUEST.SESSION['results'], sres, lres, restypefilter) lres = min(lres, nres) + sres = min(sres, nres) self.REQUEST.SESSION['resultgroup'] = resgroup self.REQUEST.SESSION['res_indexes'] = (sres+1, lres, nres, int(count)) self.REQUEST.SESSION['res_type_filter'] = restypefilter @@ -589,6 +590,11 @@ def storageURL(filename): if r: url = "http://content.mpiwg-berlin.mpg.de/mpistorage/storage/ShowOnline/index_html?path=%s"%r.group(1) name = "Storage System" + + elif filename.startswith('http://'): + #print "URLFORFILE: url ", filename + url = filename + name = "Online Database" if name and url: return (url, name)