Changeset 5283

Timestamp:

2003-08-27T10:46:37+12:00 (21 years ago)

Author:

jmt12

Message:

Added the -ignore_file flag to allow a single output document to be generated

File:

• trunk/gli/src/org/greenstone/gatherer/util/Generator.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/util/Generator.java

@@ -57 +57 @@
 public class Generator {
 
+    private boolean ignore_file;
     private FileOutputStream file_output_stream = null;
-
     private TemplateManager template_manager = null;
 
-    public Generator(File test_file, File template_file) {
-    template_manager = new TemplateManager(template_file);
+    public Generator(File test_file, File template_file, boolean ignore_file) {
+    this.ignore_file = ignore_file;
+    this.template_manager = new TemplateManager(template_file);
     File files[] = null;
     // If test_file is a file, goody.
@@ -114 +115 @@
     System.out.println("Rapid repeated HTML generation tool.");
     System.out.println("  written by John Thompson, 2002\n");
+    boolean ignore_file = false;
     boolean usage = false;
     // Attempt to generate html from text
-    if(args.length == 2) {
+    if(2 <= args.length && args.length <= 3) {
         File text_file = new File(args[0]);
         File template_file = new File(args[1]);
+        if(args.length == 3) {
+        if(args[2].equals("-ignore_file")) {
+            ignore_file = true;
+        }
+        }
         if(!text_file.exists() || !template_file.exists() || !template_file.isFile()) {
         usage = true;
         }
         else {
-        Generator generator = new Generator(text_file, template_file);
+        Generator generator = new Generator(text_file, template_file, ignore_file);
         generator.exit();
         }
@@ -132 +139 @@
     // Print usage message
     if(usage) {
-        System.out.println("Usage: GenHelp <text_file> <template_file>");
+        System.out.println("Usage: Generator <text_file> <template_file> [-ignore_file]");
         System.out.println("text_file     - A file containing text marked up using special tags.");
         System.out.println("template_file - An HTML file using tags to specify where to insert text.");
+        System.out.println("-ignore_file  - Instructs generator to ignore $FILE tags, thus generating a single output document.");
     }
     }
@@ -256 +264 @@
             // The first case to consider is a file open command tag. This tells us the next block of html should be written to a certain file.
             if(line.startsWith("<$FILE")) {
-            // Close any existing output file.
-            if(output_file != null) {
-                // Write any existing block
-                if(block != null) {
-                if(paragraph != null) {
-                    block.insert(paragraph.toString());
-                    paragraph = null;
+            // If we have been asked to ignore file tags, then thats what we do.
+            if(ignore_file) {
+                done = true;
+            }
+            else {
+                // Close any existing output file.
+                if(output_file != null) {
+                // Write any existing block
+                if(block != null) {
+                    if(paragraph != null) {
+                    block.insert(paragraph.toString());
+                    paragraph = null;
+                    }
+                    out("  write: " + block.getName());
+                    output_file.write((block.toString()).getBytes());
+                    block = null;
                 }
-                out("  write: " + block.getName());
-                output_file.write((block.toString()).getBytes());
-                block = null;
-                }
-                output_file.close();
-                output_file = null;
-            }
-            // Determine the new file name.
-            String name = line.substring(12, line.lastIndexOf(">"));
-            // Create new file.
-            output_file = new FileOutputStream(name);
-            // Dealt with
-            out("  writing to: " + name);
-            name = null;
-            done = true;
+                // Write the file footer
+                output_file.write((template_manager.getHTMLBlock("FILE_FOOTER")).toString().getBytes());
+
+                output_file.close();
+                output_file = null;
+                }
+                // Determine the new file name.
+                String name = line.substring(12, line.lastIndexOf(">"));
+                // Create new file.
+                output_file = new FileOutputStream(name);
+                // Write file header
+                output_file.write((template_manager.getHTMLBlock("FILE_HEADER")).toString().getBytes());
+                // Dealt with
+                out("  writing to: " + name);
+                name = null;
+                done = true;
+            }
             }
             else if(line.startsWith("<$")) {
@@ -290 +309 @@
                 if(output_file == null) {
                 output_file = new FileOutputStream(text_file.getName() + ".htm");
+                // Write file header
+                output_file.write((template_manager.getHTMLBlock("FILE_HEADER")).toString().getBytes());
                 }
                 out("  write: " + block.getName());
@@ -339 +360 @@
             if(output_file == null) {
             output_file = new FileOutputStream(text_file.getName() + ".htm");
+            // Write file header
+            output_file.write((template_manager.getHTMLBlock("FILE_HEADER")).toString().getBytes());
             }
             out("  write: " + block.getName());
@@ -346 +369 @@
         paragraph = null;
         line = null;
-        output_file.close();
+        // Close any remaining output_file
+        if(output_file != null) {
+            // Write file footer
+            output_file.write((template_manager.getHTMLBlock("FILE_FOOTER")).toString().getBytes());
+            output_file.close();
+        }
         output_file = null;
         }