Changeset 6736

Timestamp:

2004-02-05T12:05:50+13:00 (19 years ago)

Author:

cs025

Message:

Added factory method, abstract indexer. Also modified Manager and
Interface to support naming of indexers, and MG and MGPP altered
accordingly.

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers

Files:

• AbstractIndexer.java (added)
• IndexerFactory.java (added)
• IndexerInterface.java (modified) (1 diff)
• MGIndexer.java (modified) (10 diffs)
• MGPPIndexer.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/IndexerInterface.java

@@ -12 +12 @@
   public static final String GS2_INDEX_LABEL = "Index";  
 
+  public String  getIndexType();
+  public String  getName();
+  public int     getNumberOfPasses();
+  // TODO: add a function call to provide appropriate XML for the service description
+  public void    tidyup();
+
   public boolean configure(String label, String value);
-  public boolean addIndex(String level, String field);
+  public boolean configure(org.w3c.dom.Node node);
+  public boolean addIndex(String name, String level, String field);
+
   public boolean startPass(int passNumber);
   public boolean indexDocument(DocumentID id, DocumentInterface document);
   public boolean endPass(int passNumber);
-  public void    tidyup();
-  public int getNumberOfPasses();
+
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGIndexer.java

@@ -18 +18 @@
 import org.greenstone.gsdl3.gs3build.xpointer.XPointer;
 
-public class MGIndexer implements IndexerInterface
+public class MGIndexer extends AbstractIndexer
 { 
   int          pass;
@@ -37 +37 @@
   String       level;
   String       field;
+  String       name;
 
   static final char END_OF_DOCUMENT = (char) 2;
@@ -42 +43 @@
   static final char END_OF_STREAM   = (char) 4;
 
+  public static final String MG_INDEX_TYPE = "mg";
+
   class MGIndex
-  { String level;
+  { String name;
+    String level;
     String field;
 
-    public MGIndex(String level, String field)
-    { this.level = level;
+    public MGIndex(String name, String level, String field)
+    { this.name  = name;
+      this.level = level;
       this.field = field;
     }
@@ -55 +60 @@
     
       if (colonAt >= 0)
-      { field = indexLabel.substring(colonAt+1);
-        level = indexLabel.substring(0, colonAt);
-      }
+      { this.field = indexLabel.substring(colonAt+1);
+        this.level = indexLabel.substring(0, colonAt);
+      }
+      this.name = null;
     }
 
@@ -67 +73 @@
     { return this.field;
     }
-  }
-
-  public MGIndexer()
+
+    public String getName()
+    { return this.name;
+    }
+  }
+
+  public MGIndexer(String name)
   { this.indexes = new ArrayList();
+    this.name    = name;
+  }
+
+  public String getIndexType()
+  { return MG_INDEX_TYPE;
+  } 
+
+  public String getName()
+  { return this.name;
   }
 
@@ -131 +150 @@
   }
 
-  public boolean addIndex(String level, String field)
+  public boolean addIndex(String name, String level, String field)
   {
-    MGIndex index = new MGIndex(level, field);
+    MGIndex index = new MGIndex(name, level, field);
     this.indexes.add(index);
     return true;
@@ -160 +179 @@
     }
 
-    descriptive.setMetadata("gsdl3", "mgseqno", indexName + "." + Integer.toString(this.sectionSeqNo));
+    descriptive.addMetadata("gsdl3", "mgseqno", indexName + "." + Integer.toString(this.sectionSeqNo));
     metsDoc.setModified(true);
     //  System.out.println("Assigning " + this.sectionSeqNo + " to " + metsDoc.getID() + " " + division.getLabel());
@@ -269 +288 @@
   public boolean indexDocument(DocumentID docID, DocumentInterface document)
   {
+    if (this.pass == 0) {
+      document.removeAllMetadata("gsdl3", "mgseqno");
+    }
+
     if (!this.firstDocument)
     { // Send a 'CTRL-B' before the document itself
@@ -280 +303 @@
       }
     }
+
     String docText = null;
 
@@ -421 +445 @@
     this.level = index.getLevel();
     this.field = index.getField();
-    this.indexName = this.getIndexDirectory(index.getLevel(), index.getField());
+    this.indexName = index.getName();
+    if (this.indexName == null || this.indexName.length() == 0) {
+      this.indexName = this.getIndexDirectory(index.getLevel(), index.getField());
+    }
     this.indexStem = this.outputDirectory + File.separatorChar + 
       this.indexName + File.separatorChar + "index"; // TODO: modify for index

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGPPIndexer.java

@@ -8 +8 @@
 import java.io.IOException;
 
-public class MGPPIndexer implements IndexerInterface
+public class MGPPIndexer extends AbstractIndexer
 { 
   int          pass;
+  String       name;
   boolean      firstDocument;
   String       outputDirectory;
@@ -19 +20 @@
   Process      mgpp_passes;
   static final String documentSeparator = "<Document>";
+
+  public static final String MGPP_INDEX_TYPE = "mgpp";
   
-  public MGPPIndexer()
-  { 
+  public MGPPIndexer(String name)
+  { this.name = name;
+  }
+
+  public String getName()
+  { return this.name;
   }
 
@@ -38 +45 @@
   }
 
-  public boolean addIndex(String level, String field)
+  public String getIndexType()
+  { return MGPP_INDEX_TYPE;
+  }
+
+  public boolean addIndex(String name, String level, String field)
   { return true;
   }