From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 13 May 2022 21:59:58 +0000 (+0100)
Subject: shapelib catalogue: Get sortkey from trait
X-Git-Tag: otter-1.1.0~211
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=959511fe51c5d235bff67cda35960fbd0ceeb775;p=otter.git

shapelib catalogue: Get sortkey from trait

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 44f12655..ff26da32 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -910,6 +910,7 @@ impl Catalogue {
     let mut out = vec![];
     for (k,v) in &self.items {
       if !pat.matches(k.as_str()) { continue }
+      let gpc = GPiece::dummy();
       let (loaded, _) = match
         self.load1(v, &self.libname, k.unnest(),
                    &Instance::dummy(), SpecDepth::zero())
@@ -922,7 +923,7 @@ impl Catalogue {
       let ier = ItemEnquiryData {
         lib: self.enquiry(),
         itemname: (**k).to_owned(),
-        sortkey: v.sort.to_owned(),
+        sortkey: loaded.sortkey().map(|s| s.to_owned()),
         f0bbox,
         f0desc: loaded.describe_face(default())?,
       };