Convert COHORT to the correct WDK model dir and properly set in model-config.xml

Author: ryanrdoherty

Model/config/SiteSearchData/model-config.xml.tmpl

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<modelConfig modelName="$COHORT/siteSearchModel"
+<modelConfig modelName="$MODEL_DIR/siteSearchModel"
              webServiceUrl="local"
              smtpServer="127.0.0.1"
              supportEmail=""

dockerfiles/entrypoint.sh

@@ -10,14 +10,18 @@
 # which leads us to this exception, where we set the COHORT var if PROJECT_ID
 # is EupathDB
 
-if [ "${PROJECT_ID}" = "EuPathDB" ]
-then
-    export COHORT=Portal
-fi
+export MODEL_DIR=$COHORT
+
+# expect COHORT to be ApiCommon|ClinEpi|Microbiome|OrthoMCL
+
+#if [ "${PROJECT_ID}" = "EuPathDB" ]
+#then
+#    export MODEL_LOCATION=Portal
+#fi
 
-if [ "${PROJECT_ID}" = "ClinEpiDB" ]
+if [ "${COHORT}" = "ClinEpi" ]
 then
-    export COHORT=EDA
+    export MODEL_DIR=EDA
 fi
 
 if [ ! -f ${GUS_HOME}/config/SiteSearchData/model-config.xml ];