Overview
| Comment: | Added ability to specify config file |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | stml2 |
| Files: | files | file ages | folders |
| SHA1: |
e954e3db422e3f3bcd8ca19023e4134d |
| User & Date: | matt on 2018-09-08 23:04:33 |
| Other Links: | branch diff | manifest | tags |
Context
|
2018-09-09
| ||
| 01:19 | converted vector to defstruct check-in: 605397d08c user: matt tags: stml2 | |
|
2018-09-08
| ||
| 23:04 | Added ability to specify config file check-in: e954e3db42 user: matt tags: stml2 | |
| 20:07 | All moved into stml1 module and it compiles/installs. check-in: 77e7733590 user: matt tags: stml2 | |
Changes
Modified stml2.scm from [4d2e64aa27] to [23503f7143].
| ︙ | ︙ | |||
1522 1523 1524 1525 1526 1527 1528 | (define (session:set-shared! vec varname val) (hash-table-set! (vector-ref vec 33) varname val)) ;; The global session (define s:session (make-sdat)) ;; SPLIT INTO STRAIGHT FORWARD INIT AND COMPLEX INIT | | | 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 | (define (session:set-shared! vec varname val) (hash-table-set! (vector-ref vec 33) varname val)) ;; The global session (define s:session (make-sdat)) ;; SPLIT INTO STRAIGHT FORWARD INIT AND COMPLEX INIT (define (session:initialize self #!optional (configf #f)) (sdat-set-dbtype! self 'pg) (sdat-set-page! self "home") ;; these are defaults (sdat-set-curr-page! self "home") (sdat-set-content-type! self "Content-type: text/html; charset=iso-8859-1\n\n") (sdat-set-page-type! self 'html) (sdat-set-toppage! self "index") (sdat-set-params! self '()) ;; |
| ︙ | ︙ | |||
1552 1553 1554 1555 1556 1557 1558 | (sdat-set-globalvars! self (make-hash-table)) (sdat-set-pagevars-before! self (make-hash-table)) (sdat-set-sessionvars-before! self (make-hash-table)) (sdat-set-globalvars-before! self (make-hash-table)) (sdat-set-domain! self "locahost") ;; end of defaults (sdat-set-script! self #f) (sdat-set-force-ssl! self #f) | | | 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 | (sdat-set-globalvars! self (make-hash-table)) (sdat-set-pagevars-before! self (make-hash-table)) (sdat-set-sessionvars-before! self (make-hash-table)) (sdat-set-globalvars-before! self (make-hash-table)) (sdat-set-domain! self "locahost") ;; end of defaults (sdat-set-script! self #f) (sdat-set-force-ssl! self #f) (let* ((rawconfigdat (session:read-config self configf)) (configdat (if rawconfigdat (eval rawconfigdat) '())) (sroot (s:find-param 'sroot configdat)) (logfile (s:find-param 'logfile configdat)) (dbtype (s:find-param 'dbtype configdat)) (dbinit (s:find-param 'dbinit configdat)) (domain (s:find-param 'domain configdat)) (twikidir (s:find-param 'twikidir configdat)) |
| ︙ | ︙ | |||
1970 1971 1972 1973 1974 1975 1976 | conn (s:sqlparam ins-query session-id page key master-value))) (else (err:log "Shouldn't get here"))))) all-keys))) ;; process all keys (list "*sessionvars*" "*globalvars*" page-name)))))) ;; (pg:sql-null-object? element) | | | | 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 |
conn
(s:sqlparam ins-query session-id page key master-value)))
(else (err:log "Shouldn't get here")))))
all-keys))) ;; process all keys
(list "*sessionvars*" "*globalvars*" page-name))))))
;; (pg:sql-null-object? element)
(define (session:read-config self #!optional (fname #f))
(let* ((cgi-path (pathname-directory (car (argv))))
(name (or fname (string-append (if cgi-path (conc cgi-path "/") "") "." (pathname-file (car (argv))) ".config"))))
(if (not (file-exists? name))
(print name " not found at " (current-directory))
(let* ((fp (open-input-file name))
(initargs (read fp)))
(close-input-port fp)
initargs))))
|
| ︙ | ︙ |