Changes to gnats/contrib/tkgnats/tkeditpr.tcl

[Michael Richardson]

Index: gnats/contrib/tkgnats/tkeditpr.tcl
diff -c gnats/contrib/tkgnats/tkeditpr.tcl:1.6 
gnats/contrib/tkgnats/tkeditpr.tcl:1.7
*** gnats/contrib/tkgnats/tkeditpr.tcl:1.6      Mon Mar 31 21:48:28 2003
--- gnats/contrib/tkgnats/tkeditpr.tcl  Tue Apr  1 23:52:47 2003
***************
*** 142,148 ****
          return -2
      }
  
!     puts $s "EDIT $Tkeditpr(prid)"
      set rep [get_socket_reply $s]
      if {![string match 2* [lindex $rep 0]]} {
          set errs "GNATSD error sending EDIT command for PRID 
$Tkeditpr(prid):\n[join $rep \n]"
--- 142,148 ----
          return -2
      }
  
!     gnatsd_send $s "EDIT $Tkeditpr(prid)"
      set rep [get_socket_reply $s]
      if {![string match 2* [lindex $rep 0]]} {
          set errs "GNATSD error sending EDIT command for PRID 
$Tkeditpr(prid):\n[join $rep \n]"
***************
*** 150,156 ****
      }
  
      write_pr $s
! #write_pr stdout
      puts     $s "."
  
      set rep [get_socket_reply $s]
--- 150,156 ----
      }
  
      write_pr $s
!     #write_pr stdout
      puts     $s "."
  
      set rep [get_socket_reply $s]
***************
*** 165,172 ****
  proc real_file_report {} {
      global TkGnats Tkeditpr flds frm errorCode whyText
      flush_singletext $Tkeditpr(singletextflds)
!     flush_singletext $Tkeditpr(shorttextflds)
!     flush_multitext
  
      #
      # do some local field checking..
--- 165,172 ----
  proc real_file_report {} {
      global TkGnats Tkeditpr flds frm errorCode whyText
      flush_singletext $Tkeditpr(singletextflds)
!     flush_singletext $Tkeditpr(shorttextflds) .eboxs.shortones
!     flush_multitext 
  
      #
      # do some local field checking..
***************
*** 245,251 ****
              Msg " '|' is an illegal character for the '[get_field_alias $f]' 
field!"
              return -1
          }
!       #dputs "Comparing frm($f) and flds($f): $frm($f) vs $flds($f)"
          if {$frm($f) != $flds($f)} {
              foreach require {Audit Email Reason} {
                  if {[check_audit_trail_opts $require $f]} {
--- 245,251 ----
              Msg " '|' is an illegal character for the '[get_field_alias $f]' 
field!"
              return -1
          }
!       dputs "Comparing frm($f) and flds($f): $frm($f) vs $flds($f)"
          if {$frm($f) != $flds($f)} {
              foreach require {Audit Email Reason} {
                  if {[check_audit_trail_opts $require $f]} {
***************
*** 420,433 ****
      #
      # for each parsed field from the PR form...
      #
! #puts "tags:$Tkeditpr(parsed_flds)"
      foreach tag $Tkeditpr(parsed_flds) {
          case $tag {_prefix_} {
              #
              #   The mail header, stored under the _prefix_ tag, is written out
              #   unadulterated, except for the edited X-GNATS-Notify field.
              #
! #puts "prefix before:$flds($tag)"
              set lines [split $flds($tag) \n]
              set idx   [lsearch -regexp $lines "^X-GNATS-Notify:"]
            
--- 420,434 ----
      #
      # for each parsed field from the PR form...
      #
!     #puts "tags:$Tkeditpr(parsed_flds)"
! 
      foreach tag $Tkeditpr(parsed_flds) {
          case $tag {_prefix_} {
              #
              #   The mail header, stored under the _prefix_ tag, is written out
              #   unadulterated, except for the edited X-GNATS-Notify field.
              #
!           #puts "prefix before:$flds($tag)"
              set lines [split $flds($tag) \n]
              set idx   [lsearch -regexp $lines "^X-GNATS-Notify:"]
            
***************
*** 440,446 ****
            }
              #set frm($tag) "[string trim [join $lines \n]]\n"
              set frm($tag) [join $lines \n]
! #puts "prefix after:$flds($tag)"
              puts -nonewline $fout $frm($tag)
          } {X-GNATS-Notify} {
              #
--- 441,447 ----
            }
              #set frm($tag) "[string trim [join $lines \n]]\n"
              set frm($tag) [join $lines \n]
!           #puts "prefix after:$flds($tag)"
              puts -nonewline $fout $frm($tag)
          } {X-GNATS-Notify} {
              #
***************
*** 475,483 ****
              #   Single line text fields are whitespace trimmed to a leading
              #   tab and a trailing newline
              #
!             case $tag [concat $Tkeditpr(singletextflds) 
$Tkeditpr(shorttextflds)] {
                  #puts $fout "$tag:\t[string trim [textget $tag] "\t\n "]"
                  puts $fout "$tag:\t[string trim $frm($tag) "\t\n "]"
              } [concat >Category >Responsible >Submitter-Id 
$Tkeditpr(radioflds)] {
                  puts $fout "$tag:\t$frm($tag)"
              } $Tkeditpr(multitextflds) {
--- 476,486 ----
              #   Single line text fields are whitespace trimmed to a leading
              #   tab and a trailing newline
              #
!             case $tag $Tkeditpr(singletextflds) {
                  #puts $fout "$tag:\t[string trim [textget $tag] "\t\n "]"
                  puts $fout "$tag:\t[string trim $frm($tag) "\t\n "]"
+           } $Tkeditpr(shorttextflds) {
+                 puts $fout "$tag:\t[string trim $frm($tag) "\t\n "]"
              } [concat >Category >Responsible >Submitter-Id 
$Tkeditpr(radioflds)] {
                  puts $fout "$tag:\t$frm($tag)"
              } $Tkeditpr(multitextflds) {
***************
*** 970,975 ****
--- 973,979 ----
              incr nboxes
          }
      }
+ 
      frame .eboxs.shortones -relief groove -borderwidth 2
      foreach f $Tkeditpr(shorttextflds) {
          if {[check_suppressed_field $f] == 1} {