Changeset 6009

Timestamp:

2003-11-26T15:35:02+13:00 (20 years ago)

Author:

cs025

Message:

Alterations for new collection identifiers, etc.

Location:

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

Files:

• BuildManager.java (modified) (5 diffs)
• CollectionManager.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/BuildManager.java

@@ -19 +19 @@
   List              inputRoots;
   String            outputDir;
+  String            archiveDir;
     
   public BuildManager(List inputRoots, String collection, String outputDir)
@@ -43 +44 @@
     System.out.println("Output directory set to " + this.outputDir);
 
+    this.archiveDir = this.collectionManager.getArchiveDirectory();
+
     // TODO: initialise the expanders here...
 
@@ -49 +52 @@
     RecogniserInterface recogniser = new HTMLRecogniser(docList);
     recogniserManager.addRecogniser(recogniser);
+    recogniserManager.addRecogniser(new IndexRecogniser(docList));
     recogniser = new TextRecogniser(docList);
     recogniserManager.addRecogniser(recogniser);
@@ -54 +58 @@
     // set up the extractors
     this.extractorManager  = new ExtractorManager(this.docList);
+    this.extractorManager.addExtractor(new IndexExtractor());
     
     // TODO: set up the enrichers...
@@ -81 +86 @@
     }
     this.indexerManager.indexDocuments();
+    this.extractorManager.extractDocuments();
 
-    this.docList.writeDocuments(new File(outputDir));
-    //    this.docList.writeSQLDocuments(this.collectionManager.getDatabase());
+    if (this.archiveDir != null) {
+      this.docList.writeDocuments(new File(this.archiveDir));
+      //    this.docList.writeSQLDocuments(this.collectionManager.getDatabase());
+    }
     
     this.collectionManager.setCollectionMetadata("gsdl3", "documentCount", Integer.toString(this.docList.getCount()));

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java

@@ -72 +72 @@
     }
 
+    File buildDirectory = new File(this.collectionHome, "building");
+    if (!buildDirectory.exists()) {
+      buildDirectory.mkdir();
+    }
+
+    File archiveDirectory = new File(this.collectionHome, "archives");
+    if (!archiveDirectory.exists()) {
+      archiveDirectory.mkdir();
+    }
+
     this.buildDocNo = 1;
     
@@ -138 +148 @@
 
   public String getImportDirectory()
-  { return this.collectionHome + "/import";
+  { return this.collectionHome + File.separator + "import";
   }
 
   public String getBuildDirectory()
-  { return this.collectionHome + "/building";
+  { return this.collectionHome + File.separator + "building";
+  }
+
+  public String getArchiveDirectory()
+  { return this.collectionHome + File.separator + "archives";
   }
 
@@ -206 +220 @@
     this.buildDocNo ++;
     
-    ID.append(".");
+    ID.append(":");
     ID.append(Integer.toString(value));
     return ID.toString();