From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 6 Apr 2021 19:13:57 +0000 (+0100)
Subject: otterlib: Show sort order in preview
X-Git-Tag: otter-0.5.0~143
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3312e60e364979b6b2b46f396b1adabf65758699;p=otter.git

otterlib: Show sort order in preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bin/otterlib.rs b/src/bin/otterlib.rs
index 0483caa2..d9dd022e 100644
--- a/src/bin/otterlib.rs
+++ b/src/bin/otterlib.rs
@@ -70,6 +70,7 @@ fn preview(items: Vec<ItemForOutput>) {
 
   struct Prep {
     spec: ItemSpec,
+    sortkey: Option<String>,
     p: Box<dyn PieceTrait>,
     uos: Vec<String>,
     bbox: Vec<Vec<f64>>,
@@ -91,6 +92,7 @@ fn preview(items: Vec<ItemForOutput>) {
 
   let mut pieces: Vec<Prep> = items.into_iter().map(|it| {
     let spec = ItemSpec { lib: it.0, item: it.1.itemname.into() };
+    let sortkey = it.1.sortkey;
     (||{
       let (p, _occultable) = spec.clone().find_load(&pcaliases)
         .context("load")?;
@@ -113,7 +115,7 @@ fn preview(items: Vec<ItemForOutput>) {
         .map(|(min,max)| max-min)
         .collect::<Vec<_>>();
 
-      Ok::<_,AE>(Prep { spec, p, uos, bbox, size })
+      Ok::<_,AE>(Prep { spec, p, sortkey, uos, bbox, size })
     })().with_context(|| format!("{:?}", &spec))
   }).collect::<Result<Vec<_>,_>>()?;
 
@@ -126,7 +128,7 @@ fn preview(items: Vec<ItemForOutput>) {
   println!("{}", &HTML_PRELUDE);
   println!(r#"<table rules="all">"#);
   for s in &pieces {
-    let Prep { spec, p, uos, bbox, size } = s;
+    let Prep { spec, sortkey, p, uos, bbox, size } = s;
 
     macro_rules! println {
       ($($x:tt)*) => ({
@@ -141,6 +143,10 @@ fn preview(items: Vec<ItemForOutput>) {
              Html::from_txt(&spec.lib));
     println!(r#"<th align="left"><kbd>{}</kbd>"#,
              Html::from_txt(&spec.item));
+    if let Some(sortkey) = sortkey {
+      println!(r#"<br><kbd>[{}]</kbd>"#,
+               Html::from_txt(sortkey));
+    }
     println!(r#"</th>"#);
     println!(r#"<th align="left">{}</th>"#,
              p.describe_html(&GPiece::dummy(), &default())?);