Changeset 36140

Timestamp:

2022-04-12T12:15:46+12:00 (2 years ago)

Author:

kjdon

Message:

made the stemming controls be selected and enabled appropriately for solr. Also, starting work on adding sort and facets, so have adjusted the options layout

File:

• main/trunk/gli/src/org/greenstone/gatherer/cdm/IndexOptionManager.java (modified) (6 diffs)

main/trunk/gli/src/org/greenstone/gatherer/cdm/IndexOptionManager.java

@@ -144 +144 @@
         setLayout(new BorderLayout());
         //if (!build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
-        add(stem_control, BorderLayout.NORTH);
+        add(stem_control, BorderLayout.EAST);
         //}
         if (!build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
-        add(level_control, BorderLayout.CENTER);
+        add(level_control, BorderLayout.WEST);
         }
     }
@@ -176 +176 @@
         if (build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
         // changing from MG
-        add(level_control, BorderLayout.CENTER);
+        add(level_control, BorderLayout.WEST);
         }
         else if (new_build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
@@ -225 +225 @@
             
         JPanel checkbox_panel = new JPanel();
-        checkbox_panel.setLayout(new GridLayout(2, 1));
+        checkbox_panel.setLayout(new GridLayout(1, 1));
         checkbox_panel.setComponentOrientation(Dictionary.getOrientation());
-            
+            // todo, remove one of these panels
         JPanel stem_panel = new JPanel();
-        stem_panel.setLayout(new GridLayout(1,3));
+        stem_panel.setLayout(new GridLayout(4,1));
         stem_panel.add(stem_checkbox);
         stem_panel.add(casefold_checkbox);
         stem_panel.add(accentfold_checkbox);
+        stem_panel.add(separate_cjk_checkbox);
         stem_panel.setComponentOrientation(Dictionary.getOrientation());
             
-        JPanel other_panel = new JPanel();
-        other_panel.setLayout(new GridLayout(1,1));
-        other_panel.add(separate_cjk_checkbox);
-            other_panel.setComponentOrientation(Dictionary.getOrientation());                    
+        // JPanel other_panel = new JPanel();
+        // other_panel.setLayout(new GridLayout(1,1));
+        // other_panel.add(separate_cjk_checkbox);
+            // other_panel.setComponentOrientation(Dictionary.getOrientation());   
+        
             
         checkbox_panel.add(stem_panel);
-        checkbox_panel.add(other_panel);
+        //checkbox_panel.add(other_panel);
             
             JLabel tmp = new JLabel(Dictionary.get("CDM.IndexingManager.Options"));
             tmp.setComponentOrientation(Dictionary.getOrientation());
-        add(tmp, BorderLayout.LINE_START);
+        add(tmp, BorderLayout.NORTH);
         add(checkbox_panel, BorderLayout.CENTER);
 
         // set the defaults
-        if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
+        if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)|| build_type.equals(BuildTypeManager.BUILD_TYPE_SOLR)) {
         stem_checkbox.setSelected(false);
         stem_checkbox.setEnabled(false);
@@ -304 +306 @@
         accentfold_checkbox.setSelected(true);
         options_model.addOption(StaticStrings.ACCENTFOLD_OPTION_STR);
-        if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
-            // was lucene
+        if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE) || build_type.equals(BuildTypeManager.BUILD_TYPE_SOLR)) {
+            // was lucene/solr
             stem_checkbox.setEnabled(true);
             stem_checkbox.setSelected(true);
@@ -320 +322 @@
         options_model.removeOption(StaticStrings.ACCENTFOLD_OPTION_STR);
     
-        if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
+        if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE) || build_type.equals(BuildTypeManager.BUILD_TYPE_SOLR)) {
             // was lucene
             stem_checkbox.setEnabled(true);
@@ -331 +333 @@
        
         }
-        if (new_build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
+        if (new_build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE) || new_build_type.equals(BuildTypeManager.BUILD_TYPE_SOLR)) {
         accentfold_checkbox.setSelected(true);
         accentfold_checkbox.setEnabled(false);