Changeset 22970 for main

Timestamp:

2010-09-27T14:12:13+13:00 (14 years ago)

Author:

sjm84

Message:

Added the ability to change the database type between GDBM, JDBM and SQLite

Location:

main/trunk/gli

Files:

• classes/dictionary.properties (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/ClassifierManager.java (modified) (6 diffs)
• src/org/greenstone/gatherer/cdm/CollectCfgReadWrite.java (modified) (4 diffs)
• src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java (modified) (4 diffs)
• src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/CollectionDesignManager.java (modified) (2 diffs)
• src/org/greenstone/gatherer/cdm/DatabaseTypeManager.java (added)
• src/org/greenstone/gatherer/util/StaticStrings.java (modified) (2 diffs)

main/trunk/gli/classes/dictionary.properties

@@ -99 +99 @@
 CDM.ClassifierManager.Remove:Remove Classifier
 CDM.ClassifierManager.Remove_Tooltip:Remove the selected classifier from the list
+CDM.DatabaseTypeManager.Change:Change...
+CDM.DatabaseTypeManager.Change_Tooltip:Change the type of database used by this collection
+CDM.DatabaseTypeManager.Current_Type:Database in use: {0}
+CDM.DatabaseTypeManager.Title:Select the Database
+CDM.DatabaseTypeManager.gdbm:GDBM
+CDM.DatabaseTypeManager.gdbm_Description: GDBM (or GNU Database Manager) is a simple flat-file database engine which Greenstone uses as the default database for new collections.
+CDM.DatabaseTypeManager.jdbm:JDBM
+CDM.DatabaseTypeManager.jdbm_Description: JDBM (or Java Database Manager) is essentially a Java implementation of GDBM. Consider using this database engine combined with the Lucene indexer if you are wanting to create a pure Java run-time.
+CDM.DatabaseTypeManager.sqlite:SQLITE
+CDM.DatabaseTypeManager.sqlite_Description: SQLite is a simple relational database engine. It can be used in Greenstone to provide experimental advanced searching features that are not possible with the other database engines. To enable these features add "sqlform" to the list of SearchTypes in the Format Features section of the Format tab. 
 CDM.FormatManager.Add:Add Format
 CDM.FormatManager.Add_Tooltip:Add the specified format command 

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

@@ -57 +57 @@
 public class ClassifierManager
 extends DOMProxyListModel {
+
+    private DatabaseTypeManager database_type_manager = null;
+    private String database_type = null;
+
     /** The controls for editing the contents of this manager. */
     private Control controls = null;
@@ -71 +75 @@
         this.model = this;
         DebugStream.println ("ClassifierManager: " + getSize () + " classifiers parsed.");
+
+    database_type_manager = new DatabaseTypeManager();
+    database_type = database_type_manager.getDatabaseType();
         
         // Force the assigned classifiers to be loaded and cached now
@@ -269 +276 @@
     private class ClassifierControl
     extends JPanel
-    implements Control {
+    implements Control, DatabaseTypeManager.DatabaseTypeListener {
         /** A combobox containing all of the known classifiers, including those that may have already been assigned. */
         private JComboBox classifier_combobox = null;
@@ -281 +288 @@
         /** Button to remove the selected classifier. */
         private JButton remove = null;
+
+    private JPanel database_type_panel = (JPanel)database_type_manager.getControls();
         
         /** A list of assigned classifiers. */
@@ -404 +413 @@
             central_pane.setBorder (BorderFactory.createEmptyBorder (5,0,0,0));
             central_pane.setLayout (new BorderLayout ());
+            central_pane.add (database_type_panel, BorderLayout.NORTH);
             central_pane.add (classifier_list_pane, BorderLayout.CENTER);
             central_pane.add (temp, BorderLayout.SOUTH);
@@ -430 +440 @@
         }
         
+
+    public void databaseTypeChanged(String new_database_type)
+    {
+        if(database_type.equals(new_database_type)){
+        return;
+        }
+        database_type = new_database_type;
+    }
         
         private class AddListener

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

@@ -97 +97 @@
       return metadataToString (command_element); 
     }
+    else if (command_element_name.equals (StaticStrings.DATABASETYPE_ELEMENT)) {
+    return metadataToString (command_element); 
+    } 
     else if(command_element_name.equals (StaticStrings.PLUGIN_ELEMENT)) {
       return pluginToString (command_element);
@@ -335 +338 @@
     String name_str = command_element.getAttribute (StaticStrings.NAME_ATTRIBUTE);
     // If the name is one of the special four, we don't write the collectionmeta first. Note maintainer and buildtype are singled out for 'prittying' reasons.
-    if(name_str.equals (StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR)|| name_str.equals (StaticStrings.BUILDTYPE_STR) ) {
+    if(name_str.equals (StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR)|| name_str.equals (StaticStrings.BUILDTYPE_STR) || name_str.equals (StaticStrings.DATABASETYPE_STR)) {
       text.append (name_str);
       text.append (StaticStrings.TAB_CHARACTER);
@@ -578 +581 @@
         command_element = parseMetadata (tokenizer, document); // Revised to handle multiple lines
       }
-      if(command_element == null && (command_type.equals (StaticStrings.COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals (StaticStrings.COLLECTIONMETADATA_CREATOR_STR) || command_type.equals (StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR) || command_type.equals (StaticStrings.BUILDTYPE_STR))) {
+      if(command_element == null && (command_type.equals (StaticStrings.COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals (StaticStrings.COLLECTIONMETADATA_CREATOR_STR) || command_type.equals (StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR) || command_type.equals (StaticStrings.BUILDTYPE_STR) || command_type.equals (StaticStrings.DATABASETYPE_STR))) {
         command_element = parseMetadataSpecial (command_str, document);
         // pre 2.71 hack
@@ -1025 +1028 @@
     else if (name_str.equals (StaticStrings.BUILDTYPE_STR)) {
       command_element = document.createElement (StaticStrings.BUILDTYPE_ELEMENT);
+    }
+    else if (name_str.equals (StaticStrings.DATABASETYPE_STR)) {
+      command_element = document.createElement (StaticStrings.DATABASETYPE_ELEMENT);
     }
     if(command_element != null) {

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

@@ -991 +991 @@
     return element;
   }
+ 
+  static private Element doDatabaseType (Document to, String att_value) {
+        
+    //construct 'DatabaseType' element
+    Element element = to.createElement (StaticStrings.DATABASETYPE_ELEMENT);
+    element.setAttribute (StaticStrings.NAME_ATTRIBUTE, StaticStrings.DATABASETYPE_STR);
+    element.setAttribute (StaticStrings.LANGUAGE_ATTRIBUTE, StaticStrings.ENGLISH_LANGUAGE_STR);
+    element.setAttribute (StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+    element.setAttribute (StaticStrings.SPECIAL_ATTRIBUTE, StaticStrings.TRUE_STR);
+
+    XMLTools.setNodeText (element, att_value);
+        
+    return element;
+  }
     
   // Convert 'description', 'smallicon' etc.
@@ -1315 +1329 @@
     search.setAttribute (StaticStrings.TYPE_ATTRIBUTE, indexer);
     to.getDocumentElement ().appendChild (search);
+  }
+  static private void convertDatabaseType (Document from, Document to) {
+    Element e = XMLTools.getNamedElement (from.getDocumentElement (),
+                      StaticStrings.DATABASETYPE_ELEMENT,
+                      StaticStrings.NAME_ATTRIBUTE, StaticStrings.DATABASETYPE_STR);
+    if (e == null) {
+      return;
+    }
+    String db = XMLTools.getNodeText (e);
+    Element dbtype = to.createElement (StaticStrings.INFODB_STR);
+    dbtype.setAttribute (StaticStrings.TYPE_ATTRIBUTE, db);
+    to.getDocumentElement ().appendChild (dbtype);
   }
   static private void convertDefaultIndex (Document from, Document to, Element search) {
@@ -1957 +1983 @@
       appendArrayList (toElement, is_public);
     }
+
+    Node databaseNode = XMLTools.getChildByTagNameIndexed (fromElement, StaticStrings.INFODB_STR, 0);
+    String databasetype_value = ((Element)databaseNode).getAttribute (StaticStrings.TYPE_ATTRIBUTE);
+    Element databasetype = doDatabaseType(dOc, databasetype_value);
+    appendProperly (toElement, databasetype);
         
     Node searchNode = XMLTools.getChildByTagNameIndexed (fromElement, StaticStrings.SEARCH_STR, 0);
@@ -2058 +2089 @@
     convertDisplayItemList (dOc, skeleton);
     convertBuildType (dOc, skeleton);
+    convertDatabaseType (dOc, skeleton);
     convertIndex (dOc, skeleton);
     convertPlugin (dOc, skeleton);//also do the plugout element

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

@@ -314 +314 @@
     return element;
         
+  }  
+
+public Element getDatabaseType () {
+    Element element = getOrCreateElementByTagName (StaticStrings.DATABASETYPE_ELEMENT, null, null);
+    element.setAttribute (StaticStrings.NAME_ATTRIBUTE, StaticStrings.DATABASETYPE_STR);
+    element.setAttribute (StaticStrings.SPECIAL_ATTRIBUTE, StaticStrings.TRUE_STR);
+    return element;
+        
   }
     

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

@@ -49 +49 @@
     static public DesignChangeListener all_change_listener;
     static public DesignChangeListener buildcol_change_listener;
+    static public DesignChangeListener databasecol_change_listener;
     /** A list of classifiers to use at build time. */
     static public ClassifierManager classifier_manager;
@@ -108 +109 @@
     all_change_listener = new DesignChangeListener(ALL);
     buildcol_change_listener = new DesignChangeListener(BUILDCOL);
+    databasecol_change_listener = new DesignChangeListener(BUILDCOL);
+    
     // Parse the collection configuration
     collect_config = new CollectionConfiguration(collect_config_file);

main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -84 +84 @@
     static final public String CONTENT_ATTRIBUTE = "content";
     static final public String CONTENT_ELEMENT = "content";
+    static final public String DATABASETYPE_ELEMENT = "infodbtype";
+    static final public String DATABASETYPE_STR = "infodbtype";
     static final public String DATELIST_CLASSIFIER = "DateList";
     static final public String DEBUG_ARGUMENT = "-debug";
@@ -151 +153 @@
     static final public String INDEXOPTIONS_STR = "indexoptions";
     static final public String INDEXOPTION_DEFAULT_ELEMENT = "DefaultIndexOption";
+    static final public String INFODB_STR = "infodb";
     static final public String INT_STR = "int";
     static final public String IMPORT_STR = "import";