Changeset 38154

Timestamp:

2023-09-18T14:46:05+12:00 (8 months ago)

Author:

kjdon

Message:

moved sidx and didx to static strings

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service

Files:

• GS2LuceneSearch.java (modified) (3 diffs)
• SharedSoleneGS2FieldSearch.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.java

@@ -193 +193 @@
         String indexdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar + "index" + File.separatorChar;
 
-        String index = "didx";
+        String index = DOCUMENT_INDEX;
         if (this.default_level.toUpperCase().equals("SEC")) {
-          index = "sidx";
+          index = SECTION_INDEX;
         }
         String physical_index_language_name = null;
@@ -250 +250 @@
                 if (value.toUpperCase().equals("SEC"))
                 {
-                    index = "sidx";
+                    index = SECTION_INDEX;
                 }
                 else
                 {
-                    index = "didx";
+                    index = DOCUMENT_INDEX;
                 }
             }
@@ -280 +280 @@
         lucene_src.setEndResults(end_results);
 
-        if (index.equals("sidx") || index.equals("didx"))
+        if (index.equals(SECTION_INDEX) || index.equals(DOCUMENT_INDEX))
         {
             if (physical_sub_index_name != null)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java

@@ -42 +42 @@
   protected static final String DEFAULT_SORT_ELEM = "defaultSort";
 
+    protected static final String SECTION_INDEX = "sidx";
+    protected static final String DOCUMENT_INDEX = "didx";
+    
   static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.SharedSoleneGS2FieldSearch.class.getName());