Use GETOPT for the command line scripts #326: setting MIXED as the de…

…fault Solr field type - previously the index script set it
pkiraly · Nov 10, 2023 · e822753 · e822753
1 parent f023a89
commit e822753
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/solr-functions b/solr-functions
@@ -181,10 +181,11 @@ purge_and_exit() {
 }
 
 store_fields() {
-  SOLR_DB_URL=$1
+  SOLR_URL=$1
   OUTPUT_DIR=$2
   echo "Store fields into ${OUTPUT_DIR}/solr-fields.json"
-  curl -s "${SOLR_DB_URL}/admin/luke?wt=json" \
+  echo "curl -s \"${SOLR_URL}/admin/luke?wt=json\" | jq '.fields | keys_unsorted'"
+  curl -s "${SOLR_URL}/admin/luke?wt=json" \
     | jq '.fields | keys_unsorted' \
     > $OUTPUT_DIR/solr-fields.json
 }

diff --git a/src/main/java/de/gwdg/metadataqa/marc/cli/parameters/MarcToSolrParameters.java b/src/main/java/de/gwdg/metadataqa/marc/cli/parameters/MarcToSolrParameters.java
@@ -10,7 +10,7 @@ public class MarcToSolrParameters extends CommonParameters {
   private boolean useEmbedded = false;
   private String solrUrl = null;
   private boolean doCommit = false;
-  private SolrFieldType solrFieldType = SolrFieldType.MARC;
+  private SolrFieldType solrFieldType = SolrFieldType.MIXED;
   private SolrClient mainClient = null;
   private SolrClient validationClient = null;
   private boolean indexWithTokenizedField = false;

diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/parameters/MarcToSolrParametersTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/parameters/MarcToSolrParametersTest.java
@@ -27,7 +27,7 @@ public void testDefaults() {
       assertNull(parameters.getSolrUrl());
       assertFalse(parameters.doCommit());
       assertNotNull(parameters.getSolrFieldType());
-      assertEquals(SolrFieldType.MARC, parameters.getSolrFieldType());
+      assertEquals(SolrFieldType.MIXED, parameters.getSolrFieldType());
     } catch (ParseException e) {
       e.printStackTrace();
     }