From c6367f836fecac61d89a1e007884d01681edc060 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 15 Oct 2020 16:22:34 +0200
Subject: [PATCH] Schemas Multi Project

---
 WebServer/AppLoader.js    |  3 ---
 WebServer/AppPreLoader.js |  2 +-
 webServer.js              | 47 +++++++++++++++------------------------
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/WebServer/AppLoader.js b/WebServer/AppLoader.js
index 5688d1e36..623533f42 100644
--- a/WebServer/AppLoader.js
+++ b/WebServer/AppLoader.js
@@ -27,9 +27,6 @@ function newAppLoader() {
 
                 'Globals.js',
 
-                'AppSchema.js',
-                'DocSchema.js',
-                'ConceptSchema.js',
                 'Workspace.js',
 
                 'ChartingSpace/EdgeEditor.js',
diff --git a/WebServer/AppPreLoader.js b/WebServer/AppPreLoader.js
index 07238ef7b..71bb33daf 100644
--- a/WebServer/AppPreLoader.js
+++ b/WebServer/AppPreLoader.js
@@ -120,7 +120,7 @@ function loadSuperalgos() {
     }
 }
 
-function callServer(pContentToSend, pPath, callBackFunction) {
+function callWebServer(pContentToSend, pPath, callBackFunction) {
     let xhttp = new XMLHttpRequest();
     xhttp.onreadystatechange = function () {
         if (this.readyState === 4 && this.status === 200) {
diff --git a/webServer.js b/webServer.js
index 08f29149a..27a4ceb34 100644
--- a/webServer.js
+++ b/webServer.js
@@ -318,7 +318,6 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
                     }
 
                     path = unescape(path)
-                    console.log('Serving Icon at: ' + path)
                     respondWithImage(path, response)
                 }
                 break
@@ -463,10 +462,22 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
                 }
                 break
 
+            case 'ProjectNames':
+                {
+                    let projects = getDirectories(process.env.PROJECTS_PATH)
+                    respondWithContent(JSON.stringify(projects), response)
+                }
+                break
+
+            case 'Schema':
+                {
+                    sendSchema(process.env.PROJECTS_PATH + '/' + requestParameters[2] + '/Schemas/', requestParameters[3] + '.json')
+                }
+                break
+
             case 'IconNames':
                 {
                     let projects = getDirectories(process.env.PROJECTS_PATH)
-                    console.log(projects)
                     const fs = require('fs')
 
                     let icons = []
@@ -479,15 +490,13 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
                         const folder = process.env.PROJECTS_PATH + '/' + project + '/Icons/'
 
                         fs.readdir(folder, (err, files) => {
-                            console.log(files)
                             for (let j = 0; j < files.length; j++) {
                                 let file = files[j]
                                 icons.push([project, file])
                             }
-                            
+
                             projectCounter++
                             if (projectCounter === totalProjects) {
-                                console.log(icons)
                                 respondWithContent(JSON.stringify(icons), response)
                             }
                         })
@@ -531,25 +540,6 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
                     })
                 }
                 break
-
-            case 'AppSchema.js':
-                {
-                    sendSchema(process.env.PROJECTS_PATH + '/Superalgos/Schemas/', 'AppSchema', 'getAppSchema')
-                }
-                break
-
-            case 'DocSchema.js':
-                {
-                    sendSchema(process.env.PROJECTS_PATH + '/Superalgos/Schemas/', 'DocSchema', 'getDocSchema')
-                }
-                break
-
-            case 'ConceptSchema.js':
-                {
-                    sendSchema(process.env.PROJECTS_PATH + '/Superalgos/Schemas/', 'ConceptSchema', 'getConceptSchema')
-                }
-                break
-
             case 'Workspace.js':
                 {
                     let fs = require('fs')
@@ -745,11 +735,11 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
                 }
         }
 
-        function sendSchema(filePath, fileName, functionName) {
+        function sendSchema(filePath, fileName) {
             let fs = require('fs')
 
             try {
-                filePath = filePath + fileName + '.json'
+                filePath = filePath + fileName  
                 fs.readFile(filePath, onFileRead)
             } catch (e) {
                 console.log('[ERROR] Error reading the ' + fileName, e)
@@ -758,9 +748,8 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
             function onFileRead(err, schema) {
                 if (err) {
                     respondWithContent(undefined, response)
-                } else {
-                    let responseContent = 'function ' + functionName + '(){ return ' + schema + '}'
-                    respondWithContent(responseContent, response)
+                } else { 
+                    respondWithContent(schema, response)
                 }
             }
         }