Merge pull request #69 from openpreserve/fix/schema-publication

FIX: Schema versioning and publication
openpreserve · May 10, 2023 · 303844d · 303844d
2 parents 62cdec9 + dbd5eb3
commit 303844d
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 13 deletions.
diff --git a/docs/_data/par.yml b/docs/_data/par.yml
@@ -0,0 +1 @@
+version: 1.2
diff --git a/docs/_layouts/forward.html b/docs/_layouts/forward.html
@@ -4,22 +4,15 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     {% assign time = 0 %}
-    {% assign targetname = page.target %}
+    {% assign redirect_target = "/schema/" | append: site.data.par.version | append: page.target %}
 
     {% if page.time %}
     {% assign time = page.time %}
     {% endif %}
 
-    {% if page.targetname %}
-    {% assign targetname = page.targetname %}
-    {% endif %}
-
-    {% capture title %}Redirecting to {{ targetname }}{% endcapture %}
-    {% if page.targettitle %}
-    {% assign title = page.targettitle %}
-    {% endif %}
-    <meta http-equiv="refresh" content="{{ time }};url={{ page.target }}"/>
-    <link rel="canonical" href="{{ page.target }}"/>
+    {% capture title %}Redirecting to {{ redirect_target }}{% endcapture %}
+    <meta http-equiv="refresh" content="{{ time }};url={{ redirect_target }}"/>
+    <link rel="canonical" href="{{ redirect_target }}"/>
     <title>{{ title }}</title>
     <style>
         body {
@@ -38,7 +31,7 @@ <h1>{{ title }}</h1>
     <p>This document has moved!</p>
     {% endif %}
 
-    <p>Redirecting to <a href="{{ page.target }}">{{ targetname }}</a> in {{ time }} seconds.</p>
+    <p>Redirecting to <a href="{{ redirect_target }}">{{ redirect_target }}</a> in {{ time }} seconds.</p>
 
 </body>
 </html>
diff --git a/docs/schema/1.0/tools.json → docs/schema/1.0/tool.json b/docs/schema/1.0/tools.json → docs/schema/1.0/tool.json
diff --git a/docs/schema/1.1/tools.json → docs/schema/1.1/tool.json b/docs/schema/1.1/tools.json → docs/schema/1.1/tool.json
diff --git a/docs/schema/business-rule.json/index.md b/docs/schema/business-rule.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /business-rule.json
+---
diff --git a/docs/schema/format.json/index.md b/docs/schema/format.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /format.json
+---
diff --git a/docs/schema/index.md b/docs/schema/index.md
@@ -1,4 +1,4 @@
 ---
 layout: forward
-target: ./1.2
+target: /schema/{{ site.data.par.version }}/types.json
 ---
diff --git a/docs/schema/par-property.json/index.md b/docs/schema/par-property.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /par-property.json
+---
diff --git a/docs/schema/preservation-action-type.json/index.md b/docs/schema/preservation-action-type.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /preservation-action-type.json
+---
diff --git a/docs/schema/preservation-action.json/index.md b/docs/schema/preservation-action.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /preservation-action.json
+---
diff --git a/docs/schema/representation-format.json/index.md b/docs/schema/representation-format.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /representation-format.json
+---
diff --git a/docs/schema/tool.json/index.md b/docs/schema/tool.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /tools.json
+---
diff --git a/docs/schema/types.json/index.md b/docs/schema/types.json/index.md
@@ -0,0 +1,4 @@
+---
+layout: forward
+target: /types.json
+---