From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Jul 2020 01:59:36 +0000 (+0100)
Subject: include dataset.gplayer
X-Git-Tag: otter-0.2.0~1398
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fc2cc1ae2b56b5ecdbeffa7c05836200eb29cc0f;p=otter.git

include dataset.gplayer

but we are going to do this differently
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index e8e0775c..f17c8778 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -97,12 +97,17 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
       let defs = pr.make_defs(&pri);
       alldefs.push((pri.id, defs));
 
+      let gplayer = match pr.held {
+        None => "".to_owned(),
+        Some(o) => format!("{}",o),
+      };
       uses.push(format!(
-        r##"<use id="{}" href="#{}" data-piece="{}" data-gplayer="" x="{}" y="{}"/>"##,
-                        pri.id_use(),
-                        pri.id_piece(),
-                        pri.id,
-                        pr.pos[0], pr.pos[1]));
+        r##"<use id="{}" href="#{}" data-piece="{}" data-gplayer="{}" x="{}" y="{}"/>"##,
+        pri.id_use(),
+        pri.id_piece(),
+        pri.id,
+        &gplayer,
+        pr.pos[0], pr.pos[1]));
     }
 
     let src = SessionRenderContext {