linny-r 1.1.11 → 1.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linny-r",
-  "version": "1.1.11",
+  "version": "1.1.12",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {

package/server.js

@@ -1236,13 +1236,13 @@ function serveStaticFile(res, path) {
   if(path.startsWith('/diagrams/')) {
     // Serve diagrams from the (main)/user/diagrams/ sub-directory 
     logAction('Diagram: ' + path);
-    path = '/user' + path; 
+    path = WORKING_DIRECTORY + '/user' + path;
   } else {
     // Other files from the (main)/static/ subdirectory
     logAction('Static file: ' + path);
-    path = '/static' + path;
+    path = MODULE_DIRECTORY + '/static' + path;
   }
-  fs.readFile(MODULE_DIRECTORY + path, (err, data) => {
+  fs.readFile(path, (err, data) => {
       if(err) {
         console.log(err);
         res.writeHead(404);

package/static/scripts/linny-r-model.js

@@ -171,7 +171,10 @@ class LinnyRModel {
   get legacyVersion() {
     // Return TRUE if the model as it has been loaded was not saved by
     // JavaScript Linny-R
-    return this.version.indexOf('JS-') < 0;
+    const
+        vnl = this.version.split('.'),
+        legacy = vnl[0] === '0' || (vnl[0] === '1' && vnl.length > 3);
+    return legacy;
   }
   
   get newProcessCode() {
@@ -7188,11 +7191,14 @@ class Link {
     this.relative_rate.text = xmlDecoded(
         nodeContentByTag(node, 'relative-rate'));
     this.flow_delay.text = xmlDecoded(nodeContentByTag(node, 'delay'));
-    // NOTE: default share-of-cost for links in legacy Linny-R was 100%;
-    //       this is dysfunctional in JS Linny-R => set to 0 if equal to 1
     this.share_of_cost = safeStrToFloat(
         nodeContentByTag(node, 'share-of-cost'), 0);
-    if(MODEL.legacyVersion && this.share_of_cost == 1) this.share_of_cost = 0;
+    if(MODEL.legacyVersion) {
+    // NOTE: default share-of-cost for links in legacy Linny-R was 100%;
+    //       this is dysfunctional in JS Linny-R => set to 0 if equal to 1
+      this.flow_delay.text = '0';
+      if(this.share_of_cost == 1) this.share_of_cost = 0;
+    }
     this.comments = xmlDecoded(nodeContentByTag(node, 'notes'));
     if(IO_CONTEXT) {
       // Record that this link was included