Fix up search too long error message - really fix up

[ypp-sc-tools.main.git] / yarrg / web / tabsort

diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort
index 444bfb56b15f6e1b01e6e2ff74a29c1140209bb8..5031a988382acf63c15cf7f736cb710bce77c379 100644 (file)
--- a/yarrg/web/tabsort
+++ b/yarrg/web/tabsort
@@ -54,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 %>');
@@ -113,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 {
@@ -128,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>';
@@ -163,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 %>);
 </&>