paul@0 | 1 | # -*- coding: iso-8859-1 -*- |
paul@0 | 2 | """ |
paul@0 | 3 | MoinMoin - ImprovedTableParser library |
paul@0 | 4 | |
paul@0 | 5 | @copyright: 2012 by Paul Boddie <paul@boddie.org.uk> |
paul@14 | 6 | @copyright: 2008 MoinMoin:FlorianKrupicka (redirectedOutput code) |
paul@0 | 7 | @license: GNU GPL (v2 or later), see COPYING.txt for details. |
paul@0 | 8 | """ |
paul@0 | 9 | |
paul@0 | 10 | from MoinMoin import wikiutil |
paul@0 | 11 | from StringIO import StringIO |
paul@5 | 12 | from MoinSupport import * |
paul@0 | 13 | import re |
paul@0 | 14 | |
paul@28 | 15 | __version__ = "0.3" |
paul@27 | 16 | |
paul@0 | 17 | # Regular expressions. |
paul@0 | 18 | |
paul@0 | 19 | syntax = { |
paul@0 | 20 | # At start of line: |
paul@34 | 21 | "rows" : (r"^==(?!.*?==$)[ \t]?", re.MULTILINE), # == not-heading ws-excl-nl |
paul@34 | 22 | "continuations" : (r"^\s*\.\.(?!\.)[ \t]?", re.MULTILINE), # .. ws-excl-nl or .. not-dot |
paul@1 | 23 | |
paul@0 | 24 | # Within text: |
paul@23 | 25 | "markers" : (r"([{]{3,}|[}]{3,})", re.MULTILINE | re.DOTALL), # {{{... or }}}... |
paul@1 | 26 | "columns" : (r"\|\|[ \t]*", 0), # || ws-excl-nl |
paul@1 | 27 | |
paul@0 | 28 | # At start of column text: |
paul@1 | 29 | "column" : (r"^\s*<(.*?)>\s*(.*)", re.DOTALL), # ws < attributes > ws |
paul@0 | 30 | } |
paul@0 | 31 | |
paul@0 | 32 | patterns = {} |
paul@0 | 33 | for name, (value, flags) in syntax.items(): |
paul@0 | 34 | patterns[name] = re.compile(value, re.UNICODE | flags) |
paul@0 | 35 | |
paul@4 | 36 | # Other regular expressions. |
paul@4 | 37 | |
paul@4 | 38 | leading_number_regexp = re.compile(r"\d*") |
paul@4 | 39 | |
paul@13 | 40 | # Constants. |
paul@13 | 41 | |
paul@13 | 42 | up_arrow = u'\u2191' |
paul@13 | 43 | down_arrow = u'\u2193' |
paul@13 | 44 | |
paul@0 | 45 | # Functions. |
paul@0 | 46 | |
paul@0 | 47 | def parse(s): |
paul@0 | 48 | |
paul@0 | 49 | "Parse 's', returning a table definition." |
paul@0 | 50 | |
paul@0 | 51 | table_attrs = {} |
paul@1 | 52 | rows = [] |
paul@0 | 53 | |
paul@1 | 54 | # The following will be redefined upon the construction of the first row. |
paul@1 | 55 | |
paul@1 | 56 | row_attrs = {} |
paul@1 | 57 | columns = [] |
paul@17 | 58 | columnnumber = 0 |
paul@17 | 59 | |
paul@17 | 60 | # The following will be redefined upon the construction of the first column. |
paul@17 | 61 | |
paul@17 | 62 | column_attrs = {} |
paul@1 | 63 | |
paul@1 | 64 | # Process exposed text and sections. |
paul@1 | 65 | |
paul@23 | 66 | marker = None |
paul@23 | 67 | is_region = True |
paul@1 | 68 | |
paul@1 | 69 | # Initially, start a new row. |
paul@1 | 70 | |
paul@1 | 71 | row_continued = False |
paul@1 | 72 | |
paul@23 | 73 | for match_text in patterns["markers"].split(s): |
paul@0 | 74 | |
paul@23 | 75 | # Only look for table features in exposed text. Where a section is |
paul@23 | 76 | # defined, a marker will have been read and all regions before the |
paul@23 | 77 | # closing marker will not be exposed. |
paul@1 | 78 | |
paul@23 | 79 | if is_region and not marker: |
paul@1 | 80 | |
paul@1 | 81 | # Extract each row from the definition. |
paul@1 | 82 | |
paul@23 | 83 | for row_text in patterns["rows"].split(match_text): |
paul@1 | 84 | |
paul@1 | 85 | # Only create a new row when a boundary has been found. |
paul@0 | 86 | |
paul@1 | 87 | if not row_continued: |
paul@17 | 88 | |
paul@17 | 89 | # Complete any existing row. |
paul@17 | 90 | |
paul@1 | 91 | if columns: |
paul@22 | 92 | extractAttributes(columns, row_attrs, table_attrs) |
paul@17 | 93 | span_columns(columns, columnnumber) |
paul@17 | 94 | |
paul@17 | 95 | # Replicate the last row to determine column usage. |
paul@17 | 96 | |
paul@17 | 97 | column_usage = [] |
paul@17 | 98 | |
paul@17 | 99 | for column_attrs, text in columns: |
paul@17 | 100 | rowspan = int(strip_token(column_attrs.get("rowspan", "1"))) |
paul@17 | 101 | if rowspan > 1: |
paul@17 | 102 | attrs = {} |
paul@17 | 103 | attrs.update(column_attrs) |
paul@17 | 104 | attrs["rowspan"] = str(rowspan - 1) |
paul@17 | 105 | attrs["rowcontinuation"] = True |
paul@17 | 106 | column_usage.append((attrs, text)) |
paul@17 | 107 | else: |
paul@17 | 108 | column_usage.append(({}, None)) |
paul@17 | 109 | |
paul@17 | 110 | columns = column_usage |
paul@17 | 111 | |
paul@17 | 112 | # Define a new collection of row attributes. |
paul@0 | 113 | |
paul@1 | 114 | row_attrs = {} |
paul@17 | 115 | |
paul@17 | 116 | # Reset the columns and make the list available for the |
paul@17 | 117 | # addition of new columns, starting a new column |
paul@17 | 118 | # immediately. |
paul@17 | 119 | |
paul@1 | 120 | rows.append((row_attrs, columns)) |
paul@1 | 121 | column_continued = False |
paul@17 | 122 | columnnumber = 0 |
paul@0 | 123 | |
paul@1 | 124 | # Extract each column from the row. |
paul@0 | 125 | |
paul@1 | 126 | for text in patterns["columns"].split(row_text): |
paul@1 | 127 | |
paul@32 | 128 | # Replace line continuation strings. |
paul@32 | 129 | |
paul@32 | 130 | text = patterns["continuations"].sub("", text) |
paul@32 | 131 | |
paul@1 | 132 | # Only create a new column when a boundary has been found. |
paul@1 | 133 | |
paul@1 | 134 | if not column_continued: |
paul@1 | 135 | |
paul@17 | 136 | # Complete any existing column. |
paul@17 | 137 | |
paul@17 | 138 | if columns: |
paul@17 | 139 | columnnumber = span_columns(columns, columnnumber) |
paul@17 | 140 | |
paul@1 | 141 | # Extract the attribute and text sections. |
paul@0 | 142 | |
paul@1 | 143 | match = patterns["column"].search(text) |
paul@1 | 144 | if match: |
paul@1 | 145 | attribute_text, text = match.groups() |
paul@17 | 146 | column_attrs = parseAttributes(attribute_text, True) |
paul@1 | 147 | else: |
paul@17 | 148 | column_attrs = {} |
paul@17 | 149 | |
paul@17 | 150 | # Define the new column with a mutable container |
paul@17 | 151 | # permitting the extension of the text. |
paul@17 | 152 | |
paul@17 | 153 | details = [column_attrs, text] |
paul@17 | 154 | |
paul@17 | 155 | # Find the next gap in the columns. |
paul@17 | 156 | |
paul@17 | 157 | while columnnumber != -1 and columnnumber < len(columns): |
paul@17 | 158 | attrs, text = columns[columnnumber] |
paul@17 | 159 | if text is None: |
paul@17 | 160 | columns[columnnumber] = details |
paul@17 | 161 | break |
paul@17 | 162 | columnnumber += 1 |
paul@17 | 163 | |
paul@17 | 164 | # Or start adding at the end of the row. |
paul@17 | 165 | |
paul@17 | 166 | else: |
paul@17 | 167 | columnnumber = -1 |
paul@17 | 168 | columns.append(details) |
paul@0 | 169 | |
paul@1 | 170 | else: |
paul@17 | 171 | columns[columnnumber][1] += text |
paul@1 | 172 | |
paul@1 | 173 | # Permit columns immediately following this one. |
paul@1 | 174 | |
paul@1 | 175 | column_continued = False |
paul@0 | 176 | |
paul@1 | 177 | # Permit a continuation of the current column. |
paul@1 | 178 | |
paul@1 | 179 | column_continued = True |
paul@1 | 180 | |
paul@1 | 181 | # Permit rows immediately following this one. |
paul@1 | 182 | |
paul@1 | 183 | row_continued = False |
paul@1 | 184 | |
paul@1 | 185 | # Permit a continuation if the current row. |
paul@0 | 186 | |
paul@1 | 187 | row_continued = True |
paul@1 | 188 | |
paul@23 | 189 | else: |
paul@23 | 190 | |
paul@23 | 191 | # Handle section markers. |
paul@23 | 192 | |
paul@23 | 193 | if not is_region: |
paul@23 | 194 | |
paul@23 | 195 | # Interpret the given marker, closing the current section if the |
paul@23 | 196 | # given marker is the corresponding end marker for the current |
paul@23 | 197 | # section. |
paul@0 | 198 | |
paul@23 | 199 | if marker: |
paul@23 | 200 | if match_text.startswith("}") and len(marker) == len(match_text): |
paul@23 | 201 | marker = None |
paul@23 | 202 | |
paul@23 | 203 | # Without a current marker, start a section if an appropriate marker |
paul@23 | 204 | # is given. |
paul@1 | 205 | |
paul@23 | 206 | elif match_text.startswith("{"): |
paul@23 | 207 | marker = match_text |
paul@23 | 208 | |
paul@23 | 209 | # Markers and section text are incorporated into the current column. |
paul@23 | 210 | |
paul@23 | 211 | columns[columnnumber][1] += match_text |
paul@23 | 212 | |
paul@23 | 213 | is_region = not is_region |
paul@1 | 214 | |
paul@17 | 215 | # Complete any final row. |
paul@17 | 216 | |
paul@1 | 217 | if columns: |
paul@22 | 218 | extractAttributes(columns, row_attrs, table_attrs) |
paul@0 | 219 | |
paul@0 | 220 | return table_attrs, rows |
paul@0 | 221 | |
paul@17 | 222 | def span_columns(columns, columnnumber): |
paul@17 | 223 | |
paul@17 | 224 | """ |
paul@17 | 225 | In the 'columns', make the column with the 'columnnumber' span the specified |
paul@17 | 226 | number of columns, returning the next appropriate column number. |
paul@17 | 227 | """ |
paul@17 | 228 | |
paul@17 | 229 | column_attrs, text = columns[columnnumber] |
paul@17 | 230 | |
paul@17 | 231 | # Handle any previous column spanning other columns. |
paul@17 | 232 | |
paul@17 | 233 | if column_attrs.has_key("colspan"): |
paul@17 | 234 | colspan = int(strip_token(column_attrs["colspan"])) |
paul@17 | 235 | |
paul@17 | 236 | # Duplicate the current column as continuation |
paul@17 | 237 | # columns for as long as the colspan is defined. |
paul@17 | 238 | |
paul@17 | 239 | colspan -= 1 |
paul@17 | 240 | while colspan > 0: |
paul@17 | 241 | attrs = {} |
paul@17 | 242 | attrs.update(column_attrs) |
paul@17 | 243 | attrs["colspan"] = str(colspan) |
paul@17 | 244 | attrs["colcontinuation"] = True |
paul@17 | 245 | |
paul@17 | 246 | if columnnumber != -1: |
paul@17 | 247 | columnnumber += 1 |
paul@17 | 248 | if columnnumber < len(columns): |
paul@17 | 249 | columns[columnnumber] = attrs, text |
paul@17 | 250 | else: |
paul@17 | 251 | columnnumber = -1 |
paul@17 | 252 | |
paul@17 | 253 | if columnnumber == -1: |
paul@17 | 254 | columns.append((attrs, text)) |
paul@17 | 255 | |
paul@17 | 256 | colspan -= 1 |
paul@17 | 257 | |
paul@17 | 258 | return columnnumber |
paul@17 | 259 | |
paul@22 | 260 | def extractAttributes(columns, row_attrs, table_attrs): |
paul@1 | 261 | |
paul@1 | 262 | """ |
paul@22 | 263 | Extract row- and table-level attributes from 'columns', storing them in |
paul@1 | 264 | 'row_attrs' and 'table_attrs' respectively. |
paul@1 | 265 | """ |
paul@1 | 266 | |
paul@22 | 267 | for column in columns: |
paul@22 | 268 | attrs = column[0] |
paul@22 | 269 | for name, value in attrs.items(): |
paul@22 | 270 | if name.startswith("row") and name not in ("rowspan", "rowcontinuation"): |
paul@22 | 271 | row_attrs[name] = value |
paul@22 | 272 | del attrs[name] |
paul@22 | 273 | elif name.startswith("table"): |
paul@22 | 274 | table_attrs[name] = value |
paul@22 | 275 | del attrs[name] |
paul@1 | 276 | |
paul@4 | 277 | # Sorting utilities. |
paul@4 | 278 | |
paul@4 | 279 | def get_sort_columns(s, start=0): |
paul@4 | 280 | |
paul@4 | 281 | """ |
paul@4 | 282 | Split the comma-separated string 's', extracting the column specifications |
paul@20 | 283 | of the form <column>["n"] where the suffix "n" indicates an optional |
paul@4 | 284 | numeric conversion for that column. Column indexes start from the specified |
paul@4 | 285 | 'start' value (defaulting to 0). |
paul@4 | 286 | """ |
paul@4 | 287 | |
paul@4 | 288 | sort_columns = [] |
paul@4 | 289 | for column_spec in s.split(","): |
paul@4 | 290 | column_spec = column_spec.strip() |
paul@4 | 291 | |
paul@4 | 292 | ascending = True |
paul@4 | 293 | if column_spec.endswith("d"): |
paul@4 | 294 | column_spec = column_spec[:-1] |
paul@4 | 295 | ascending = False |
paul@4 | 296 | |
paul@4 | 297 | # Extract the conversion indicator and column index. |
paul@4 | 298 | # Ignore badly-specified columns. |
paul@4 | 299 | |
paul@4 | 300 | try: |
paul@6 | 301 | column = get_number(column_spec) |
paul@6 | 302 | suffix = column_spec[len(column):] |
paul@6 | 303 | fn = converters[suffix] |
paul@4 | 304 | sort_columns.append((max(0, int(column) - start), fn, ascending)) |
paul@4 | 305 | except ValueError: |
paul@4 | 306 | pass |
paul@4 | 307 | |
paul@4 | 308 | return sort_columns |
paul@4 | 309 | |
paul@6 | 310 | def get_column_types(sort_columns): |
paul@6 | 311 | |
paul@6 | 312 | """ |
paul@6 | 313 | Return a dictionary mapping column indexes to conversion functions. |
paul@6 | 314 | """ |
paul@6 | 315 | |
paul@6 | 316 | d = {} |
paul@6 | 317 | for column, fn, ascending in sort_columns: |
paul@6 | 318 | d[column] = fn, ascending |
paul@6 | 319 | return d |
paul@6 | 320 | |
paul@6 | 321 | def get_number(s): |
paul@6 | 322 | |
paul@6 | 323 | "From 's', get any leading number." |
paul@6 | 324 | |
paul@6 | 325 | match = leading_number_regexp.match(s) |
paul@6 | 326 | if match: |
paul@6 | 327 | return match.group() |
paul@6 | 328 | else: |
paul@6 | 329 | return "" |
paul@6 | 330 | |
paul@10 | 331 | def to_number(s, request): |
paul@4 | 332 | |
paul@12 | 333 | """ |
paul@12 | 334 | Convert 's' to a number, discarding any non-numeric trailing data. |
paul@12 | 335 | Return an empty string if 's' is empty. |
paul@12 | 336 | """ |
paul@4 | 337 | |
paul@12 | 338 | if s: |
paul@20 | 339 | return int(get_number(to_plain_text(s, request))) |
paul@12 | 340 | else: |
paul@12 | 341 | return s |
paul@4 | 342 | |
paul@10 | 343 | def to_plain_text(s, request): |
paul@10 | 344 | |
paul@10 | 345 | "Convert 's' to plain text." |
paul@10 | 346 | |
paul@14 | 347 | fmt = getFormatterClass(request, "plain")(request) |
paul@14 | 348 | fmt.setPage(request.page) |
paul@10 | 349 | return formatText(s, request, fmt) |
paul@10 | 350 | |
paul@10 | 351 | converters = { |
paul@10 | 352 | "n" : to_number, |
paul@10 | 353 | "" : to_plain_text, |
paul@10 | 354 | } |
paul@10 | 355 | |
paul@10 | 356 | suffixes = {} |
paul@10 | 357 | for key, value in converters.items(): |
paul@10 | 358 | suffixes[value] = key |
paul@10 | 359 | |
paul@4 | 360 | class Sorter: |
paul@4 | 361 | |
paul@4 | 362 | "A sorting helper class." |
paul@4 | 363 | |
paul@10 | 364 | def __init__(self, sort_columns, request): |
paul@4 | 365 | self.sort_columns = sort_columns |
paul@10 | 366 | self.request = request |
paul@4 | 367 | |
paul@4 | 368 | def __call__(self, row1, row2): |
paul@4 | 369 | row_attrs1, columns1 = row1 |
paul@4 | 370 | row_attrs2, columns2 = row2 |
paul@4 | 371 | |
paul@4 | 372 | # Apply the conversions to each column, comparing the results. |
paul@4 | 373 | |
paul@4 | 374 | for column, fn, ascending in self.sort_columns: |
paul@4 | 375 | column_attrs1, text1 = columns1[column] |
paul@4 | 376 | column_attrs2, text2 = columns2[column] |
paul@4 | 377 | |
paul@4 | 378 | # Ignore a column when a conversion is not possible. |
paul@4 | 379 | |
paul@4 | 380 | try: |
paul@12 | 381 | value1 = fn(text1, self.request) |
paul@12 | 382 | value2 = fn(text2, self.request) |
paul@12 | 383 | |
paul@12 | 384 | # Avoid empty strings appearing earlier than other values. |
paul@12 | 385 | |
paul@12 | 386 | if value1 == "" and value2 != "": |
paul@12 | 387 | result = 1 |
paul@12 | 388 | elif value1 != "" and value2 == "": |
paul@12 | 389 | result = -1 |
paul@12 | 390 | else: |
paul@12 | 391 | result = cmp(value1, value2) |
paul@4 | 392 | |
paul@4 | 393 | # Where the columns differ, return a result observing the sense |
paul@4 | 394 | # (ascending or descending) of the comparison for the column. |
paul@4 | 395 | |
paul@4 | 396 | if result != 0: |
paul@4 | 397 | return ascending and result or -result |
paul@4 | 398 | |
paul@4 | 399 | except ValueError: |
paul@4 | 400 | pass |
paul@4 | 401 | |
paul@4 | 402 | return 0 |
paul@4 | 403 | |
paul@35 | 404 | def write_sort_control(request, columnnumber, columns, sort_columns, column_types, table_name, start=0, write=None): |
paul@6 | 405 | |
paul@6 | 406 | """ |
paul@16 | 407 | Using the 'request', write a sort control for the given 'columnnumber' in |
paul@16 | 408 | the collection of 'columns', using the existing 'sort_columns' and |
paul@16 | 409 | 'column_types' to construct labels and links that modify the sort criteria, |
paul@16 | 410 | and using the given 'table_name' to parameterise the links. |
paul@35 | 411 | |
paul@35 | 412 | If the 'write' parameter is specified, use it to write output; otherwise, |
paul@35 | 413 | write output using the request. |
paul@6 | 414 | """ |
paul@6 | 415 | |
paul@16 | 416 | fmt = request.formatter |
paul@35 | 417 | write = write or request.write |
paul@7 | 418 | _ = request.getText |
paul@7 | 419 | |
paul@7 | 420 | write(fmt.div(1, css_class="sortcolumns")) |
paul@6 | 421 | |
paul@16 | 422 | write(fmt.paragraph(1)) |
paul@16 | 423 | write(fmt.text(_("Sort by columns..."))) |
paul@16 | 424 | write(fmt.paragraph(0)) |
paul@16 | 425 | |
paul@6 | 426 | # Start with the existing criteria without this column being involved. |
paul@6 | 427 | |
paul@7 | 428 | revised_sort_columns = [(column, fn, ascending) |
paul@6 | 429 | for (column, fn, ascending) in sort_columns if column != columnnumber] |
paul@7 | 430 | |
paul@7 | 431 | # Get the specification of this column. |
paul@7 | 432 | |
paul@10 | 433 | columnfn, columnascending = column_types.get(columnnumber, (to_plain_text, True)) |
paul@7 | 434 | newsortcolumn = columnnumber, columnfn, columnascending |
paul@13 | 435 | newsortcolumn_reverse = columnnumber, columnfn, not columnascending |
paul@7 | 436 | newlabel = columns[columnnumber][1].strip() |
paul@7 | 437 | |
paul@7 | 438 | # Show this column in all possible places in the sorting criteria. |
paul@6 | 439 | |
paul@7 | 440 | write(fmt.number_list(1)) |
paul@7 | 441 | |
paul@7 | 442 | just_had_this_column = False |
paul@7 | 443 | |
paul@7 | 444 | for i, (column, fn, ascending) in enumerate(sort_columns): |
paul@7 | 445 | new_sort_columns = revised_sort_columns[:] |
paul@7 | 446 | new_sort_columns.insert(i, newsortcolumn) |
paul@7 | 447 | label = columns[column][1].strip() |
paul@6 | 448 | |
paul@13 | 449 | arrow = columnascending and down_arrow or up_arrow |
paul@13 | 450 | arrow_reverse = not columnascending and down_arrow or up_arrow |
paul@13 | 451 | |
paul@13 | 452 | sortcolumns = get_sort_column_output(new_sort_columns) |
paul@13 | 453 | new_sort_columns[i] = newsortcolumn_reverse |
paul@13 | 454 | sortcolumns_reverse = get_sort_column_output(new_sort_columns) |
paul@13 | 455 | |
paul@13 | 456 | # Columns permitting the insertion of the selected column. |
paul@7 | 457 | |
paul@7 | 458 | if column != columnnumber and not just_had_this_column: |
paul@7 | 459 | write(fmt.listitem(1, css_class="sortcolumn")) |
paul@7 | 460 | |
paul@13 | 461 | # Pop-up element showing the column inserted before the sort column. |
paul@13 | 462 | |
paul@7 | 463 | write(fmt.span(1, css_class="sortcolumn-container")) |
paul@7 | 464 | write(fmt.span(1, css_class="newsortcolumn")) |
paul@8 | 465 | write(formatText(newlabel, request, fmt)) |
paul@13 | 466 | |
paul@13 | 467 | write_sort_link(write, request, fmt, table_name, sortcolumns, arrow, "sortdirection") |
paul@13 | 468 | write_sort_link(write, request, fmt, table_name, sortcolumns_reverse, arrow_reverse, "sortdirection") |
paul@13 | 469 | |
paul@7 | 470 | write(fmt.span(0)) |
paul@7 | 471 | write(fmt.span(0)) |
paul@6 | 472 | |
paul@17 | 473 | # Link for selection of the modified sort criteria using the current |
paul@17 | 474 | # column and showing its particular direction. |
paul@7 | 475 | |
paul@17 | 476 | arrow = ascending and down_arrow or up_arrow |
paul@17 | 477 | arrow_reverse = not ascending and down_arrow or up_arrow |
paul@13 | 478 | write_sort_link(write, request, fmt, table_name, sortcolumns, u"%s %s" % (label, arrow), "") |
paul@13 | 479 | |
paul@13 | 480 | # Columns permitting removal or modification. |
paul@7 | 481 | |
paul@7 | 482 | else: |
paul@7 | 483 | write(fmt.listitem(1)) |
paul@7 | 484 | |
paul@7 | 485 | # Either show the column without a link, since the column to be |
paul@7 | 486 | # inserted is already before the current column. |
paul@6 | 487 | |
paul@7 | 488 | if just_had_this_column: |
paul@7 | 489 | just_had_this_column = False |
paul@17 | 490 | arrow = ascending and down_arrow or up_arrow |
paul@17 | 491 | arrow_reverse = not ascending and down_arrow or up_arrow |
paul@17 | 492 | |
paul@17 | 493 | # Write the current column with its particular direction. |
paul@17 | 494 | |
paul@7 | 495 | write(fmt.span(1, css_class="unlinkedcolumn")) |
paul@17 | 496 | write(formatText(u"%s %s" % (label, arrow), request, fmt)) |
paul@7 | 497 | write(fmt.span(0)) |
paul@7 | 498 | |
paul@7 | 499 | # Or show the column with a link for its removal. |
paul@6 | 500 | |
paul@7 | 501 | else: |
paul@7 | 502 | just_had_this_column = True |
paul@13 | 503 | sortcolumns_revised = get_sort_column_output(revised_sort_columns) |
paul@13 | 504 | write_sort_link(write, request, fmt, table_name, sortcolumns_revised, u"%s %s" % (label, arrow), "removecolumn") |
paul@13 | 505 | |
paul@16 | 506 | # Alternative sort direction. |
paul@13 | 507 | |
paul@16 | 508 | write_sort_link(write, request, fmt, table_name, sortcolumns_reverse, arrow_reverse, "altdirection") |
paul@7 | 509 | |
paul@7 | 510 | write(fmt.listitem(0)) |
paul@7 | 511 | |
paul@9 | 512 | if not just_had_this_column: |
paul@7 | 513 | |
paul@7 | 514 | # Write the sorting criteria with this column at the end. |
paul@7 | 515 | |
paul@7 | 516 | new_sort_columns = revised_sort_columns[:] |
paul@7 | 517 | new_sort_columns.append(newsortcolumn) |
paul@6 | 518 | |
paul@13 | 519 | sortcolumns = get_sort_column_output(new_sort_columns) |
paul@13 | 520 | new_sort_columns[-1] = newsortcolumn_reverse |
paul@13 | 521 | sortcolumns_reverse = get_sort_column_output(new_sort_columns) |
paul@13 | 522 | |
paul@13 | 523 | arrow = columnascending and down_arrow or up_arrow |
paul@13 | 524 | arrow_reverse = not columnascending and down_arrow or up_arrow |
paul@13 | 525 | |
paul@15 | 526 | write(fmt.listitem(1, css_class="appendcolumn")) |
paul@7 | 527 | |
paul@7 | 528 | # Pop-up element showing the column inserted before the sort column. |
paul@7 | 529 | |
paul@7 | 530 | write(fmt.span(1, css_class="newsortcolumn")) |
paul@15 | 531 | write_sort_link(write, request, fmt, table_name, sortcolumns, newlabel, "") |
paul@13 | 532 | write_sort_link(write, request, fmt, table_name, sortcolumns, arrow, "sortdirection") |
paul@13 | 533 | write_sort_link(write, request, fmt, table_name, sortcolumns_reverse, arrow_reverse, "sortdirection") |
paul@7 | 534 | write(fmt.span(0)) |
paul@7 | 535 | |
paul@7 | 536 | write(fmt.listitem(0)) |
paul@7 | 537 | |
paul@7 | 538 | write(fmt.number_list(0)) |
paul@7 | 539 | |
paul@7 | 540 | write(fmt.div(0)) |
paul@7 | 541 | |
paul@13 | 542 | def write_sort_link(write, request, fmt, table_name, sortcolumns, label, css_class): |
paul@13 | 543 | |
paul@13 | 544 | "Write a link expressing sort criteria." |
paul@13 | 545 | |
paul@13 | 546 | write(fmt.url(1, "?%s#%s" % ( |
paul@13 | 547 | wikiutil.makeQueryString("%s-sortcolumns=%s" % (table_name, sortcolumns)), |
paul@13 | 548 | fmt.qualify_id(fmt.sanitize_to_id(table_name)) |
paul@13 | 549 | ), css_class=css_class)) |
paul@13 | 550 | write(formatText(label, request, fmt)) |
paul@13 | 551 | write(fmt.url(0)) |
paul@13 | 552 | |
paul@7 | 553 | def get_sort_column_output(columns, start=0): |
paul@7 | 554 | |
paul@7 | 555 | "Return the output criteria for the given 'columns' indexed from 'start'." |
paul@7 | 556 | |
paul@7 | 557 | return ",".join([("%d%s%s" % (column + start, suffixes[fn], not ascending and "d" or "")) |
paul@7 | 558 | for (column, fn, ascending) in columns]) |
paul@6 | 559 | |
paul@0 | 560 | # Common formatting functions. |
paul@0 | 561 | |
paul@35 | 562 | def formatTable(text, request, fmt, attrs=None, write=None): |
paul@0 | 563 | |
paul@4 | 564 | """ |
paul@4 | 565 | Format the given 'text' using the specified 'request' and formatter 'fmt'. |
paul@4 | 566 | The optional 'attrs' can be used to control the presentation of the table. |
paul@35 | 567 | |
paul@35 | 568 | If the 'write' parameter is specified, use it to write output; otherwise, |
paul@35 | 569 | write output using the request. |
paul@4 | 570 | """ |
paul@4 | 571 | |
paul@5 | 572 | # Parse the table region. |
paul@5 | 573 | |
paul@4 | 574 | table_attrs, table = parse(text) |
paul@4 | 575 | |
paul@11 | 576 | # Define the table name and an anchor attribute. |
paul@5 | 577 | |
paul@5 | 578 | table_name = attrs.get("name") |
paul@10 | 579 | if table_name: |
paul@10 | 580 | table_attrs["tableid"] = table_name |
paul@11 | 581 | else: |
paul@11 | 582 | table_name = table_attrs.get("tableid") |
paul@6 | 583 | |
paul@17 | 584 | # Only attempt to offer sorting capabilities if a table name is specified. |
paul@11 | 585 | |
paul@11 | 586 | if table_name: |
paul@17 | 587 | |
paul@17 | 588 | # Get the underlying column types. |
paul@11 | 589 | |
paul@17 | 590 | column_types = get_column_types(get_sort_columns(attrs.get("columntypes", ""))) |
paul@17 | 591 | |
paul@17 | 592 | # Get sorting criteria from the region. |
paul@17 | 593 | |
paul@17 | 594 | region_sortcolumns = attrs.get("sortcolumns", "") |
paul@11 | 595 | |
paul@17 | 596 | # Update the column types from the sort criteria. |
paul@11 | 597 | |
paul@17 | 598 | column_types.update(get_column_types(get_sort_columns(region_sortcolumns))) |
paul@17 | 599 | |
paul@17 | 600 | # Determine the applicable sort criteria using the request. |
paul@11 | 601 | |
paul@17 | 602 | sortcolumns = getQualifiedParameter(request, table_name, "sortcolumns") |
paul@17 | 603 | if sortcolumns is None: |
paul@17 | 604 | sortcolumns = region_sortcolumns |
paul@11 | 605 | |
paul@17 | 606 | # Define the final sort criteria. |
paul@5 | 607 | |
paul@17 | 608 | sort_columns = get_sort_columns(sortcolumns) |
paul@17 | 609 | data_start = int(getQualifiedParameter(request, table_name, "headers") or attrs.get("headers", "1")) |
paul@6 | 610 | |
paul@17 | 611 | # Update the column types from the final sort criteria. |
paul@17 | 612 | |
paul@17 | 613 | column_types.update(get_column_types(sort_columns)) |
paul@17 | 614 | |
paul@17 | 615 | # Sort the rows according to the values in each of the specified columns. |
paul@4 | 616 | |
paul@17 | 617 | if sort_columns: |
paul@17 | 618 | headers = table[:data_start] |
paul@17 | 619 | data = table[data_start:] |
paul@17 | 620 | |
paul@17 | 621 | # Perform the sort and reconstruct the table. |
paul@6 | 622 | |
paul@17 | 623 | sorter = Sorter(sort_columns, request) |
paul@17 | 624 | data.sort(cmp=sorter) |
paul@17 | 625 | table = headers + data |
paul@4 | 626 | |
paul@17 | 627 | # Otherwise, indicate that no sorting is being performed. |
paul@11 | 628 | |
paul@11 | 629 | else: |
paul@17 | 630 | sort_columns = None |
paul@4 | 631 | |
paul@4 | 632 | # Write the table. |
paul@4 | 633 | |
paul@35 | 634 | write = write or request.write |
paul@6 | 635 | write(fmt.table(1, table_attrs)) |
paul@0 | 636 | |
paul@6 | 637 | for rownumber, (row_attrs, columns) in enumerate(table): |
paul@6 | 638 | write(fmt.table_row(1, row_attrs)) |
paul@17 | 639 | sortable_heading = sort_columns is not None and rownumber == data_start - 1 |
paul@6 | 640 | |
paul@6 | 641 | for columnnumber, (column_attrs, column_text) in enumerate(columns): |
paul@17 | 642 | |
paul@17 | 643 | # Always skip column continuation cells. |
paul@17 | 644 | |
paul@17 | 645 | if column_attrs.get("colcontinuation"): |
paul@17 | 646 | continue |
paul@17 | 647 | |
paul@17 | 648 | # Where sorting has not occurred, preserve rowspans and do not write |
paul@17 | 649 | # cells that continue a rowspan. |
paul@17 | 650 | |
paul@17 | 651 | if not sort_columns: |
paul@17 | 652 | if column_attrs.get("rowcontinuation"): |
paul@17 | 653 | continue |
paul@17 | 654 | |
paul@17 | 655 | # Where sorting has occurred, replicate cell contents and remove any |
paul@17 | 656 | # rowspans. |
paul@17 | 657 | |
paul@17 | 658 | else: |
paul@17 | 659 | if column_attrs.has_key("rowspan"): |
paul@17 | 660 | del column_attrs["rowspan"] |
paul@17 | 661 | |
paul@17 | 662 | # Remove any continuation attributes that still apply. |
paul@17 | 663 | |
paul@17 | 664 | if column_attrs.has_key("rowcontinuation"): |
paul@17 | 665 | del column_attrs["rowcontinuation"] |
paul@17 | 666 | |
paul@6 | 667 | write(fmt.table_cell(1, column_attrs)) |
paul@7 | 668 | |
paul@17 | 669 | if sortable_heading: |
paul@7 | 670 | write(fmt.div(1, css_class="sortablecolumn")) |
paul@7 | 671 | |
paul@17 | 672 | write(formatText(column_text or "", request, fmt)) |
paul@0 | 673 | |
paul@6 | 674 | # Add sorting controls, if appropriate. |
paul@6 | 675 | |
paul@17 | 676 | if sortable_heading: |
paul@35 | 677 | write_sort_control(request, columnnumber, columns, sort_columns, column_types, table_name, write=write) |
paul@7 | 678 | write(fmt.div(0)) |
paul@0 | 679 | |
paul@6 | 680 | write(fmt.table_cell(0)) |
paul@0 | 681 | |
paul@6 | 682 | write(fmt.table_row(0)) |
paul@6 | 683 | |
paul@6 | 684 | write(fmt.table(0)) |
paul@0 | 685 | |
paul@35 | 686 | def formatTableForOutputType(text, request, mimetype, attrs=None, write=None): |
paul@35 | 687 | |
paul@35 | 688 | """ |
paul@35 | 689 | Format the given 'text' using the specified 'request' for the given output |
paul@35 | 690 | 'mimetype'. |
paul@35 | 691 | |
paul@35 | 692 | The optional 'attrs' can be used to control the presentation of the table. |
paul@35 | 693 | |
paul@35 | 694 | If the 'write' parameter is specified, use it to write output; otherwise, |
paul@35 | 695 | write output using the request. |
paul@35 | 696 | """ |
paul@35 | 697 | |
paul@35 | 698 | write = write or request.write |
paul@35 | 699 | |
paul@35 | 700 | if mimetype == "text/html": |
paul@35 | 701 | write('<html>') |
paul@35 | 702 | write('<body>') |
paul@35 | 703 | fmt = request.html_formatter |
paul@35 | 704 | fmt.setPage(request.page) |
paul@35 | 705 | formatTable(text, request, fmt, attrs, write) |
paul@35 | 706 | write('</body>') |
paul@35 | 707 | write('</html>') |
paul@35 | 708 | |
paul@0 | 709 | # vim: tabstop=4 expandtab shiftwidth=4 |