Skip to content

Commit

Permalink
Rename XML files from schema_dv_cmb_XXX.xml to schema_dv_mdb_XXX.xml.
Browse files Browse the repository at this point in the history 
Relates to IQSS#6142.
  • Loading branch information
@poikilotherm
poikilotherm committed Sep 11, 2019
1 parent 886dc8d commit 4889887
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions conf/solr/7.3.1/schema.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>

<!-- Dynamic Dataverse fields from http://localhost:8080/api/admin/index/solr/schema -->
<xi:include href="schema_dv_cmb_fields.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="schema_dv_mdb_fields.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

<copyField source="description" dest="_text_" maxChars="3000"/>

Expand Down Expand Up @@ -279,7 +279,7 @@
<!-- <copyField source="*_i" dest="_text_" maxChars="3000"/> -->

<!-- Dataverse copyField from http://localhost:8080/api/admin/index/solr/schema -->
<xi:include href="schema_dv_cmb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="schema_dv_mdb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

<!-- End: Dataverse Specific -->

Expand Down
0 conf/solr/7.3.1/schema_dv_cmb_copies.xml → conf/solr/7.3.1/schema_dv_mdb_copies.xml
View file
File renamed without changes.
0 conf/solr/7.3.1/schema_dv_cmb_fields.xml → conf/solr/7.3.1/schema_dv_mdb_fields.xml
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions conf/solr/7.3.1/updateSchemaMDB.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ curl -f -sS "${DATAVERSE_URL}/api/admin/index/solr/schema${UNBLOCK_KEY}" > $TMPF
echo "Splitting up based on \"---\" marker"
csplit -f"$TMPFILE" --suppress-matched -s $TMPFILE "/---/" '{*}'

echo "Writing ${TARGET}/schema_dv_cmb_fields.xml"
echo "<fields>" > ${TARGET}/schema_dv_cmb_fields.xml
cat ${TMPFILE}00 >> ${TARGET}/schema_dv_cmb_fields.xml
echo "</fields>" >> ${TARGET}/schema_dv_cmb_fields.xml
echo "Writing ${TARGET}/schema_dv_mdb_fields.xml"
echo "<fields>" > ${TARGET}/schema_dv_mdb_fields.xml
cat ${TMPFILE}00 >> ${TARGET}/schema_dv_mdb_fields.xml
echo "</fields>" >> ${TARGET}/schema_dv_mdb_fields.xml

echo "Writing ${TARGET}/schema_dv_cmb_copies.xml"
echo "<schema>" > ${TARGET}/schema_dv_cmb_copies.xml
cat ${TMPFILE}01 >> ${TARGET}/schema_dv_cmb_copies.xml
echo "</schema>" >> ${TARGET}/schema_dv_cmb_copies.xml
echo "Writing ${TARGET}/schema_dv_mdb_copies.xml"
echo "<schema>" > ${TARGET}/schema_dv_mdb_copies.xml
cat ${TMPFILE}01 >> ${TARGET}/schema_dv_mdb_copies.xml
echo "</schema>" >> ${TARGET}/schema_dv_mdb_copies.xml

rm ${TMPFILE}*

Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx-guides/source/developers/dev-environment.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ To install Solr, execute the following commands:

``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema.xml``

``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_cmb_fields.xml``
``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_fields.xml``

``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_cmb_copies.xml``
``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_copies.xml``

``mv schema*.xml collection1/conf``

Expand Down
4 changes: 2 additions & 2 deletions scripts/installer/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ API_SCRIPTS=${INSTALLER_ZIP_DIR}/setup-datasetfields.sh ${INSTALLER_ZIP_DIR}/set
DB_SCRIPT=${INSTALLER_ZIP_DIR}/reference_data.sql
JHOVE_CONFIG=${INSTALLER_ZIP_DIR}/jhove.conf
JHOVE_SCHEMA=${INSTALLER_ZIP_DIR}/jhoveConfig.xsd
SOLR_SCHEMA=${INSTALLER_ZIP_DIR}/schema.xml ${INSTALLER_ZIP_DIR}/schema_dv_cmb_fields.xml ${INSTALLER_ZIP_DIR}/schema_dv_cmb_copies.xml ${INSTALLER_ZIP_DIR}/updateSchemaMDB.sh
SOLR_SCHEMA=${INSTALLER_ZIP_DIR}/schema.xml ${INSTALLER_ZIP_DIR}/schema_dv_mdb_fields.xml ${INSTALLER_ZIP_DIR}/schema_dv_mdb_copies.xml ${INSTALLER_ZIP_DIR}/updateSchemaMDB.sh
SOLR_CONFIG=${INSTALLER_ZIP_DIR}/solrconfig.xml
INSTALL_SCRIPT=${INSTALLER_ZIP_DIR}/install

Expand Down Expand Up @@ -70,7 +70,7 @@ ${JHOVE_SCHEMA}: ../../conf/jhove/jhoveConfig.xsd
@mkdir -p ${INSTALLER_ZIP_DIR}
/bin/cp ../../conf/jhove/jhoveConfig.xsd ${INSTALLER_ZIP_DIR}

${SOLR_SCHEMA}: ../../conf/solr/7.3.1/schema.xml ../../conf/solr/7.3.1/schema_dv_cmb_fields.xml ../../conf/solr/7.3.1/schema_dv_cmb_copies.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh
${SOLR_SCHEMA}: ../../conf/solr/7.3.1/schema.xml ../../conf/solr/7.3.1/schema_dv_mdb_fields.xml ../../conf/solr/7.3.1/schema_dv_mdb_copies.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh
@echo copying Solr schema file
@mkdir -p ${INSTALLER_ZIP_DIR}
/bin/cp ../../conf/solr/7.3.1/schema*.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh ${INSTALLER_ZIP_DIR}
Expand Down

0 comments on commit 4889887

Please sign in to comment.