Diff for /OSAS/OSA_system/OSAS_search.py between versions 1.3 and 1.5

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

Removed from v.1.3  
changed lines
  Added in v.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>