Overview
Comment: | Oops. Went down a messy road. Snapshot this point in time. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
bdf18ad3a8566d6774b38394182ebe10 |
User & Date: | matt on 2013-07-14 14:39:37 |
Other Links: | branch diff | manifest | tags |
Context
2013-07-14
| ||
16:25 | Closer check-in: cc4d262224 user: matt tags: dev | |
14:39 | Oops. Went down a messy road. Snapshot this point in time. check-in: bdf18ad3a8 user: matt tags: dev | |
13:31 | read-dat for txtdb completed check-in: eb02e8c328 user: matt tags: dev | |
Changes
Modified txtdb/txtdb.scm from [5922499bd8] to [6cd63ce3c8].
︙ | ︙ | |||
110 111 112 113 114 115 116 | (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)) (string< a b)))))))))) | | | | > > > > < | | > > | 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 162 163 164 165 166 167 | (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)) (string< a b)))))))))) (with-output-to-file (conc targdir "/sxml/" sheet-name ".sxml") (lambda () (pp remaining))) sheet-name)) (define (sxml->file dat fname) (with-output-to-file fname (lambda () ;; (print (sxml-serializer#serialize-sxml dat)) (pp dat)))) ;; Write an sxml gnumeric workbook to a txtdb directory structure. ;; (define (extract-txtdb dat targdir) (create-directory (conc targdir "/sxml") #t) (let* ((wrkbk (find-section dat 'http://www.gnumeric.org/v10.dtd:Workbook)) (wrk-rem (remove-section dat 'http://www.gnumeric.org/v10.dtd:Workbook)) (sheets (find-section wrkbk 'http://www.gnumeric.org/v10.dtd:Sheets)) (sht-rem (remove-section wrkbk 'http://www.gnumeric.org/v10.dtd:Sheets)) (sheet-names (map (lambda (sheet) (sheet->txtdb sheet targdir)) sheets))) (sxml->file wrk-rem (conc targdir "/sxml/workbook.sxml")) (sxml->file sht-rem (conc targdir "/sxml/sheets.sxml")) (with-output-to-file (conc targdir "/sheet-names.cfg") (lambda () (map print sheet-names))))) (define (read-gnumeric-file fname) (if (not (string-match (regexp ".*.gnumeric$") fname)) (begin (print "ERROR: Attempt to import gnumeric file with extention other than .gnumeric") (exit)) (let ((tmpf (create-temporary-file (pathname-strip-directory fname)))) (system (conc " gunzip > " tmpf " < " fname)) (let ((res (txtdb:read-gnumeric-xml tmpf))) (delete-file tmpf) res)))) (define (import-gnumeric-file fname targdir) (extract-txtdb (read-gnumeric-file fname) targdir)) ;; Write a gnumeric compressed xml spreadsheet from a txtdb directory structure. ;; (define (txtdb-export dbdir fname) (let ((sxml-dat (txtdb->sxml dbdir)) (tmpf (create-temporary-file (pathname-strip-directory fname)))) (with-output-to-file tmpf (lambda () (print (sxml-serializer#serialize-sxml sxml-dat)))) (system (conc "gzip " tmpf)) |
︙ | ︙ | |||
188 189 190 191 192 193 194 | res)) (cell-rx (x k v) (loop (read-line inp) section (cons (list section k v) res))) (else (begin (print "ERROR: Unrecognised line in input file " fname ", ignoring it") (loop (read-line inp) section res)))))))) | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | res)) (cell-rx (x k v) (loop (read-line inp) section (cons (list section k v) res))) (else (begin (print "ERROR: Unrecognised line in input file " fname ", ignoring it") (loop (read-line inp) section res)))))))) (define (get-value-type val expressions) (cond ((string->number val) '(ValueType "40")) ((equal? (substring val 0 1) "=") (let ((exid (hash-table-ref/default expressions val))) (if exid (list 'ExprID exid) (let* ((values (hash-table-keys expressions)) ;; note, values are the id numbers (new-max (+ 1 (if (null? values) 0 (apply max values))))) (hash-table-set! expressions val new-max) (list 'ExprID new-max))))) (else '(ValueType "60")))) (define (dat->cells dat) (let* ((indx (common:sparse-list-generate-index dat)) (row-indx (car indx)) (col-indx (cadr indx)) (exprs (make-hash-table))) (map (lambda (item) (let* ((row-name (car item)) (col-name (cadr item)) (row-num (cadr (assoc row-name row-indx))) (col-num (cadr (assoc col-name col-indx))) (value (caddr item)) (val-type (get-value-type value exprs))) (list 'http://www.gnumeric.org/v10.dtd:Cell (list '@ val-type (list 'Row (conc row-num)) (list 'Col (conc col-num))) value))) dat))) (define (txtdb->sxml dbdir) (let* ((sht-names (read-file (conc dbdir "/sheet-names.cfg") read-line)) (wrk-rem (read-file (conc dbdir "/sxml/workbook.sxml") read-line)) (sht-rem (read-file (conc dbdir "/sxml/sheets.sxml") read-line)) (sheets (fold (lambda (sheetname res) (let* ((sheetdat (read-dat (conc dbdir "/" sheetname ".dat"))) (cells (dat->cells sheetdat)) (sht-meta (txtdb:read-gnumeric-xml (conc dbdir "/sxml/" sheetname ".sxml")))) (cons (cons sht-meta cells) res))) '() sht-names))) (append wrk-rem (list sheets)))) ;; (define ( ;; ;; optional apply proc to rownum colnum value ;; ;; NB// If a change is made to this routine please look also at applying ;; it to the code in Megatest (http://www.kiatoa.com/fossils/megatest) ;; in the file common.scm ;; (define (common:sparse-list-generate-index data #!key (proc #f)) (if (null? data) (list '() '()) (let loop ((hed (car data)) (tal (cdr data)) (rownames '()) (colnames '()) (rownum 0) (colnum 0)) (let* ((rowkey (car hed)) (colkey (cadr hed)) (value (caddr hed)) (existing-rowdat (assoc rowkey rownames)) (existing-coldat (assoc colkey colnames)) (curr-rownum (if existing-rowdat rownum (+ rownum 1))) (curr-colnum (if existing-coldat colnum (+ colnum 1))) (new-rownames (if existing-rowdat rownames (cons (list rowkey curr-rownum) rownames))) (new-colnames (if existing-coldat colnames (cons (list colkey curr-colnum) colnames)))) ;; (debug:print-info 0 "Processing record: " hed ) (if proc (proc curr-rownum curr-colnum rowkey colkey value)) (if (null? tal) (list new-rownames new-colnames) (loop (car tal) (cdr tal) new-rownames new-colnames (if (> curr-rownum rownum) curr-rownum rownum) (if (> curr-colnum colnum) curr-colnum colnum) )))))) #| (define x (txtdb:read-gnumeric-xml "testdata-stripped.xml")) ;; Write out sxml |
︙ | ︙ |