changeset 642:5cbff6baebef

tj: Fix handling of description updating and setting.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Feb 2021 12:58:01 +0200
parents 0b618c09063f
children 1b743b80524b
files tj.tcl
diffstat 1 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tj.tcl	Tue Feb 16 12:46:25 2021 +0200
+++ b/tj.tcl	Tue Feb 16 12:58:01 2021 +0200
@@ -242,10 +242,8 @@
     }
 
     # Check for #id prefix
-    if {[tj_get_id $rarg rindex uid]} {
-      set rdesc ""
-    } else {
-      set rdesc $tj_default_desc
+    set rdesc "*"
+    if {![tj_get_id $rarg rindex uid]} {
       set uid [tj_get_default_id $uhand]
     }
 
@@ -297,10 +295,8 @@
       set rstamp [expr $uclock + ($rdays * 24 * 60 * 60) + ($rhours * 60 * 60)]
     } else {
       # Only description, if any
-      if {![tj_arg_rest $rarglist 1 rdesc]} {
-        tj_msg $upublic $unick $uchan "err_invalid_format" [list]
-        return 1
-      }
+      incr rindex -1
+      tj_arg_rest $rarglist $rindex rdesc
       set rstamp "invalid"
     }
 
@@ -312,6 +308,9 @@
       set umode 0
       set cid $id
       set ctarget $utarget
+      if {$rdesc == "*"} {
+        set rdesc $udesc
+      }
       incr nres
     }
 
@@ -336,6 +335,10 @@
       set ustamp $rstamp
     }
 
+    if {$rdesc == "*"} {
+      set rdesc $tj_default_desc
+    }
+
     set utjstr [tj_get_tj_str_delta $ustamp $uclock]
     set udate [tj_ctime $ustamp]
 
@@ -370,7 +373,7 @@
       # Update existing entry
       set usqlargs {}
       lappend usqlargs "uupdated='$ucreated'"
-      if {[string length $rdesc] > 0} {
+      if {[string length $rdesc] > 0 && $rdesc != "*"} {
         lappend usqlargs "udesc='[utl_escape $rdesc]'"
       }
       if {$rstamp != "invalid"} {