From 879c9ca873722bb22a6487c5486ebef5f10be68f Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Tue, 6 Aug 2019 19:53:10 +0200
Subject: [PATCH] improved file hierarchy
---
README.md | 2 +-
corpus/exampleTEI.xml | 1 -
schema/{legacy => resource}/eoa-tei-strict.rnc | 0
schema/resource/exampleTEI.xml | 1 +
scripts/rnc_to_analysis.sh | 2 +-
scripts/updateOutput.sh | 5 +++--
6 files changed, 6 insertions(+), 5 deletions(-)
delete mode 120000 corpus/exampleTEI.xml
rename schema/{legacy => resource}/eoa-tei-strict.rnc (100%)
create mode 120000 schema/resource/exampleTEI.xml
diff --git a/README.md b/README.md
index 527d75c..aec958c 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ XML file to a PDF. This is currently incomplete and not maintained.
# Information for Developers
-The final ODD is the result of a process that involves multiple steps and depends on the following input files:
+The final ODD is the result of a process that involves multiple steps and depends on the following input files in `./schema/resource/`:
- the TEI example publication
- a schema in RelaxNG Compact syntax
diff --git a/corpus/exampleTEI.xml b/corpus/exampleTEI.xml
deleted file mode 120000
index 14e58de..0000000
--- a/corpus/exampleTEI.xml
+++ /dev/null
@@ -1 +0,0 @@
-../examples/tei/exampleTEI.xml
\ No newline at end of file
diff --git a/schema/legacy/eoa-tei-strict.rnc b/schema/resource/eoa-tei-strict.rnc
similarity index 100%
rename from schema/legacy/eoa-tei-strict.rnc
rename to schema/resource/eoa-tei-strict.rnc
diff --git a/schema/resource/exampleTEI.xml b/schema/resource/exampleTEI.xml
new file mode 120000
index 0000000..2a6da4b
--- /dev/null
+++ b/schema/resource/exampleTEI.xml
@@ -0,0 +1 @@
+../../examples/tei/exampleTEI.xml
\ No newline at end of file
diff --git a/scripts/rnc_to_analysis.sh b/scripts/rnc_to_analysis.sh
index db4737f..a6f0249 100755
--- a/scripts/rnc_to_analysis.sh
+++ b/scripts/rnc_to_analysis.sh
@@ -8,7 +8,7 @@ SCRIPT_DIR=$(dirname $0)
# variables
#######################################
-input="$BASE_DIR/schema/legacy/eoa-tei-strict.rnc"
+input="$BASE_DIR/schema/resource/eoa-tei-strict.rnc"
output_dir="$BASE_DIR/schema/legacy/generated/analysis"
verbosity="2"
debug_modules=()
diff --git a/scripts/updateOutput.sh b/scripts/updateOutput.sh
index ffbd7b6..4fa812c 100755
--- a/scripts/updateOutput.sh
+++ b/scripts/updateOutput.sh
@@ -61,10 +61,11 @@ echo "##########################################"
echo "create ODD from corpus..."
$SCRIPT_DIR/example2odd.sh \
- --input-dir "$BASE_DIR/corpus" \
+ --input-dir "$BASE_DIR/schema/resource" \
--output-dir "$INTERMEDIATE_DIR/s1/odd" \
--combinations 'all' \
- --suffix '.odd'
+ --suffix '.odd' \
+ '*.xml'
$SCRIPT_DIR/apply_odd.sh \
--input-dir "$INTERMEDIATE_DIR/s0/odd_compiled/p5subset.xml" \