hdoc-tools 0.7.8 → 0.7.10

package/hdoc-build.js

@@ -104,11 +104,11 @@
 
         // Copy files from book into _work-docId folder
         try {
-            fs.copySync(path.join(source_path, docId), path.join(work_path, docId));
-            fs.copyFileSync(path.join(source_path, 'hdocbook-project.json'), path.join(work_path, 'hdocbook-project.json'));
-            fs.copyFileSync(path.join(source_path, 'LICENSE'), path.join(work_path, 'LICENSE'));
-            fs.copyFileSync(path.join(source_path, 'README.md'), path.join(work_path, 'README.md'));
-            fs.copyFileSync(path.join(source_path, 'package.json'), path.join(work_path, 'package.json'));
+            fs.copySync(path.join(source_path, docId), path.join(work_path));
+            //fs.copyFileSync(path.join(source_path, 'hdocbook-project.json'), path.join(work_path, 'hdocbook-project.json'));
+            //fs.copyFileSync(path.join(source_path, 'LICENSE'), path.join(work_path, 'LICENSE'));
+            //fs.copyFileSync(path.join(source_path, 'README.md'), path.join(work_path, 'README.md'));
+            //fs.copyFileSync(path.join(source_path, 'package.json'), path.join(work_path, 'package.json'));
         } catch (e) {
             console.error('Error copying from source_path:\r\n', e);
             process.exit(1);

package/hdoc-serve.js

@@ -112,7 +112,7 @@
 
       function expand_variables(text) {
          // For debug mode our base path is our root??
-         text = text.replaceAll('{{BASE_PATH}}', '/' + docId);
+         text = text.replaceAll('{{DOC_ID}}', docId);
          text = text.replaceAll('{{BUILD_NUMBER}}', '0');
 
          let build_date = new Date().toISOString();
@@ -329,26 +329,6 @@
       // Catch all
       app.get('/*', function (req, res) {
 
-         let segs = req.url.split('/');
-
-         if (segs.length > 3 && segs[2] == 'content') {
-            // In this case we are looking for static content within the book
-
-            // Create the file path
-            let url = req.url.replace('/content/', '/');
-            let file_path = path.join(source_path, url);
-
-            // If the file exists, send it.
-            if (fs.existsSync(file_path) == true) {
-               send_file(req, res, file_path);
-               return;
-            }
-
-            // All else fails, we have not file to return, so return a 404 error here
-            send_content_resource_404(req, res);
-            return;
-         }
-
          let ui_file_path = path.join(ui_path, req.url);
 
          console.log('URL Root:', req.url);
@@ -376,6 +356,13 @@
 
          console.log('Server listening at http://127.0.0.1:%s', port);
          console.log('Document source path is: ' + source_path);
+
+         let _vars = ['{{DOC_ID}}', '{{BASE_PATH}}', '{{BUILD_NUMBER}}', '{{BUILD_DATE}}'];
+         console.log("Server Vars:");
+         for(let x = 0; x < _vars.length; x++) {
+            let name = _vars[x];
+            console.log("   ", name, " = ",  expand_variables(name));
+         }
       });
 
    };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Hornbill Docs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.