X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Ftabsort;h=5031a988382acf63c15cf7f736cb710bce77c379;hp=b11c8785a8e090bd989fc0b68df6cef272f4ab07;hb=9a4d1b4c8bdd8ef11b1d0102a4eee188c4c4f011;hpb=41eff7a5ec6225db4a8a4737ec004866e8da6425

diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort
index b11c878..5031a98 100644
--- a/yarrg/web/tabsort
+++ b/yarrg/web/tabsort
@@ -40,6 +40,7 @@ $table => 'ts_table'
 $sortkeys => 'ts_sortkeys'
 $throw => undef
 $tbrow => undef
+$rowclass => undef
 $cols
 </%args>
 
@@ -53,7 +54,9 @@ $cols
 
 <&| script &>
 
-%	my $sortfn= "ts_sort__$table";
+% print $m->content();
+
+%	my $sortfn= "ts_s_$table";
 function <% $sortfn %>(compar) {
   debug('sorting compar='+compar);
   var table= document.getElementById('<% $table %>');
@@ -67,6 +70,7 @@ function <% $sortfn %>(compar) {
   for (; rowix < rows.length; rowix++) {
     var row= rows.item(rowix);
     if (row.id == '<% $throw %>') break;
+    debug('skip row '+rowix+' [[ '+row+' ]] id='+row.id);
   }
   rowix++;
 %	}
@@ -75,16 +79,28 @@ function <% $sortfn %>(compar) {
 %	if (defined $tbrow) {
     if (row.id == '<% $tbrow %>') break;
 %	}
-    if (!row.id) continue;
-    if (row.tagName != 'TR') continue;
-    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id)
+    if (!row.id) { debug('noid row '+rowix+' [[ '+row+' ]]'); continue; }
+    if (row.tagName != 'TR') {
+      debug('no-tr row '+rowix+' tagName='+row.tagName+' [[ '+row+' ]]');
+      continue;
+    }
+    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id);
     newrows.push(row);
   }
   for (; rowix < rows.length; rowix++) {
     var row= rows.item(rowix);
     finalrows.push(row);
+    debug('final row '+rowix+' [[ '+row+' ]]');
   }
   newrows.sort(compar);
+%	if (defined $rowclass) {
+  for (var rowix=0; rowix < newrows.length; rowix++) {
+    var row= newrows[rowix];
+    var classname= '<% $rowclass %>'+(rowix % 2);
+    debug('fix row '+rowix+' class '+classname);
+    row.className= classname;
+  }
+%	}
   newrows= newrows.concat(finalrows);
   for (var rowix=0; rowix < newrows.length; rowix++) {
     var row= newrows[rowix];
@@ -99,9 +115,9 @@ function <% $sortfn %>(compar) {
 %	my $thhtml= '';
 %	next if $col->{NoSort};
 
-%	my $mapfn= "ts_compar${cix}_map__$table";
-function <% $mapfn %>(rowelement) {
-  var rowid = rowelement.id;
+%	my $mapfn= "ts_${cix}m_$table";
+function <% $mapfn %>(re) {
+  var rowid = re.id;
 %	if ($col->{SortKey}) {
   return <% $col->{SortKey} %>;
 %	} else {
@@ -114,24 +130,25 @@ function <% $mapfn %>(rowelement) {
 %	}
 }
 
-%	my $comparefn= "ts_compar${cix}_cmp0__$table";
+%	my $comparefn= "ts_${cix}c0_$table";
 function <% $comparefn %>(a,b) {
-  var a_key = <% $mapfn %>(a);
-  var b_key = <% $mapfn %>(b);
+  var ak = <% $mapfn %>(a);
+  var bk = <% $mapfn %>(b);
 %	if ($col->{Numeric}) {
-  return a_key - b_key
+  return ak - bk
 %	} else {
-  if (a_key < b_key) return -1;
-  if (a_key > b_key) return +1;
+  if (ak < bk) return -1;
+  if (ak > bk) return +1;
   return 0;
 %	}
 }
 
-%	foreach my $reverse (qw(0 1)) {
-%		my $tcomparefn= "ts_compar${cix}_cmp${reverse}__$table";
+%	foreach my $reverse (qw(1 0)) {
+%		my $tcomparefn= "ts_${cix}c${reverse}_$table";
 %		if ($reverse) {
 %			next unless $col->{DoReverse};
 function <% $tcomparefn %>(a,b) { return -<% $comparefn %>(a,b); }
+
 %		}
 %		$thhtml .= "<a href=\"javascript:$sortfn($tcomparefn)\">".
 %				($reverse ? '&or;' : '&and;'). '</a>';
@@ -149,9 +166,12 @@ function ts_onload__<% $table %>() {
   debug('thlist='+thlist);
   debug('thlist.item(2)=' + thlist.item(2));
   for (var cix in ts_add_heads) {
+    if (!ts_add_heads.hasOwnProperty(cix)) continue;
     var ah = ts_add_heads[cix];
     debug('appending to cix='+cix+' ah='+ah);
     thlist.item(cix).innerHTML += ah;
   }
 }
+
+register_onload(ts_onload__<% $table %>);
 </&>