From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 13 Dec 2009 13:04:04 +0000 (+0000)
Subject: where-vessels: split code and abbrev
X-Git-Tag: 6.3.1~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=6f75e595f6c445fc84d9d5f10239b11cbfb2a0a2

where-vessels: split code and abbrev
---

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 66d8527..7129910 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -66,6 +66,14 @@ proc errexpect-arrayget {arrayvar key} {
     errexpect-error "undefined $key"
 }
 
+proc errexpect-arrayget-boolean {arrayvar key} {
+    switch -exact [uplevel 1 [list errexpect-arrayget $arrayvar $key]] {
+    	true	{ return 1 }
+	false	{ return 0 }
+	default	{ errexpect-error "unexpected $key" }
+    }
+}
+
 proc errexpect-catch {code} {
     global errorInfo errorCode
     set rc [catch {
@@ -231,44 +239,76 @@ proc display-note-infos {} {
 	$infodata
 }
 
+#---------- vessel properties ----------
+
+proc vesselclasses-init {} {
+    global vc_game2code vc_code2abbrev vc_abbrev2full
+    foreach {game code abbrev full} {
+	smsloop		am	sl	Sloop
+	lgsloop		bm	ct	Cutter
+	dhow		cm	dh	Dhow
+	longship	dm	ls	Longship
+	baghlah		em	bg	Baghlah
+	merchbrig	fm	mb	{Merchant Brig}
+	warbrig		gm	wb	{War Brig}
+	xebec		hm	xe	Xebec
+	warfrig		im	wf	{War Frigate}
+	merchgal	jm	mg	{Merchant Galleon}
+	grandfrig	km	gf	{Grand Frigate}
+    } {
+	set vc_game2code($game) $code
+	set vc_code2abbrev($code) $abbrev
+	set vc_abbrev2full($abbrev) $full
+    }
+}
+
+proc code2abbrev {code} {
+    global vc_code2abbrev
+
+    manyset [split $code _] inport class subclass lockown xabbrev
+    manyset [split $lockown ""] lock own
+
+    set abbrev {}
+    append abbrev [lindex {? {}} $inport]
+    append abbrev $vc_code2abbrev($class)
+    append abbrev $subclass
+    append abbrev [lindex {* + -} $lock]
+    append abbrev [lindex {- = ?} [regsub {\D} $own 2]]
+    append abbrev $xabbrev
+
+    debug "CODE2ABBREV $code $abbrev"
+    return $abbrev
+}
+    
 #---------- loading and parsing the clipboard (vessel locations) ----------
 
 proc vessel {vin} {
     global pirate notes_used note_missings newnotes
     upvar 1 $vin vi
-    set abbrev {}
-    switch -exact [errexpect-arrayget vi inPort] {
-	true		{ }
-	false		{ append abbrev ? }
-	default		{ errexpect-error "unexpected inPort" }
-    }
-    switch -exact [errexpect-arrayget vi vesselClass] {
-	smsloop		{ set sz 00sl }
-	lgsloop		{ set sz 01ct }
-	dhow		{ set sz 02dh }
-	longship	{ set sz 03ls }
-	baghlah		{ set sz 04bg }
-	merchbrig	{ set sz 05mb }
-	warbrig		{ set sz 06wb }
-	xebec		{ set sz 07xe }
-	warfrig		{ set sz 08wf }
-	merchgal	{ set sz 09mg }
-	grandfrig	{ set sz 10gf }
-	default		{ errexpect-error "unknown class" }
-    }
-    append abbrev $sz
-    switch -exact [errexpect-arrayget vi vesselSubclass] {
-	null		{ }
-	icy		{ append abbrev F }
-	default		{ errexpect-error "unknown subclass ?" }
+
+    set codel {}
+    lappend codel [errexpect-arrayget-boolean vi inPort]
+
+    set gameclass [errexpect-arrayget vi vesselClass]
+    upvar #0 vc_game2code($gameclass) class
+    if {![info exists class]} { errexpect-error "unexpected vesselClass"}
+    lappend codel $class
+
+    set subclass [errexpect-arrayget vi vesselSubclass]
+    switch -exact $subclass {
+	null		{ lappend codel {} }
+	icy		{ lappend codel F }
+	default		{ lappend codel ($subclass) }
     }
+
     switch -exact [errexpect-arrayget vi isLocked]/[ \
                    errexpect-arrayget vi isBattleReady] {
-	true/false	{ append abbrev 2- }
-	false/false	{ append abbrev 1+ }
-	false/true	{ append abbrev 0* }
+	true/false	{ set lock 2 }
+	false/false	{ set lock 1 }
+	false/true	{ set lock 0 }
 	default		{ errexpect-error "unexpected isLocked/isBattleReady" }
     }
+
     set vid [errexpect-arrayget vi vesselId]
     upvar #0 notes($vid) note
     set realname [errexpect-arrayget vi vesselName]
@@ -279,28 +319,34 @@ proc vessel {vin} {
     if {[info exists note]} {
 	manyset $note lno notename owner xabbrev
 	if {[string compare -nocase $realname $notename]} {
-	    note-info $lno $vid $realname \
+	    note-info $lno $vid $realname $island \
 		"notes say name is $notename - perhaps renamed"
 	}
 	if {[string length $owner]} {
 	    if {![string compare $owner $pirate]} {
-		append abbrev =
+		set own 1
 	    } else {
-		append abbrev -
+		set own 0
 	    }
+	} else {
+	    set own U
 	}
 	append abbrev $xabbrev
 	set notes_used($vid) 1
 
     } else {
+	set own M
 	lappend note_missings [list $island $realname $vid]
     }
+
+    lappend codel "$lock$own" $xabbrev
     lappend newnotes [list $vid $realname $owner $xabbrev]
-    
-    set kk "$island $abbrev"
+    set kk "$island [join $codel _]"
     upvar #0 count($kk) k
     if {![info exists k]} { set k 0 }
     incr k
+
+    debug "CODED $kk $vid $realname"
 }
 
 set clipboard {}
@@ -341,7 +387,7 @@ proc parse-clipboard {} {
 	foreach vid [lsort [array names notes]] {
 	    if {![info exists notes_used($vid)]} {
 		manyset $notes($vid) lno notename
-		note-info $lno $vid $notename \
+		note-info $lno $vid $notename {} \
 		    "vessel in notes no longer found"
 	    }
 	}
@@ -423,7 +469,10 @@ proc draw {} {
     foreach key [lsort [array names count]] {
 	set c $count($key)
 #	debug "SHOWING $key $c"
-	regexp {^(.*) (\S+)$} $key dummy islandname abbrev
+	regexp {^(.*) (\S+)$} $key dummy islandname code
+
+	set abbrev [code2abbrev $code]
+	
 	if {[string compare $lastislandname $islandname]} {
 		manyset $isleloc($islandname) x y
 		set x [coord $x]
@@ -688,6 +737,8 @@ proc invoke_notes {} {
 
 #---------- main program ----------
 
+vesselclasses-init
+
 parseargs
 argdefaults
 httpclientsetup where-vessels
@@ -695,6 +746,10 @@ load-chart
 widgets-setup
 
 set notes_data {}
+if {[catch { parse-clipboard } emsg]} {
+    puts stderr "$emsg\n$errorInfo"
+    exit 1
+}
 after idle invoke_notes
 
 draw