From f2978efe205c509d79ced5b52d7fc311b1552e24 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Fri, 1 Jul 2022 20:07:51 +1000
Subject: Account for compound-node info-lookup sub-name-denoted node absence

Return a null entry in such cases, and have client indicate this with
tile-info message.
---
 backend/cgi-bin/data.py          | 15 ++++++---------
 src/components/TileInfoModal.vue | 17 ++++++++++-------
 src/lib.ts                       |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/backend/cgi-bin/data.py b/backend/cgi-bin/data.py
index 3815715..3579a18 100755
--- a/backend/cgi-bin/data.py
+++ b/backend/cgi-bin/data.py
@@ -78,9 +78,9 @@ class NodeInfo:
 		self.imgInfo = imgInfo   # null | ImgInfo
 class InfoResponse:
 	" Sent as responses to 'info' requests "
-	def __init__(self, nodeInfo, subNodesInfo = None):
+	def __init__(self, nodeInfo, subNodesInfo):
 		self.nodeInfo = nodeInfo         # NodeInfo
-		self.subNodesInfo = subNodesInfo # [] | [NodeInfo, NodeInfo]
+		self.subNodesInfo = subNodesInfo # [] | [NodeInfo | null, NodeInfo | null]
 
 # For data lookup
 def lookupNodes(names, tree, dbCur):
@@ -138,7 +138,6 @@ def lookupNodes(names, tree, dbCur):
 	return nameToNodes
 def lookupSuggs(searchStr, suggLimit, tree, dbCur):
 	" For a search string, returns a SearchSuggResponse describing search suggestions "
-	time1 = time.time()
 	results = []
 	hasMore = False
 	# Get node names and alt-names
@@ -178,7 +177,6 @@ def lookupSuggs(searchStr, suggLimit, tree, dbCur):
 	if len(suggs) > suggLimit:
 		hasMore = True
 	#
-	print(time.time() - time1, file=sys.stderr)
 	return SearchSuggResponse(results, hasMore)
 def lookupInfo(name, tree, dbCur):
 	" For a node name, returns an InfoResponse, or None "
@@ -192,11 +190,10 @@ def lookupInfo(name, tree, dbCur):
 	subNames = [match.group(1), match.group(2)] if match != None else []
 	if len(subNames) > 0:
 		nameToSubNodes = lookupNodes(subNames, tree, dbCur)
-		if len(nameToSubNodes) < 2:
-			print(f"ERROR: Unable to find sub-names entries for {name}", file=sys.stderr)
-			return None
+		if len(nameToSubNodes) < 2: # Possible when a subname-denoted node has been trimmed away
+			subNames = [n if n in nameToSubNodes else None for n in subNames]
 		nameToNodes.update(nameToSubNodes)
-	namesToLookup = [name] if len(subNames) == 0 else subNames
+	namesToLookup = [name] if len(subNames) == 0 else [n for n in subNames if n != None]
 	# Get desc info
 	nameToDescInfo = {}
 	query = "SELECT name, desc, wiki_id, redirected, from_dbp FROM" \
@@ -220,7 +217,7 @@ def lookupInfo(name, tree, dbCur):
 			nameToNodes[n],
 			nameToDescInfo[n] if n in nameToDescInfo else None,
 			nameToImgInfo[n] if n in nameToImgInfo else None
-		) for n in [name] + subNames
+		) if n != None else None for n in [name] + subNames
 	]
 	return InfoResponse(nodeInfoObjs[0], nodeInfoObjs[1:])
 
diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue
index 3593600..f507f8d 100644
--- a/src/components/TileInfoModal.vue
+++ b/src/components/TileInfoModal.vue
@@ -17,7 +17,10 @@
 			<h1 v-if="nodes.length > 1" class="text-center font-bold">
 				{{getDisplayName(subNames![idx], nodes[idx])}}
 			</h1>
-			<div class="flex gap-1">
+			<div v-if="nodes[idx] == null" class="text-center">
+				(This node has been trimmed away)
+			</div>
+			<div v-else class="flex gap-1">
 				<div class="w-1/2">
 					<div v-if="imgInfos[idx] == null" :style="getImgStyles(nodes[idx])"/>
 					<a v-else :href="imgInfos[idx]!.url" target="_blank">
@@ -86,25 +89,25 @@ export default defineComponent({
 		tolNode(): TolNode {
 			return this.infoResponse.nodeInfo.tolNode;
 		},
-		nodes(): TolNode[] {
+		nodes(): (TolNode | null)[] {
 			if (this.infoResponse.subNodesInfo.length == 0){
 				return [this.tolNode];
 			} else {
-				return this.infoResponse.subNodesInfo.map(nodeInfo => nodeInfo.tolNode);
+				return this.infoResponse.subNodesInfo.map(nodeInfo => nodeInfo != null ? nodeInfo.tolNode : null);
 			}
 		},
 		imgInfos(): (ImgInfo | null)[] {
 			if (this.infoResponse.subNodesInfo.length == 0){
 				return [this.infoResponse.nodeInfo.imgInfo];
 			} else {
-				return this.infoResponse.subNodesInfo.map(nodeInfo => nodeInfo.imgInfo);
+				return this.infoResponse.subNodesInfo.map(nodeInfo => nodeInfo != null ? nodeInfo.imgInfo : null);
 			}
 		},
 		descInfos(): (DescInfo | null)[] {
 			if (this.infoResponse.subNodesInfo.length == 0){
 				return [this.infoResponse.nodeInfo.descInfo];
 			} else {
-				return this.infoResponse.subNodesInfo.map(nodeInfo => nodeInfo.descInfo);
+				return this.infoResponse.subNodesInfo.map(nodeInfo => nodeInfo != null ? nodeInfo.descInfo : null);
 			}
 		},
 		subNames(): [string, string] | null {
@@ -129,9 +132,9 @@ export default defineComponent({
 				return `${capitalizeWords(tolNode.commonName)} (aka ${capitalizeWords(name)})`;
 			}
 		},
-		getImgStyles(tolNode: TolNode): Record<string,string> {
+		getImgStyles(tolNode: TolNode | null): Record<string,string> {
 			let imgName = null;
-			if (typeof(tolNode.imgName) === 'string'){ // Exclude string-array case
+			if (tolNode != null && typeof(tolNode.imgName) === 'string'){ // Exclude string-array case
 				imgName = tolNode.imgName;
 			}
 			return {
diff --git a/src/lib.ts b/src/lib.ts
index 2b0aabc..06df78b 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -58,7 +58,7 @@ export type NodeInfo = {
 };
 export type InfoResponse = {
 	nodeInfo: NodeInfo,
-	subNodesInfo: [] | [NodeInfo, NodeInfo],
+	subNodesInfo: [] | [NodeInfo | null, NodeInfo | null],
 };
 
 // Used by auto-mode and tutorial
-- 
cgit v1.2.3