code review 630043: godoc: revert change 5089, per gri's instructions

godoc: revert change 5089, per gri's instructions

[rsc, 2010-03-20 00:46:16]

Hello gri (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[rsc, 2010-03-20 00:46:21]

*** Submitted as http://code.google.com/p/go/source/detail?r=0810a9dcec66 ***

godoc: revert change 5089, per gri's instructions

R=gri
CC=golang-dev
http://codereview.appspot.com/630043

[gri, 2010-03-20 04:43:42]

LGTM

On Fri, Mar 19, 2010 at 4:46 PM, <rsc@golang.org> wrote:

> Reviewers: gri,
>
> Message:
> Hello gri (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> godoc: revert change 5089, per gri's instructions
>
> Please review this at http://codereview.appspot.com/630043/show
>
> Affected files:
>  M lib/godoc/search.txt
>  M src/cmd/godoc/godoc.go
>
>
> Index: lib/godoc/search.txt
> ===================================================================
> --- a/lib/godoc/search.txt
> +++ b/lib/godoc/search.txt
> @@ -1,5 +1,4 @@
> -QUERY
> -{Query}
> +QUERY = {Query}
>
>  {.section Accurate}
>  {.or}
> @@ -22,7 +21,7 @@
>  {.repeated section Files}
>  {.repeated section Groups}
>  {.repeated section Infos}
> -       {File.Path}:{@|infoLine}
> +       {File.Path|url-src}:{@|infoLine}
>  {.end}
>  {.end}
>  {.end}
> @@ -37,7 +36,7 @@
>  {.repeated section Files}
>  {.repeated section Groups}
>  {.repeated section Infos}
> -       {File.Path}:{@|infoLine}
> +       {File.Path|url-src}:{@|infoLine}
>  {.end}
>  {.end}
>  {.end}
> Index: src/cmd/godoc/godoc.go
> ===================================================================
> --- a/src/cmd/godoc/godoc.go
> +++ b/src/cmd/godoc/godoc.go
> @@ -1375,6 +1375,9 @@
>                                nwords, nspots := index.Size()
>                                log.Stderrf("index updated (%gs, %d unique
> words, %d spots)", secs, nwords, nspots)
>                        }
> +                       log.Stderrf("bytes=%d footprint=%d\n",
> runtime.MemStats.HeapAlloc, runtime.MemStats.InusePages<<12)
> +                       runtime.GC()
> +                       log.Stderrf("bytes=%d footprint=%d\n",
> runtime.MemStats.HeapAlloc, runtime.MemStats.InusePages<<12)
>                }
>                time.Sleep(1 * 60e9) // try once a minute
>        }
> @@ -1394,29 +1397,5 @@
>
>  func (s *IndexServer) Lookup(query *Query, result *SearchResult) os.Error
> {
>        *result = lookup(query.Query)
> -       if hit := result.Hit; hit != nil {
> -               // the hitlists contain absolute server file paths;
> -               // convert them into relative paths on the server
> -               // because the client usually has a different file
> -               // mapping
> -               mapHitList(hit.Decls)
> -               mapHitList(hit.Others)
> -       }
>        return nil
>  }
> -
> -
> -func mapHitList(list HitList) {
> -       for _, prun := range list {
> -               for _, frun := range prun.Files {
> -                       // convert absolute file paths to relative paths
> -                       f := frun.File
> -                       if f != nil && len(f.Path) > 0 && f.Path[0] == '/'
> {
> -                               f.Path = relativePath(f.Path)
> -                       }
> -                       // TODO(gri) convert SpotInfos containing snippets
> -                       //           so that the line number is available
> -                       //           on the client side
> -               }
> -       }
> -}
>
>
>