Changes to gnats/contrib/tkgnats/tkquerypr.tcl

[Michael Richardson]

Index: gnats/contrib/tkgnats/tkquerypr.tcl
diff -c gnats/contrib/tkgnats/tkquerypr.tcl:1.3 
gnats/contrib/tkgnats/tkquerypr.tcl:1.4
*** gnats/contrib/tkgnats/tkquerypr.tcl:1.3     Fri Nov 30 20:13:47 2001
--- gnats/contrib/tkgnats/tkquerypr.tcl Thu Dec 13 00:00:05 2001
***************
*** 147,177 ****
          Synopsis      "Synopsis"    \
  ]
  
- array set gnatsd_commands [list \
-         Submitter-Id SUBM \
-         Originator   ORIG \
-         Responsible  RESP \
-         Category     CATG \
-         Class        CLSS \
-         Confidential CONF \
-         State        STAT \
-         Priority     PRIO \
-         Severity     SVTY \
-         Release      RLSE \
-         Synopsis     SYNP \
-         Multitext    MTXT \
-         Keywords     KYWD \
-         $TkGnats(Quarter)    QRTR \
-         Date-Required.after  AFTR \
-         Date-Required.before BFOR \
-         Arrival-Date.after   ARAF \
-         Arrival-Date.before  ABFR \
-         Last-Modified.after  MAFT \
-         Last-Modified.before MBFR \
-         Closed-Date.after    CAFT \
-         Closed-Date.before   CBFR \
- ]        
- 
  if {$TkGnats(ReleaseBased)} {
      set Query(sort_flds) [concat $Query(sort_flds) Keywords $TkGnats(Quarter) 
Date-Required]
      set Query(sort_flgs) [concat $Query(sort_flgs) "" "" ""]
--- 147,152 ----
***************
*** 289,295 ****
      if {$TkGnats(GNATS_ACCESS_METHOD) == "batch"} {
          set Query(query_pr_opts) "$prid_list"
      } {
!         set Query(query_pr_opts) "$Query(query_mode) Number=$prid_list"
      }
      set Query(by_id_only) 1
      set Query(done_msg) "query from selection for Id $prid_list"
--- 264,274 ----
      if {$TkGnats(GNATS_ACCESS_METHOD) == "batch"} {
          set Query(query_pr_opts) "$prid_list"
      } {
!         set Query(query_pr_opts) ""
!       foreach prid $prid_list {
!           append Query(query_pr_opts) "Number==$prid_list|"
!       }
!       append Query(query_pr_opts) " "
      }
      set Query(by_id_only) 1
      set Query(done_msg) "query from selection for Id $prid_list"
***************
*** 872,878 ****
  }
  
  proc build_date_query_qualifier {tag d when} {
!     global TkGnats Query gnatsd_commands
      set mode $TkGnats(GNATS_ACCESS_METHOD)
      set times(after)  "00:00"
      set times(before) "23:59"
--- 851,857 ----
  }
  
  proc build_date_query_qualifier {tag d when} {
!     global TkGnats Query 
      set mode $TkGnats(GNATS_ACCESS_METHOD)
      set times(after)  "00:00"
      set times(before) "23:59"
***************
*** 891,897 ****
          append date " $times($when)"
      }
      if {$mode == "socket"} {
!         set str "$gnatsd_commands($tag.$when) $date"
      } {
          set str "--$var=$date"
      }
--- 870,877 ----
          append date " $times($when)"
      }
      if {$mode == "socket"} {
!       # XXX GNATS 4
!         #set str "$gnatsd_commands($tag.$when) $date"
      } {
          set str "--$var=$date"
      }
***************
*** 899,905 ****
  }
      
  proc build_regex_query_qualifier {subclauseop type tag lst regexp} {
!     global TkGnats Query gnatsd_commands
      if {$tag == "Submitter-Id"} {
          set tag2 Submitter
      } {
--- 879,888 ----
  }
      
  proc build_regex_query_qualifier {subclauseop type tag lst regexp} {
!     global TkGnats Query 
! 
!     dputs "build_regex_query_qualifier: $subclauseop $type $tag $lst $regexp"
! 
      if {$tag == "Submitter-Id"} {
          set tag2 Submitter
      } {
***************
*** 922,934 ****
        # first clause: put in leading option stuff
        if {"$subclausestr" == ""} {
              if {$mode == "socket"} {
!                 set subclausestr "$gnatsd_commands($tag) "
              } {
                  set subclausestr [format "--%s=" [string tolower $tag2]]
              }
        }
        switch -exact -- $type -exact {
!           append subclausestr "$subclauseopstr^$data\$"
        } -glob {
            append subclausestr "$subclauseopstr$data"
        }
--- 905,917 ----
        # first clause: put in leading option stuff
        if {"$subclausestr" == ""} {
              if {$mode == "socket"} {
!                 set subclausestr ""
              } {
                  set subclausestr [format "--%s=" [string tolower $tag2]]
              }
        }
        switch -exact -- $type -exact {
!           append subclausestr "$subclauseopstr $tag = \"$data\""
        } -glob {
            append subclausestr "$subclauseopstr$data"
        }
***************
*** 938,944 ****
        # no clauses were written
          if {"$regexp" != "" } {
              if {$mode == "socket"} {
!                 set subclausestr "$gnatsd_commands($tag) $regexp"
              } {
                  set subclausestr [format "--%s=" [string tolower 
$tag2]]$regexp
              }
--- 921,927 ----
        # no clauses were written
          if {"$regexp" != "" } {
              if {$mode == "socket"} {
!                 set subclausestr "$tag = $regexp"
              } {
                  set subclausestr [format "--%s=" [string tolower 
$tag2]]$regexp
              }
***************
*** 1144,1150 ****
          if {$mode != "save"} {
              set Query(default__query) [list proc default__query {flds} 
{return 1}]
              if {$TkGnats(GNATS_ACCESS_METHOD) == "batch"} {
!                 set Query(query_pr_opts) "$prid_list"
              } {
                  set Query(query_pr_opts) "$Query(query_mode) $prid_list"
              }
--- 1127,1137 ----
          if {$mode != "save"} {
              set Query(default__query) [list proc default__query {flds} 
{return 1}]
              if {$TkGnats(GNATS_ACCESS_METHOD) == "batch"} {
!               set Query(query_pr_opts) ""
!               foreach prid $prid_list {
!                   append Query(query_pr_opts) "Number==$prid_list|"
!               }
!               append Query(query_pr_opts) " "
              } {
                  set Query(query_pr_opts) "$Query(query_mode) $prid_list"
              }
***************
*** 1584,1594 ****
      dputs "Query_pr_opts $Query(query_pr_opts)"
      set clist { "RSET" "QFMT sql2" }
  
! # "EXPR $Query(query_pr_opts)"
  
      set doit  ""
  
      foreach cmd $clist {
          puts $s $cmd
          set rep [get_socket_reply $s]
          if {![string match 210* [lindex $rep 0]]} {
--- 1571,1585 ----
      dputs "Query_pr_opts $Query(query_pr_opts)"
      set clist { "RSET" "QFMT sql2" }
  
!     foreach condition $Query(query_pr_opts) {
!       lappend clist [concat EXPR $condition]
!       dputs "clist now $clist"
!     }
  
      set doit  ""
  
      foreach cmd $clist {
+       dputs "query sending $cmd"
          puts $s $cmd
          set rep [get_socket_reply $s]
          if {![string match 210* [lindex $rep 0]]} {