BASEURI file can now contain Json to specify the base URI for multiple branches

Author: retog

README.md

@@ -4,12 +4,18 @@ Create a linked data site serving RDF data from files in a GitHub repository. Fo
 
 ## How to use it?
 
-- Add a BASEURI file to the root of your repo with the base URI of your data
+- Add a BASEURI file to the root of your repo with the base URI of your data (see below)
 - Start an instance of  PSPS
 - Add a webhook in Github notifying `http(s)://<your-host>/webhook` with the set webhook secret (see below)
 - Add RDF data to your repository
 - To customize the (client-side) rendering of the resource add a `renderes.ttl`file to the root of your repository. See the [RDF2h-Documentation](https://rdf2h.github.io/rdf2h-documentation/) to learn how the rendering works
 
+### Specifying base URI
+
+The file BASEURI in the root of the repository can either directly contain the base URI for the branch containg the file or a JSON object with branch names as keys and base URIs as values.
+Having such a JSON is handy as it allows to have staging branches with proposed modifications differing from the main branch only in the proposed change and not also in the BASEURI file.
+
+
 ## Building
 
     docker-compose build

src/main/java/com/factsmission/psps/RepositoryProcessor.java

@@ -172,6 +172,26 @@ private void processTree(String treeURLString) throws IOException, ParseExceptio
         IRI constructFileBaseIRI(String path) {
             return new IRI(baseIRI.getUnicodeString() + path);
         }
+        
+        private IRI getBaseIRI(URL baseUrlFile) throws IOException, ParseException {
+            if (baseUrlFile != null) {
+                try ( InputStream baseUrlStream = getAuthenticatedStream(baseUrlFile);  BufferedReader stuffJsonReader = new BufferedReader(new InputStreamReader(baseUrlStream, "utf-8"))) {
+                    JSONParser jsonParser = new JSONParser();
+                    Object obj = jsonParser.parse(stuffJsonReader);
+                    JSONObject jsonObject = (JSONObject) obj;
+                    String contentBase64 = (String) jsonObject.get("content");
+                    String content = new String(Base64.getMimeDecoder().decode(contentBase64), "UTF-8");
+                    if (content.trim().charAt(0) == '{') {
+                        JSONObject contentObject = (JSONObject) jsonParser.parse(content);
+                        return new IRI((String) contentObject.get(branch));
+                    } else {
+                        return new IRI(content.trim());
+                    }
+                }
+            } else {
+                return getDefaultBaseIRI();
+            }
+        }
 
     }
 
@@ -227,22 +247,6 @@ private void processRepository() throws IOException, ParseException {
         }
     }
 
-    
-
-    private IRI getBaseIRI(URL baseUrlFile) throws IOException, ParseException {
-        if (baseUrlFile != null) {
-            try ( InputStream baseUrlStream = getAuthenticatedStream(baseUrlFile);  BufferedReader stuffJsonReader = new BufferedReader(new InputStreamReader(baseUrlStream, "utf-8"))) {
-                JSONParser jsonParser = new JSONParser();
-                Object obj = jsonParser.parse(stuffJsonReader);
-                JSONObject jsonObject = (JSONObject) obj;
-                String contentBase64 = (String) jsonObject.get("content");
-                String content = new String(Base64.getMimeDecoder().decode(contentBase64));
-                return new IRI(content.trim());
-            }
-        } else {
-            return getDefaultBaseIRI();
-        }
-    }
 
     private IRI getDefaultBaseIRI() {
         return new IRI("https://raw.githubusercontent.com/" + repository + "/master/");