[AOLSERVER-COMMITS] aolserver/tcl util.tcl,1.4,1.5

[<gne...@us...>]

Update of /cvsroot/aolserver/aolserver/tcl
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22474

Modified Files:
	util.tcl 
Log Message:
using Tcl 8.4 string comparison operators


Index: util.tcl
===================================================================
RCS file: /cvsroot/aolserver/aolserver/tcl/util.tcl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** util.tcl	8 Feb 2002 07:56:16 -0000	1.4
--- util.tcl	20 Oct 2007 16:39:21 -0000	1.5
***************
*** 67,71 ****
      upvar $formVar form
      set form [ns_conn form $conn]
!     if {[string match "" $form]} {
  	ns_returnbadrequest $conn "Missing HTML FORM data"
  	return 0
--- 67,71 ----
      upvar $formVar form
      set form [ns_conn form $conn]
!     if {$form eq ""} {
  	ns_returnbadrequest $conn "Missing HTML FORM data"
  	return 0
***************
*** 75,79 ****
  
  proc ns_paren {val} {
!     if {$val != ""} {
  	return "($val)"
      } else {
--- 75,79 ----
  
  proc ns_paren {val} {
!     if {$val ne ""} {
  	return "($val)"
      } else {
***************
*** 101,105 ****
      set newhtml ""
  
!     while {$htmlpiece != ""} {
  	if {[string index $htmlpiece 0] == "<"} {
  	    regexp {<([^>]*)>(.*)} $htmlpiece m tag htmlpiece
--- 101,105 ----
      set newhtml ""
  
!     while {$htmlpiece ne ""} {
  	if {[string index $htmlpiece 0] == "<"} {
  	    regexp {<([^>]*)>(.*)} $htmlpiece m tag htmlpiece
***************
*** 194,198 ****
  			regexp {^([^<]*)(.*)} $htmlpiece m txt htmlpiece
  
! 			if {[string match "" $value]} {
  			    set value [string trim $txt]
  			}
--- 194,198 ----
  			regexp {^([^<]*)(.*)} $htmlpiece m txt htmlpiece
  
! 			if {$value eq ""} {
  			    set value [string trim $txt]
  			}
***************
*** 284,296 ****
      set labels {}
      while {[string index [lindex $args 0] 0] == "-"} {
! 	if {[lindex $args 0] == "-multi"} {
  	    set multi 1
  	    set args [lreplace $args 0 0]
  	}
! 	if {[lindex $args 0] == "-sort"} {
  	    set sort 1
  	    set args [lreplace $args 0 0]
  	}
! 	if {[lindex $args 0] == "-labels"} {
  	    set labels [lindex $args 1]
  	    set args [lreplace $args 0 1]
--- 284,296 ----
      set labels {}
      while {[string index [lindex $args 0] 0] == "-"} {
! 	if {[lindex $args 0] eq "-multi"} {
  	    set multi 1
  	    set args [lreplace $args 0 0]
  	}
! 	if {[lindex $args 0] eq "-sort"} {
  	    set sort 1
  	    set args [lreplace $args 0 0]
  	}
! 	if {[lindex $args 0] eq "-labels"} {
  	    set labels [lindex $args 1]
  	    set args [lreplace $args 0 1]
***************
*** 323,327 ****
      set lvpairs {}
      for {set i 0} {$i < $len} {incr i} {
! 	if {[string match "" $labels]} {
  	    set label [lindex $values $i]
  	} else {
--- 323,327 ----
      set lvpairs {}
      for {set i 0} {$i < $len} {incr i} {
! 	if {$labels eq ""} {
  	    set label [lindex $values $i]
  	} else {