Overview
Comment: | Added support for blank lines |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
f8e0755f5c84bdd58fdfa5a71d250ca5 |
User & Date: | matt on 2013-07-25 22:49:37 |
Other Links: | branch diff | manifest | tags |
Context
2013-07-25
| ||
23:31 | Moved meta data files to avoid possible future collisons in refdb check-in: 825466004b user: matt tags: dev | |
22:49 | Added support for blank lines check-in: f8e0755f5c user: matt tags: dev | |
22:36 | Added support for comments in .dat files in refdb check-in: d988af5391 user: matt tags: dev | |
Changes
Modified txtdb/nada3/Second-sheet.dat from [2888a58afa] to [6499ddd193].
1 2 3 4 5 6 7 8 9 10 11 | [2] V2 X V6 Y V8 Z V12 E V15 B V17 + [A1] V8 Z V17 = | | < | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | [2] V2 X V6 Y V8 Z V12 E V15 B V17 + [A1] V8 Z V17 = # Just a test really # V1 X V3 X V5 Y V7 Y V10 Z V11 E V13 E V14 B V16 B [3] V2 John, V6 Tom V8 Fred V17 ~ # a deeply held belief is a danger to sanity # V4 X row-11 Z row-18 B |
Modified txtdb/nada3/sxml/First_Sheet.sxml from [34674c602b] to [0a5c1f16f7].
1 2 3 4 5 6 7 8 9 10 11 12 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "8") | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "8") (http://www.gnumeric.org/v10.dtd:MaxRow "18") (http://www.gnumeric.org/v10.dtd:Zoom "1") (http://www.gnumeric.org/v10.dtd:Names (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name "Print_Area") (http://www.gnumeric.org/v10.dtd:value "#REF!") (http://www.gnumeric.org/v10.dtd:position "A1")) (http://www.gnumeric.org/v10.dtd:Name |
︙ | ︙ | |||
301 302 303 304 305 306 307 | (@ (Unit "99") (No "1") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "64.01") (No "2") (Count "7")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.64") (No "0"))) (http://www.gnumeric.org/v10.dtd:RowInfo | | > | 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 | (@ (Unit "99") (No "1") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "64.01") (No "2") (Count "7")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.64") (No "0"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "1") (Count "17"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "18")))) (http://www.gnumeric.org/v10.dtd:Selections (@ (CursorRow "3") (CursorCol "1")) (http://www.gnumeric.org/v10.dtd:Selection (@ (startRow "3") (startCol "1") (endRow "3") (endCol "1")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A2")) (http://www.gnumeric.org/v10.dtd:FreezePanes |
︙ | ︙ |
Modified txtdb/nada3/sxml/RunsToDo.sxml from [361d59f70a] to [1ed537a908].
1 2 3 4 5 6 7 8 9 10 11 12 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "3") | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "3") (http://www.gnumeric.org/v10.dtd:MaxRow "4") (http://www.gnumeric.org/v10.dtd:Zoom "1") (http://www.gnumeric.org/v10.dtd:Names (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name "Print_Area") (http://www.gnumeric.org/v10.dtd:value "#REF!") (http://www.gnumeric.org/v10.dtd:position "A1")) (http://www.gnumeric.org/v10.dtd:Name |
︙ | ︙ | |||
80 81 82 83 84 85 86 | (http://www.gnumeric.org/v10.dtd:Cols (@ (DefaultSizePts "48")) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "0") (Count "4")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.75")) (http://www.gnumeric.org/v10.dtd:RowInfo | | > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | (http://www.gnumeric.org/v10.dtd:Cols (@ (DefaultSizePts "48")) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "0") (Count "4")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.75")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "0") (Count "4"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.75") (No "4")))) (http://www.gnumeric.org/v10.dtd:Selections (@ (CursorRow "3") (CursorCol "2")) (http://www.gnumeric.org/v10.dtd:Selection (@ (startRow "3") (startCol "2") (endRow "3") (endCol "2")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1"))) (http://www.gnumeric.org/v10.dtd:Solver (@ (ProgramR "0") |
︙ | ︙ |
Modified txtdb/nada3/sxml/Second-sheet.sxml from [4909e61f10] to [6fc3539ba5].
1 2 3 4 5 6 7 8 9 10 11 12 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "3") | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "3") (http://www.gnumeric.org/v10.dtd:MaxRow "24") (http://www.gnumeric.org/v10.dtd:Zoom "1") (http://www.gnumeric.org/v10.dtd:Names (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name "Print_Area") (http://www.gnumeric.org/v10.dtd:value "#REF!") (http://www.gnumeric.org/v10.dtd:position "A1")) (http://www.gnumeric.org/v10.dtd:Name |
︙ | ︙ | |||
51 52 53 54 55 56 57 | (http://www.gnumeric.org/v10.dtd:Footer (@ (Right "") (Middle "&[page]") (Left ""))) (http://www.gnumeric.org/v10.dtd:paper "na_letter") (http://www.gnumeric.org/v10.dtd:comments "in_place") (http://www.gnumeric.org/v10.dtd:errors "as_displayed")) (http://www.gnumeric.org/v10.dtd:Styles (http://www.gnumeric.org/v10.dtd:StyleRegion | | < < < < < < < < < < < < < < < < < < < < < < < < | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | (http://www.gnumeric.org/v10.dtd:Footer (@ (Right "") (Middle "&[page]") (Left ""))) (http://www.gnumeric.org/v10.dtd:paper "na_letter") (http://www.gnumeric.org/v10.dtd:comments "in_place") (http://www.gnumeric.org/v10.dtd:errors "as_displayed")) (http://www.gnumeric.org/v10.dtd:Styles (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "0") (endRow "31") (endCol "2")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") |
︙ | ︙ | |||
123 124 125 126 127 128 129 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "256") (startCol "0") (endRow "65279") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "1") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "65280") (startCol "0") (endRow "65532") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "1") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "65533") (startCol "0") (endRow "65535") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") |
︙ | ︙ | |||
147 148 149 150 151 152 153 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion | > > > > > > > > > > > > > > > > > > > > > > > > | | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "3") (endRow "0") (endCol "3")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "1") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "28") (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "1") (startCol "3") (endRow "15") (endCol "3")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") |
︙ | ︙ | |||
171 172 173 174 175 176 177 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion | | | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "16") (startCol "3") (endRow "16") (endCol "3")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "1") (Rotation "0") (PatternColor "FFFF:FFFF:0") |
︙ | ︙ | |||
195 196 197 198 199 200 201 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion | | | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "17") (startCol "3") (endRow "31") (endCol "3")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") |
︙ | ︙ | |||
219 220 221 222 223 224 225 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion | | | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "4") (endRow "31") (endCol "7")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") |
︙ | ︙ | |||
243 244 245 246 247 248 249 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion | | < < < < < < < < < < < < < < < < < < < < < < < < | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 | (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "8") (endRow "255") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "2") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") |
︙ | ︙ | |||
301 302 303 304 305 306 307 | (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "99") (No "2") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "227.2") (No "3") (HardSize "1")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo | > > | | > | | | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 | (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "99") (No "2") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "227.2") (No "3") (HardSize "1")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "60") (No "0") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "1") (Count "17"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "18") (Count "4")))) (http://www.gnumeric.org/v10.dtd:Selections (@ (CursorRow "0") (CursorCol "3")) (http://www.gnumeric.org/v10.dtd:Selection (@ (startRow "0") (startCol "3") (endRow "0") (endCol "3")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1"))) (http://www.gnumeric.org/v10.dtd:Solver (@ (ProgramR "0") (ProblemType "0") (NonNeg "1") (ModelType "0") (MaxTime "60") (MaxIter "1000") (Discr "0") (AutoScale "0")))) |
Modified txtdb/nada3/sxml/sheets.sxml from [b435b563f6] to [e5a5a0ee72].
︙ | ︙ | |||
24 25 26 27 28 29 30 | (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:type "4") (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected") (http://www.gnumeric.org/v10.dtd:value "FALSE"))) (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2")) (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:type "4") (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected") (http://www.gnumeric.org/v10.dtd:value "FALSE"))) (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2")) (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta (http://purl.org/dc/elements/1.1/:date "2013-07-26T04:47:02Z") (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date "2013-07-26T04:46:14Z"))) (http://www.gnumeric.org/v10.dtd:Calculation (@ (MaxIterations "100") (ManualRecalc "0") (IterationTolerance "0.001") (FloatRadix "2") (FloatDigits "53") (EnableIteration "1"))) |
︙ | ︙ |
Modified txtdb/txtdb.scm from [a0d9ce564b] to [83f90390e1].
︙ | ︙ | |||
63 64 65 66 67 68 69 70 71 72 73 74 75 76 | dat))) (define (string->safe-filename str) (string-substitute (regexp " ") "_" str #t)) (define (sheet->refdb dat targdir) (let* ((comment-rx (regexp "^#CMNT\\d+\\s*")) (sheet-name (car (find-section dat 'http://www.gnumeric.org/v10.dtd:Name))) ;; (safe-name (string->safe-filename sheet-name)) (cells (find-section dat 'http://www.gnumeric.org/v10.dtd:Cells)) (remaining (remove-section (remove-section dat 'http://www.gnumeric.org/v10.dtd:Name) 'http://www.gnumeric.org/v10.dtd:Cells)) (rownums (make-hash-table)) ;; num -> name (colnums (make-hash-table)) ;; num -> name | > | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | dat))) (define (string->safe-filename str) (string-substitute (regexp " ") "_" str #t)) (define (sheet->refdb dat targdir) (let* ((comment-rx (regexp "^#CMNT\\d+\\s*")) (blank-rx (regexp "^#BLNK\\d+\\s*")) (sheet-name (car (find-section dat 'http://www.gnumeric.org/v10.dtd:Name))) ;; (safe-name (string->safe-filename sheet-name)) (cells (find-section dat 'http://www.gnumeric.org/v10.dtd:Cells)) (remaining (remove-section (remove-section dat 'http://www.gnumeric.org/v10.dtd:Name) 'http://www.gnumeric.org/v10.dtd:Cells)) (rownums (make-hash-table)) ;; num -> name (colnums (make-hash-table)) ;; num -> name |
︙ | ︙ | |||
106 107 108 109 110 111 112 | (for-each (lambda (colname) (print "[" colname "]") (for-each (lambda (row) (let ((key (car row)) (val (cadr row))) (if (string-search comment-rx key) (print val) | > > | | > | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | (for-each (lambda (colname) (print "[" colname "]") (for-each (lambda (row) (let ((key (car row)) (val (cadr row))) (if (string-search comment-rx key) (print val) (if (string-search blank-rx key) (print) (print key " " val))))) (reverse (hash-table-ref cols colname))) ;; (print) ) (sort (hash-table-keys cols)(lambda (a b) (let ((colnum-a (assoc a ref-colnums)) (colnum-b (assoc b ref-colnums))) (if (and colnum-a colnum-b) (< (cadr colnum-a)(cadr colnum-b)) (if (and (string? a) (string? b)) |
︙ | ︙ | |||
189 190 191 192 193 194 195 | (define (read-dat fname) (let ((section-rx (regexp "^\\[(.*)\\]\\s*$")) (comment-rx (regexp "^#.*")) ;; This means a cell name cannot start with # (cell-rx (regexp "^(\\S+) (.*)$")) ;; One space only for the cellname content separator (blank-rx (regexp "^\\s*$")) (inp (open-input-file fname)) | | > > > | > > | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | (define (read-dat fname) (let ((section-rx (regexp "^\\[(.*)\\]\\s*$")) (comment-rx (regexp "^#.*")) ;; This means a cell name cannot start with # (cell-rx (regexp "^(\\S+) (.*)$")) ;; One space only for the cellname content separator (blank-rx (regexp "^\\s*$")) (inp (open-input-file fname)) (cmnt-indx (make-hash-table)) (blnk-indx (make-hash-table))) (let loop ((inl (read-line inp)) (section #f) (res '())) (if (eof-object? inl) (begin (close-input-port inp) (reverse res)) (regex-case inl (comment-rx _ (let ((curr-indx (+ 1 (hash-table-ref/default cmnt-indx section 0)))) (hash-table-set! cmnt-indx section curr-indx) (loop (read-line inp) section (cons (list (conc "#CMNT" curr-indx) section inl) res)))) (blank-rx _ (let ((curr-indx (+ 1 (hash-table-ref/default blnk-indx section 0)))) (hash-table-set! blnk-indx section curr-indx) (loop (read-line inp) section (cons (list (conc "#BLNK" curr-indx) section " ") res)))) (section-rx (x sname) (loop (read-line inp) sname res)) (cell-rx (x k v) (loop (read-line inp) section (cons (list k section v) res))) (else (begin |
︙ | ︙ | |||
351 352 353 354 355 356 357 | (loop (car tal)(cdr tal))))))) #f))) ;; call with proc = car to get row names ;; call with proc = cadr to get col names (define (get-rowcol-names path sheet proc) (let ((fname (conc path "/" sheet ".dat")) | | > | > | 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | (loop (car tal)(cdr tal))))))) #f))) ;; call with proc = car to get row names ;; call with proc = cadr to get col names (define (get-rowcol-names path sheet proc) (let ((fname (conc path "/" sheet ".dat")) (cmnt-rx (regexp "^#CMNT\\d+\\s*")) (blnk-rx (regexp "^#BLNK\\d+\\s*"))) (if (file-exists? fname) (let ((dat (read-dat fname))) (if (null? dat) '() (let loop ((hed (car dat)) (tal (cdr dat)) (res '())) (let* ((row-name (proc hed)) (newres (if (and (not (member row-name res)) (not (string-search cmnt-rx row-name)) (not (string-search blnk-rx row-name))) (cons row-name res) res))) (if (null? tal) (reverse newres) (loop (car tal)(cdr tal) newres)))))) '()))) |
︙ | ︙ |