Index: gnatsweb.pl
===================================================================
RCS file: /cvsroot/gnatsweb/gnatsweb/gnatsweb.pl,v
retrieving revision 1.101
diff -c -p -r1.101 gnatsweb.pl
*** gnatsweb.pl	24 Sep 2002 20:39:17 -0000	1.101
--- gnatsweb.pl	29 Sep 2002 17:56:01 -0000
*************** sub sendpr
*** 1040,1046 ****
      {
        next;
      }
-     my $lc_fieldname = field2param($_);
  
      $field_number++;
  
--- 1040,1045 ----
*************** sub sendpr
*** 1051,1057 ****
  
      # The "intro" provides a way for the site callback to print something
      # at the top of a given field.
!     my $intro = cb("sendpr_intro_$lc_fieldname", $field_number) || '';
  
      print "<tr><td valign=\"top\" width=\"20%\"><b>$_:</b><br /><small>\n",
            fieldinfo($_, 'desc'),
--- 1050,1056 ----
  
      # The "intro" provides a way for the site callback to print something
      # at the top of a given field.
!     my $intro = cb("sendpr_intro_$_", $field_number) || '';
  
      print "<tr><td valign=\"top\" width=\"20%\"><b>$_:</b><br /><small>\n",
            fieldinfo($_, 'desc'),
*************** sub edit
*** 1525,1531 ****
      {
        next;
      }
-     my $lc_fieldname = field2param($_);
  
      $field_number++;
  
--- 1524,1529 ----
*************** sub edit
*** 1533,1539 ****
  
      # The "intro" provides a way for the site callback to print something
      # at the top of a given field.
!     my $intro = cb("edit_intro_$lc_fieldname", $field_number) || '';
      print "<tr><td valign=\"top\" width=\"20%\"><b>$_:</b><br /><small>\n",
            fieldinfo($_, 'desc'),
  	  "</small><td>\n", $intro, "\n";
--- 1531,1537 ----
  
      # The "intro" provides a way for the site callback to print something
      # at the top of a given field.
!     my $intro = cb("edit_intro_$_", $field_number) || '';
      print "<tr><td valign=\"top\" width=\"20%\"><b>$_:</b><br /><small>\n",
            fieldinfo($_, 'desc'),
  	  "</small><td>\n", $intro, "\n";
*************** sub query_page
*** 1840,1888 ****
                         -values=>['Originated by You'],
                         -defaults=>[]),
          "</td>\n</tr>\n",
!         "<tr>\n<td>Synopsis Search:</td>\n<td>",
!         $q->textfield(-name=>'synopsis',-size=>25),
          "</td>\n</tr>\n",
          "<tr>\n<td>Multi-line Text Search:</td>\n<td>",
          $q->textfield(-name=>'multitext',-size=>25),
          "</td>\n</tr>\n",
          "<tr valign=top>\n<td>Column Display:</td>\n<td>";
  
!   # We operate internally with parameter names, not real-world
!   # fieldnames (see dtb's comment in field2param()).  This is for
!   # backward compatibility and should be dealt with properly at some
!   # point by making Gnatsweb use the fieldnames set in dbconfig
!   # exclusively (XXX ??? !!! FIXME).  We want to use real fieldnames
!   # in the query page, so we construct a hash of (param , fieldname)
!   # pairs to use in the scrolling_list. We also construct an array of
!   # param names (@lcfields) which is fed to the scrolling_list in
!   # order to keep the "natural" order of the fields. Merely using
!   # keys() would cause fields to be listed in arbitrary order.
!   my @lcfields;
!   my %labels;
!   foreach (@fieldnames)
!   {
!     if (fieldinfo($_, 'fieldtype') ne 'multitext')
!     {
!       my $param = field2param($_);
!       $labels{$param} = $_;
!       push (@lcfields, field2param($_));
      }
    }
! 
!   my(@columns) = split(' ', $global_prefs{'columns'} || '');
!   @columns = keys(%labels) unless @columns;
! 
!   # The 'number' field is always first in the @lcfields array. If
    # users were allowed to select it in this list, the PR number would
    # appear twice in the Query Results table. We prevent this by
    # shifting 'number' out of the array.
!   my(@sh_lcfields) = @lcfields;
!   shift(@sh_lcfields);
  
    print $q->scrolling_list(-name=>'columns',
!                            -values=>\@sh_lcfields,
!                            -labels=>\%labels,
                             -defaults=>\@columns,
                             -multiple=>1,
                             -size=>5),
--- 1838,1868 ----
                         -values=>['Originated by You'],
                         -defaults=>[]),
          "</td>\n</tr>\n",
!         "<tr>\n<td>$SYNOPSIS_FIELD Search:</td>\n<td>",
!         $q->textfield(-name=>$SYNOPSIS_FIELD,-size=>25),
          "</td>\n</tr>\n",
          "<tr>\n<td>Multi-line Text Search:</td>\n<td>",
          $q->textfield(-name=>'multitext',-size=>25),
          "</td>\n</tr>\n",
          "<tr valign=top>\n<td>Column Display:</td>\n<td>";
  
!   my @allcolumns;
!   foreach (@fieldnames) {
!     if (fieldinfo($_, 'fieldtype') ne 'multitext') {
!       push (@allcolumns, $_);
      }
    }
!   # The 'number' field is always first in the @allcolumns array. If
    # users were allowed to select it in this list, the PR number would
    # appear twice in the Query Results table. We prevent this by
    # shifting 'number' out of the array.
!   shift(@allcolumns);
! 
!   my(@columns) = split(' ', $global_prefs{'columns'} || '');
!   @columns = @allcolumns unless @columns;
  
    print $q->scrolling_list(-name=>'columns',
!                            -values=>\@allcolumns,
                             -defaults=>\@columns,
                             -multiple=>1,
                             -size=>5),
*************** sub advanced_query_page
*** 1962,1980 ****
    {
      if (fieldinfo ($_, 'fieldtype') eq 'date')
      {
!       my $headerstr = $_." after";
!       my $param_name = $headerstr;
!       $param_name =~ s/ /_/;
!       $param_name =  field2param ($param_name);
!       print "<tr>\n<td>$headerstr:</td>\n<td>",
!           $q->textfield(-name=>$param_name, -size=>$width),
            "</td>\n</tr>\n";
!       $headerstr = $_." before";
!       $param_name = $headerstr;
!       $param_name =~ s/ /_/;
!       $param_name = field2param ($param_name);
!       print "<tr>\n<td>$headerstr:</td>\n<td>",
!           $q->textfield(-name=>$param_name, -size=>$width),
            "</td>\n</tr>\n";
      }
    }
--- 1942,1952 ----
    {
      if (fieldinfo ($_, 'fieldtype') eq 'date')
      {
!       print "<tr>\n<td>$_ after:</td>\n<td>",
!           $q->textfield(-name=>$_."_after", -size=>$width),
            "</td>\n</tr>\n";
!       print "<tr>\n<td>$_ before:</td>\n<td>",
!           $q->textfield(-name=>$_."_before", -size=>$width),
            "</td>\n</tr>\n";
      }
    }
*************** sub advanced_query_page
*** 1995,2002 ****
          "</tr>\n";
    foreach (@fieldnames)
    {
-     my $lc_fieldname = field2param($_);
- 
      print "<tr valign=top>\n";
  
      # 1st column is field name
--- 1967,1972 ----
*************** sub advanced_query_page
*** 2004,2010 ****
  
      # 2nd column is regexp search field
      print "<td>",
!           $q->textfield(-name=>$lc_fieldname,
                          -size=>$width);
      print "\n";
      # XXX ??? !!! FIXME
--- 1974,1980 ----
  
      # 2nd column is regexp search field
      print "<td>",
!           $q->textfield(-name=>$_,
                          -size=>$width);
      print "\n";
      # XXX ??? !!! FIXME
*************** sub advanced_query_page
*** 2026,2032 ****
        my $ary_ref = fieldinfo($_, 'values');
        my $size = scalar(@$ary_ref);
        $size = 4 if $size > 4;
!       print $q->scrolling_list(-name=>$lc_fieldname,
                                 -values=>$ary_ref,
                                 -multiple=>1,
                                 -size=>$size);
--- 1996,2002 ----
        my $ary_ref = fieldinfo($_, 'values');
        my $size = scalar(@$ary_ref);
        $size = 4 if $size > 4;
!       print $q->scrolling_list(-name=>$_,
                                 -values=>$ary_ref,
                                 -multiple=>1,
                                 -size=>$size);
*************** sub advanced_query_page
*** 2044,2084 ****
          "<caption>Display</caption>\n",
          "<tr valign=top>\n<td>Display these columns:</td>\n<td>";
  
!   # We operate internally with parameter names, not real-world
!   # fieldnames (see dtb's comment in field2param()).  This is for
!   # backward compatibility and should be dealt with properly at some
!   # point by making Gnatsweb use the fieldnames set in dbconfig
!   # exclusively (XXX ??? !!! FIXME).  We want to use real fieldnames
!   # in the query page, so we construct a hash of (param , fieldname)
!   # pairs to use in the scrolling_list. We also construct an array of
!   # param names (@lcfields) which is fed to the scrolling_list in
!   # order to keep the "natural" order of the fields. Merely using
!   # keys() would cause fields to be listed in arbitrary order.
!   my @lcfields;
!   my %labels;
!   foreach (@fieldnames)
!   {
!     if (fieldinfo($_, 'fieldtype') ne 'multitext')
!     {
!       my $param = field2param($_);
!       $labels{$param} = $_;
!       push (@lcfields, field2param($_));
      }
    }
! 
!   my(@columns) = split(' ', $global_prefs{'columns'} || '');
!   @columns = keys(%labels) unless @columns;
! 
!   # The 'number' field is always first in the @lcfields array. If
    # users were allowed to select it in this list, the PR number would
    # appear twice in the Query Results table. We prevent this by
    # shifting 'number' out of the array.
!   my(@sh_lcfields) = @lcfields;
!   shift(@sh_lcfields);
  
    print $q->scrolling_list(-name=>'columns',
!                            -values=>\@sh_lcfields,
!                            -labels=>\%labels,
                             -defaults=>\@columns,
                             -multiple=>1,
                             -size=>5),
--- 2014,2036 ----
          "<caption>Display</caption>\n",
          "<tr valign=top>\n<td>Display these columns:</td>\n<td>";
  
!   my @allcolumns;
!   foreach (@fieldnames) {
!     if (fieldinfo($_, 'fieldtype') ne 'multitext') {
!       push (@allcolumns, $_);
      }
    }
!   # The 'number' field is always first in the @allcolumns array. If
    # users were allowed to select it in this list, the PR number would
    # appear twice in the Query Results table. We prevent this by
    # shifting 'number' out of the array.
!   shift(@allcolumns);
! 
!   my(@columns) = split(' ', $global_prefs{'columns'} || '');
!   @columns = @allcolumns unless @columns;
  
    print $q->scrolling_list(-name=>'columns',
!                            -values=>\@allcolumns,
                             -defaults=>\@columns,
                             -multiple=>1,
                             -size=>5),
*************** sub submitquery
*** 2235,2242 ****
    page_heading($page, $heading);
    my $debug = 0;
  
-   my @fielddisplaylist = $q->param('columns');
- 
    my $originatedbyme = $q->param('originatedbyme');
    my $ignoreclosed   = $q->param('ignoreclosed');
  
--- 2187,2192 ----
*************** sub submitquery
*** 2263,2270 ****
      # Bleah. XXX ??? !!!
      if ($stringval ne '')
      {
!       my $ucfield = param2field ($field);
!       if (isvalidfield ($ucfield))
        {
          my $subexp = "";
          my $sval;
--- 2213,2219 ----
      # Bleah. XXX ??? !!!
      if ($stringval ne '')
      {
!       if (isvalidfield ($field))
        {
          my $subexp = "";
          my $sval;
*************** sub submitquery
*** 2276,2288 ****
            {
              # Most (?) people expect queries on enums to be of the
              # exact, not the substring type.
              if (fieldinfo($field, 'fieldtype') =~ "enum|multienum")
              {
!               $subexp = appendexpr ($subexp, '|', "$ucfield==\"$sval\"");
              }
              else
              {
!               $subexp = appendexpr ($subexp, '|', "$ucfield~\"$sval\"");
              }
            }
          }
--- 2225,2241 ----
            {
              # Most (?) people expect queries on enums to be of the
              # exact, not the substring type.
+ 	    # Hence, provide explicit anchoring for enums. This
+ 	    # still leaves the user the possibility of inserting
+ 	    # ".*" before and/or after regular expression searches
+ 	    # on the advanced query page.
              if (fieldinfo($field, 'fieldtype') =~ "enum|multienum")
              {
!               $subexp = appendexpr ($subexp, '|', "$field~\"^$sval\$\"");
              }
              else
              {
!               $subexp = appendexpr ($subexp, '|', "$field~\"$sval\"");
              }
            }
          }
*************** sub submitquery
*** 2306,2325 ****
          }
          # Whack off the trailing _after or _before.
          $field =~ s/_[^_]*$//;
-         $field = param2field ($field);
          $expr = appendexpr ($expr, '&', $field.$op.'"'.$stringval.'"');
        }
      }
    }
  
    my $format="\"%s";
-   my @ucfields = map { param2field ($_) } @fielddisplaylist;
  
    # We are using ASCII octal 037 (unit separator) to separate the
    # fields in the query output. Note that the format strings are
    # interpolated (quoted with ""'s), so make sure to escape any $ or @
    # signs.
!   foreach (@ucfields) {
  	if (fieldinfo ($_, 'fieldtype') eq 'date') {
        $format .= "\037%{%Y-%m-%d %H:%M:%S %Z}D";
  	} elsif (fieldinfo ($_, 'fieldtype') eq 'enum') {
--- 2259,2277 ----
          }
          # Whack off the trailing _after or _before.
          $field =~ s/_[^_]*$//;
          $expr = appendexpr ($expr, '&', $field.$op.'"'.$stringval.'"');
        }
      }
    }
  
    my $format="\"%s";
  
+   my @columns = $q->param('columns');
    # We are using ASCII octal 037 (unit separator) to separate the
    # fields in the query output. Note that the format strings are
    # interpolated (quoted with ""'s), so make sure to escape any $ or @
    # signs.
!   foreach (@columns) {
  	if (fieldinfo ($_, 'fieldtype') eq 'date') {
        $format .= "\037%{%Y-%m-%d %H:%M:%S %Z}D";
  	} elsif (fieldinfo ($_, 'fieldtype') eq 'enum') {
*************** sub submitquery
*** 2329,2335 ****
      }
    }
  
!   $format .= "\" ".${NUMBER_FIELD}." ".join (" ", @ucfields);
  
    client_cmd("expr $expr") if $expr;
    client_cmd("qfmt $format");
--- 2281,2287 ----
      }
    }
  
!   $format .= "\" ".${NUMBER_FIELD}." ".join (" ", @columns);
  
    client_cmd("expr $expr") if $expr;
    client_cmd("qfmt $format");
*************** sub nonempty
*** 2353,2423 ****
  }
  
  
- # dtb - are field2param & param2field really only here for backwards
- # compatibility?  if so, maybe we should get rid of them.
- # unfortunately, all the saved and bookmarked queries, and people's
- # column prefs (in their cookies) out there in the world would
- # break.  sigh, stuck with bad backwards compatibility...
- # field2param -
- #     Convert gnats field name into parameter name, e.g.
- #     "Submitter-Id" => "submitter_id".  It's done this crazy way for
- #     compatibility with queries stored by gnatsweb 2.1.
- #
- # used in sendpr(), edit(), query_page(), advanced_query_page()
- sub field2param
- {
-   my $name = shift;
-   $name =~ s/-/_/g;
-   $name = lc($name);
-   return $name;
- }
- 
- # param2field -
- #     Find gnats field name corresponding to parameter name, e.g.
- #     "submitter_id" => "Submitter-Id".
- #     If not gnats field corresponds, reverse the action of
- #     field2param().  Note that
- #       param2field(field2param($val)) != $val
- #     if $val =~ /_/ or $val =~ /[A-Z]{2,}/
- #
- sub param2field
- {
-     my $munged_field;
-     my $name = shift;
-     $name =~ s/_/-/g;
-     foreach my $field (@fieldnames) {
-       if ($name eq 'PR') {
-         return 'Number';
-       }
-       else {
-         ($munged_field = $field) =~ s/_/-/g;
-         if (lc($name) eq lc($munged_field)) {
-           return $field;
-         }
-       }
-     }
- 
-     # if we get here, $name is not a gnats field, so just
-     # programmatically un-munge it
-     my @words = split(/_/, $name);
-     map { $_ = ucfirst($_); } @words;
-     $name = join('-', @words);
-     return $name;
- }
- 
- 
  # display_query_results -
  #     Display the query results, and the "store query" form.
  #     The results only have the set of fields that we requested, although
  #     the first field is always the PR number.
  sub display_query_results
  {
-   my ($nooffields);
    my(@query_results) = @_;
-   my(@fields) = $q->param('columns');
    my $displaydate = $q->param('displaydate');
    my $reversesort = $q->param('reversesort');
-   my($field, %fields);
  
    my $num_matches = scalar(@query_results);
    my $heading = sprintf("%s %s found",
--- 2305,2319 ----
*************** sub display_query_results
*** 2433,2477 ****
          $q->hidden(name=>'cmd', -value=>'view', -override=>1),
          "<table border=1 cellspacing=0 cellpadding=1><tr>\n";
  
!   # Note that $sortby is the normal uppercased name of the field, and not
!   # a "parameterized" version.
!   my($sortby) = $q->param('sortby') || 'PR';
  
    my $whichfield = 0;
    my ($sortbyfieldnum) = 0;
    # Print table header which allows sorting by columns.
    # While printing the headers, temporarily override the 'sortby' param
    # so that self_url() works right.
! 
!   my @ufields;
! 
!   for $field ('PR', @fields)
    {
!     my $ufield = param2field ($field);
!     if ($field ne 'PR')
!     {
!       push (@ufields, $ufield);
      }
!     $q->param(-name=>'sortby', -value=>$ufield);
  
      # strip empty params out of self_url().  in a gnats db with many
      # fields, the url query-string will become very long.  this is a
      # problem, since IE5 truncates query-strings at ~2048 characters.
      my ($query_string) = $q->self_url() =~ m/^[^?]*\?(.*)$/;
!     $query_string =~ s/\w+=;//g;
!     my $href = $script_name . '?' . $query_string;
  
!     $fields{$field}++;
!     if ($ufield eq $sortby)
!     {
!       $sortbyfieldnum = $whichfield;
!     }
!     $whichfield++;
!     if ($ufield eq 'PR') {
!       $ufield='Number';
!     }
!     print "\n<th><a href=\"$href\">$ufield</a></th>\n";
!     $nooffields = @ufields;
    }
    # finished the header row
    print "</tr>\n";
--- 2329,2360 ----
          $q->hidden(name=>'cmd', -value=>'view', -override=>1),
          "<table border=1 cellspacing=0 cellpadding=1><tr>\n";
  
!   # By default sort by PR number.
!   my($sortby) = $q->param('sortby') || $fieldnames[0];
  
    my $whichfield = 0;
    my ($sortbyfieldnum) = 0;
+   my @columns = $q->param('columns');
+   my $noofcolumns = @columns;
    # Print table header which allows sorting by columns.
    # While printing the headers, temporarily override the 'sortby' param
    # so that self_url() works right.
!   for ($fieldnames[0], @columns)
    {
!     $q->param(-name=>'sortby', -value=>$_);
!     if ($_ eq $sortby) {
!       $sortbyfieldnum = $whichfield;
      }
!     $whichfield++;
  
      # strip empty params out of self_url().  in a gnats db with many
      # fields, the url query-string will become very long.  this is a
      # problem, since IE5 truncates query-strings at ~2048 characters.
      my ($query_string) = $q->self_url() =~ m/^[^?]*\?(.*)$/;
!     $query_string =~ s/(\w|-)+=;//g;
  
!     my $href = $script_name . '?' . $query_string;
!     print "\n<th><a href=\"$href\">$_</a></th>\n";
    }
    # finished the header row
    print "</tr>\n";
*************** sub display_query_results
*** 2485,2492 ****
    my(@presplit_prs) = map { [ (split /\037/) ] } @query_results;
    my(@sorted_prs);
    my $sortby_fieldtype = fieldinfo ($sortby, 'fieldtype') || '';
!   if ($sortby_fieldtype eq 'enum' || $sortby_fieldtype eq 'integer'
!       || $sortby eq 'PR') {
      # sort numerically
      @sorted_prs = sort({$a->[$sortbyfieldnum] <=> $b->[$sortbyfieldnum]}
  		       @presplit_prs);
--- 2368,2374 ----
    my(@presplit_prs) = map { [ (split /\037/) ] } @query_results;
    my(@sorted_prs);
    my $sortby_fieldtype = fieldinfo ($sortby, 'fieldtype') || '';
!   if ($sortby_fieldtype eq 'enum' || $sortby_fieldtype eq 'integer') {
      # sort numerically
      @sorted_prs = sort({$a->[$sortbyfieldnum] <=> $b->[$sortbyfieldnum]}
  		       @presplit_prs);
*************** sub display_query_results
*** 2499,2505 ****
    @sorted_prs = reverse @sorted_prs if $reversesort;
  
    # Print the PR's.
!   my @fieldtypes = map { fieldinfo ($_, 'fieldtype') } @ufields;
    foreach (@sorted_prs)
    {
      print "<tr valign=top>\n";
--- 2381,2387 ----
    @sorted_prs = reverse @sorted_prs if $reversesort;
  
    # Print the PR's.
!   my @fieldtypes = map { fieldinfo ($_, 'fieldtype') } @columns;
    foreach (@sorted_prs)
    {
      print "<tr valign=top>\n";
*************** sub display_query_results
*** 2520,2532 ****
        # map them back into strings.
        if ($fieldtypes[$whichfield] eq 'enum')
        {
!         my $enumvals = fieldinfo($ufields[$whichfield], 'values');
          $fieldcontents = $$enumvals[$fieldcontents - 1] || 'invalid';
        }
        $fieldcontents = $q->escapeHTML($fieldcontents);
        $fieldcontents = nonempty($fieldcontents);
  
!       if ($ufields[$whichfield] =~ /responsible/i) {
  	  $fieldcontents = make_mailto($fieldcontents);
        } else {
  	  # make urls and email addresses into live hrefs
--- 2402,2414 ----
        # map them back into strings.
        if ($fieldtypes[$whichfield] eq 'enum')
        {
!         my $enumvals = fieldinfo($columns[$whichfield], 'values');
          $fieldcontents = $$enumvals[$fieldcontents - 1] || 'invalid';
        }
        $fieldcontents = $q->escapeHTML($fieldcontents);
        $fieldcontents = nonempty($fieldcontents);
  
!       if ($columns[$whichfield] =~ /responsible/i) {
  	  $fieldcontents = make_mailto($fieldcontents);
        } else {
  	  # make urls and email addresses into live hrefs
*************** sub display_query_results
*** 2538,2544 ****
      }
      # Pad the remaining, empty columns with &nbsp;'s
      my $n = @{$_};
!     while ($nooffields - $n > 0)
      {
        print "<td>&nbsp;</td>";
        $n++;
--- 2420,2426 ----
      }
      # Pad the remaining, empty columns with &nbsp;'s
      my $n = @{$_};
!     while ($noofcolumns - $n > 0)
      {
        print "<td>&nbsp;</td>";
        $n++;
*************** sub display_query_results
*** 2553,2559 ****
    # strip empty params out of $url.  in a gnats db with many
    # fields, the url query-string will become very long.  this is a
    # problem, since IE5 truncates query-strings at ~2048 characters.
!   $url =~ s/\w+=;//g;
    print $q->p(qq{<a href="$url">View for bookmarking</a>\n});
  
    # Allow the user to store this query.  Need to repeat params as hidden
--- 2435,2441 ----
    # strip empty params out of $url.  in a gnats db with many
    # fields, the url query-string will become very long.  this is a
    # problem, since IE5 truncates query-strings at ~2048 characters.
!   $url =~ s/(\w|-)+=;//g;
    print $q->p(qq{<a href="$url">View for bookmarking</a>\n});
  
    # Allow the user to store this query.  Need to repeat params as hidden