X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/05b75f8d50b83e943af3be4071449304d82dbdcd..fa7d59804e98cc73f0ab3ed96166889f1767d4db:/cgi/macros-disorder.c

diff --git a/cgi/macros-disorder.c b/cgi/macros-disorder.c
index eff6313..8e891d6 100644
--- a/cgi/macros-disorder.c
+++ b/cgi/macros-disorder.c
@@ -262,7 +262,7 @@ static int exp_length(int attribute((unused)) nargs,
         return -1;
     name = q->track;
   }
-  if(dcgi_client && disorder_length(dcgi_client, name, &length))
+  if(dcgi_client && !disorder_length(dcgi_client, name, &length))
     return sink_printf(output, "%ld:%02ld",
                        length / 60, length % 60) < 0 ? -1 : 0;
   return sink_writes(output, "&nbsp;") < 0 ? -1 : 0;
@@ -855,9 +855,9 @@ static int exp__files_dirs(int nargs,
   if(fn(dcgi_client, dir, re, &tracks, &ntracks))
     return 0;
   /* Sort it.  NB trackname_transform() does not go to the server. */
+  /* TODO use tracksort_init */
   e = xcalloc(ntracks, sizeof *e);
   for(n = 0; n < ntracks; ++n) {
-    e->track = tracks[n];
     e[n].track = tracks[n];
     e[n].sort = trackname_transform(type, tracks[n], "sort");
     e[n].display = trackname_transform(type, tracks[n], "display");
@@ -869,7 +869,7 @@ static int exp__files_dirs(int nargs,
     if((rc = mx_expand(mx_rewritel(m,
                                    "index", make_index(n),
                                    "parity", n % 2 ? "odd" : "even",
-                                   "track", tracks[n],
+                                   "track", e[n].track,
                                    "first", n == 0 ? "true" : "false",
                                    "last", n + 1 == ntracks ? "false" : "true",
                                    "sort", e[n].sort,