Fixed the session problem and the paths on the load/save dialog

BillTheBest · BillTheBest · Aug 11, 2017 · Aug 11, 2017 · Aug 11, 2017 · Aug 11, 2017
commit 43a460e221a3255b435c9f5366da1acd3b971230
diff --git a/saiku-core/saiku-service/src/main/java/org/saiku/repository/ClassPathRepositoryManager.java b/saiku-core/saiku-service/src/main/java/org/saiku/repository/ClassPathRepositoryManager.java
@@ -841,8 +841,8 @@ private List<IRepositoryObject> getRepoObjects(File root, List<String> fileType,
                 String relativePath = file.getPath();
                 String datadir = getDatadir();
 
-                if (relativePath.startsWith(datadir) && datadir.length() >= 3) { // If we have an absolute path
-                    relativePath = relativePath.substring(datadir.length() - 3, relativePath.length());
+                if (relativePath.startsWith(datadir) && datadir.length() >= 0) { // If we have an absolute path
+                    relativePath = relativePath.substring(datadir.length(), relativePath.length()); //Make it relative to the datadir
                 }
 
                 relativePath = relativePath.replace("\\", "/");

diff --git a/...saiku-service/src/main/java/org/saiku/service/datasource/RepositoryDatasourceManager.java b/...saiku-service/src/main/java/org/saiku/service/datasource/RepositoryDatasourceManager.java
@@ -237,11 +237,14 @@ public SaikuDatasource addDatasource(SaikuDatasource datasource) throws Exceptio
                 f = false;
             }
 
+            path = path.replace("\\", "/");
+            path = path.replaceAll("[/]+", "/");
+
             if(!path.startsWith("mondrian:")) {
                 String pathToSave = getDatadir() + path;
 
-                pathToSave.replace("\\", "/");
-                pathToSave.replaceAll("[/]+", "/");
+                pathToSave = pathToSave.replace("\\", "/");
+                pathToSave = pathToSave.replaceAll("[/]+", "/");
 
                 irm.saveInternalFile(this.getCSVJson(f, ds.getName(), pathToSave),
                     separator + "datasources" + separator + ds.getName() + "-csv.json", null);