Changeset 15787 for greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

Timestamp:

2008-05-29T13:29:54+12:00 (16 years ago)

Author:

oranfry

Message:

updating from trunk: brought in trunk changes from r15191 to r15785

File:

• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (3 diffs)

greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

@@ -75 +75 @@
 
     protected static final String DEFAULT_LEVEL_ELEM = "defaultLevel";
-    protected static final String DEFAULT_GDBM_LEVEL_ELEM = "defaultGDBMLevel";
+    protected static final String DEFAULT_DB_LEVEL_ELEM = "defaultDBLevel";
     protected static final String LEVEL_ELEM = "level";
     protected static final String FIELD_ATT = "field";
@@ -90 +90 @@
    // the default level for searching
     protected String default_level=null;
-    // default level for gdbm db
-    protected String default_gdbm_level = null;
+    // default level for collection db
+    protected String default_db_level = null;
     // which search services will we offer??
     protected boolean plain_search = false;
@@ -162 +162 @@
     }
 
-    // Get the default GDBM level
-    def = (Element) GSXML.getChildByTagName(info, DEFAULT_GDBM_LEVEL_ELEM);
+    // Get the default DB level
+    def = (Element) GSXML.getChildByTagName(info, DEFAULT_DB_LEVEL_ELEM);
     if (def != null) {
-        this.default_gdbm_level = def.getAttribute(GSXML.SHORTNAME_ATT);
-    }
-    if (this.default_gdbm_level == null || this.default_gdbm_level.equals("")) {
-        logger.error("default gdbm level not specified!, assuming Sec");
-        this.default_gdbm_level = "Sec";
+        this.default_db_level = def.getAttribute(GSXML.SHORTNAME_ATT);
+    }
+    if (this.default_db_level == null || this.default_db_level.equals("")) {
+        logger.error("default database level (defaultDBLevel) not specified!, assuming Sec");
+        this.default_db_level = "Sec";
     }