Changeset 29485 in project

Timestamp:

08/03/13 09:20:20 (6 years ago)

Author:

Ivan Raikov

Message:

nemo: added ability to load sxslt files

Location:

release/4/nemo/trunk

Files:

• examples/Golgi/Golgi_DeSouza10.nemo (modified) (1 diff)
• nemo-version.scm (modified) (1 diff)
• nemo.scm (modified) (3 diffs)

release/4/nemo/trunk/examples/Golgi/Golgi_DeSouza10.nemo

@@ -2110 +2110 @@
         nseg = 1 
 
-{% with diam = default(diam, 1), L = default(L, 1), celsius = default(celsius, 23) %}
+{% with diam = default(diam, 5.65), L = default(L, 5.65), celsius = default(celsius, 23) %}
         diam = {{diam}}
         L = {{L}} 

release/4/nemo/trunk/nemo-version.scm

@@ -1 +1 @@
 
-(define nemo-version 8.29)
+(define nemo-version "8.30")

release/4/nemo/trunk/nemo.scm

@@ -1262 +1262 @@
 
 (define (ncml->model-decls options doc)
-  (let* ((parse-expr    (or (lookup-def 'parse-expr options) identity))
+
+  (define (load-ss in)
+    (eval `(begin
+             ,@sxslt-preamble
+             (sxml:make-ss ,@(read in))
+             )))
+
+  (define (make-ss-fname dirname fname) 
+    (or (and dirname (make-pathname dirname fname)) fname))
+
+  (let* ((source-path   (lookup-def 'source-path options))
+         (dirname       (pathname-directory source-path))
+         (parse-expr    (or (lookup-def 'parse-expr options) identity))
          (ncml:model    ((lambda (x) 
                            (if (null? x) (error 'ncml->model "ncml:model element not found in input document") (car x)))
@@ -1275 +1287 @@
                                 (let ((ss (map 
                                            (lambda (x)
-                                             (call-with-input-string (sxml:text x)
-                                               (lambda (in) (eval `(begin
-                                                                     ,@sxslt-preamble
-                                                                     (sxml:make-ss ,@(read in))
-                                                                     ))
-                                                       )))
+                                             (let ((fn (sxml:attr x 'filename)))
+                                               (or (and fn (call-with-input-file (make-ss-fname dirname fn) load-ss))
+                                                   (call-with-input-string (sxml:text x) load-ss))
+                                               ))
                                            ncml-ss)))
                                   (fold (lambda (s doc) (stx:apply-templates doc s doc (list))) doc ss))
@@ -1973 +1983 @@
                               ((sxml xml ixml)     (ncml->model-decls 
                                                     `((parse-expr . ,parse-expr)
-                                                      (debug . ,(opt 'debug) ))
+                                                      (debug . ,(opt 'debug) )
+                                                      (source-path . ,operand)
+                                                      )
                                                     (car doc.iexpr)))
                               ((sexp nemo)         (sexp->model-decls (car doc.iexpr)))