Overview
Comment: | Moved meta data files to avoid possible future collisons in refdb |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
825466004be914e5187be80b73de1fc4 |
User & Date: | matt on 2013-07-25 23:31:23 |
Other Links: | branch diff | manifest | tags |
Context
2013-07-25
| ||
23:57 | Added create on edit for refdb check-in: 7571d597a5 user: matt tags: dev | |
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 | |
Changes
Added txtdb/nada3/sxml/_sheets.sxml version [e5a5a0ee72].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | ((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation "http://www.gnumeric.org/v9.xsd")) (http://www.gnumeric.org/v10.dtd:Version (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1"))) (http://www.gnumeric.org/v10.dtd:Attributes (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:type "4") (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_horizontal_scrollbar") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:type "4") (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_vertical_scrollbar") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:type "4") (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:type "4") (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (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"))) (http://www.gnumeric.org/v10.dtd:SheetNameIndex (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "First_Sheet") (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "Second-sheet") (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "RunsToDo") (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "RunsToLock")) (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647"))) (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "1")))) |
Added txtdb/nada3/sxml/_workbook.sxml version [96ffb7f9d5].
> | 1 | (*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")) |
Deleted txtdb/nada3/sxml/sheets.sxml version [e5a5a0ee72].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted txtdb/nada3/sxml/workbook.sxml version [96ffb7f9d5].
|
| < |
Modified txtdb/txtdb.scm from [83f90390e1] to [5c0719a88a].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | (use ssax) (use sxml-serializer) (use sxml-modifications) (use regex) (use srfi-69) (use regex-case) (use posix) ;; Read a non-compressed gnumeric file (define (refdb:read-gnumeric-xml fname) (with-input-from-file fname (lambda () (ssax:xml->sxml (current-input-port) '())))) | > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | (use ssax) (use sxml-serializer) (use sxml-modifications) (use regex) (use srfi-69) (use regex-case) (use posix) (use json) (use csv) ;; Read a non-compressed gnumeric file (define (refdb:read-gnumeric-xml fname) (with-input-from-file fname (lambda () (ssax:xml->sxml (current-input-port) '())))) |
︙ | ︙ | |||
151 152 153 154 155 156 157 | (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->refdb sheet targdir)) sheets))) | | | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | (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->refdb 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 |
︙ | ︙ | |||
262 263 264 265 266 267 268 | (list 'http://www.gnumeric.org/v10.dtd:Cell (list '@ val-type (list 'Row (conc row-num)) (list 'Col (conc col-num))) value))) (append rowdat coldat dat)))))) (define (refdb->sxml dbdir) (let* ((sht-names (read-file (conc dbdir "/sheet-names.cfg") read-line)) | | | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | (list 'http://www.gnumeric.org/v10.dtd:Cell (list '@ val-type (list 'Row (conc row-num)) (list 'Col (conc col-num))) value))) (append rowdat coldat dat)))))) (define (refdb->sxml dbdir) (let* ((sht-names (read-file (conc dbdir "/sheet-names.cfg") read-line)) (wrk-rem (file->sxml (conc dbdir "/sxml/_workbook.sxml"))) (sht-rem (file->sxml (conc dbdir "/sxml/_sheets.sxml"))) (sheets (fold (lambda (sheetname res) (let* ((sheetdat (read-dat (conc dbdir "/" sheetname ".dat"))) (cells (dat->cells sheetdat)) (sht-meta (file->sxml (conc dbdir "/sxml/" sheetname ".sxml")))) (cons (cons (car sht-meta) (append (cons (list 'http://www.gnumeric.org/v10.dtd:Name sheetname) (cdr sht-meta)) |
︙ | ︙ | |||
389 390 391 392 393 394 395 396 397 398 399 400 401 402 | ;; (if (file-exists? fname) ;; (let ((dat (read-dat fname))) ;; (if (null? dat) ;; #f ;; (map cadr dat)))))) (define (edit-refdb path) (let* ((dbname (pathname-strip-directory path)) (tmpf (conc (create-temporary-file dbname) ".gnumeric"))) (if (file-exists? (conc path "/sheet-names.cfg")) (refdb-export path tmpf)) (let ((pid (process-run "gnumeric" (list tmpf)))) (process-wait pid) (import-gnumeric-file tmpf path)))) | > > > > > > > > > > | 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 | ;; (if (file-exists? fname) ;; (let ((dat (read-dat fname))) ;; (if (null? dat) ;; #f ;; (map cadr dat)))))) (define (edit-refdb path) ;; TEMPORARY, REMOVE IN 2014 (if (not (file-exists? (conc path "/sxml/_sheets.sxml"))) (begin (print "ERROR: You appear to have the old file structure for txtdb. Please do the following and try again.") (print) (print "mv " path "/sxml/sheets.sxml " path "/sxml/_sheets.sxml") (print "mv " path "/sxml/workbook.sxml " path "/sxml/_workbook.sxml") (print) (print "Don't forget to remove the old files from your revision control system and add the new.") (exit))) (let* ((dbname (pathname-strip-directory path)) (tmpf (conc (create-temporary-file dbname) ".gnumeric"))) (if (file-exists? (conc path "/sheet-names.cfg")) (refdb-export path tmpf)) (let ((pid (process-run "gnumeric" (list tmpf)))) (process-wait pid) (import-gnumeric-file tmpf path)))) |
︙ | ︙ | |||
434 435 436 437 438 439 440 441 442 443 444 445 446 447 | (prog (car args)) (rema (cdr args))) (cond ((null? rema)(print help)) ((>= (length rema) 2) (apply process-action (car rema)(cdr rema))) (else (print help))))) (main) #| (define x (refdb:read-gnumeric-xml "testdata-stripped.xml")) | > > > > > > > > > > > > > > > > > | 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | (prog (car args)) (rema (cdr args))) (cond ((null? rema)(print help)) ((>= (length rema) 2) (apply process-action (car rema)(cdr rema))) (else (print help))))) ;;====================================================================== ;; C R E A T E N E W D B S ;;====================================================================== (include "txtdb/metadat.scm") ;; Creates a new db at path with one sheet (define (create-new-db path) (create-directory path #t) (create-directory (conc path "/sxml") #t)) ;; Sheet1.dat ;; sheet-names.cfg ;; sxml/Sheet1.sxml ;; sxml/_sheets.sxml ;; sxml/_workbook.sxml (main) #| (define x (refdb:read-gnumeric-xml "testdata-stripped.xml")) |
︙ | ︙ |