X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Ftabsort;h=45d5e69e3763f56cbd2a1e1b888ad26261094116;hp=e114319a0254f4780bfcaa6071093d39f016f23f;hb=18bff492748999fe28f474cea854f0fd26d6394f;hpb=38888dbd9221f97b1886ee545d0113c88432556a

diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort
index e114319..45d5e69 100644
--- a/yarrg/web/tabsort
+++ b/yarrg/web/tabsort
@@ -56,7 +56,7 @@ $cols
 
 % print $m->content();
 
-%	my $sortfn= "ts_sort__$table";
+%	my $sortfn= "ts_s_$table";
 function <% $sortfn %>(compar) {
   debug('sorting compar='+compar);
   var table= document.getElementById('<% $table %>');
@@ -115,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 {
@@ -130,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(1 0)) {
-%		my $tcomparefn= "ts_compar${cix}_cmp${reverse}__$table";
+%		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>';