Changeset 3615

Timestamp:

2002-12-03T16:20:18+13:00 (21 years ago)

Author:

say1

Message:

java updates new collections now appear on web server

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained

Files:

• DocumentStream.java (modified) (2 diffs)
• FilesDocumentStream.java (modified) (7 diffs)
• GeneratedDocumentStream.java (modified) (2 diffs)
• QueryDocumentStream.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained/DocumentStream.java

@@ -44 +44 @@
    * @return the next document
    */
-  public Document nextDocument();
+  public Document nextDocument() throws Exception ;
   /**
    * Is there a next document?
@@ -51 +51 @@
    * @return true if there is a next document
    */
-  public boolean hasNextDocument();
+  public boolean hasNextDocument() throws Exception ;
   
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained/FilesDocumentStream.java

@@ -22 +22 @@
 import org.w3c.dom.Document; 
 import org.xml.sax.InputSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import org.apache.xerces.dom.DocumentImpl;
+import org.apache.xerces.dom.ElementImpl;
+import org.apache.xerces.dom.TextImpl;
+import org.w3c.dom.Document; 
 
 // other java classes
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.FileReader;
 import java.io.IOException;
@@ -57 +67 @@
     File file = new File(filename);
     if (file.exists() && file.isDirectory())
-      directories.add(file);
+      directories.add(file.getAbsolutePath());
     else
-      files.add(file);
+      files.add(file.getAbsolutePath());
   }
   /**
@@ -69 +79 @@
   public FilesDocumentStream(File file) {
     if (file.exists() && file.isDirectory())
-      directories.add(file);
+      directories.add(file.getAbsolutePath());
     else
-      files.add(file);
+      files.add(file.getAbsolutePath());
+  }
+
+  /** 
+   * A small inner class to filter out those files that don't 
+   * end in ".xml" or ".XML"
+   */
+  class XMLFilenameFilter implements FilenameFilter {
+    /** Tests if a specified file should be included in a file list. */
+    public boolean accept(File dir, String name) {
+      String target = ".xml";
+      if (name.length() < target.length())
+    return false;
+      String extension = name.substring(name.length() - 4, name.length());
+      //System.out.println(name + " ==>> " +  extension);
+      if (extension.equalsIgnoreCase(target)) {
+    return true;
+      } else {
+    return false;
+      }
+    }    
   }
 
@@ -80 +110 @@
    */
   protected void expandIfNecessary() {
-    while (files.size() < 1 || directories.size() > 1) {
-      File file = (File) directories.elementAt(directories.size() - 1);
-      directories.removeElementAt(directories.size() - 1);
-      if (!file.exists()) throw new Error ("error in expand: expecting a directory");
-      File[] fileArray = file.listFiles();
+    while (directories.size() > 0) {
+      String dirname = (String) directories.elementAt(0);
+      directories.removeElement(dirname);
+      File dir = new File(dirname);
+      if (!dir.exists()) throw new Error ("error in expand: expecting a directory " + dirname);
+      String[] fileArray = dir.list();
       for (int i=0;i<fileArray.length;i++){
-    if (fileArray[i].exists() && fileArray[i].isDirectory())
-      directories.add(fileArray[i]);
-    else
-      files.add(fileArray[i]);
+    File file = new File(dir, fileArray[i]);
+    if (file.exists() && file.isDirectory()) 
+      directories.add(file.getPath());
       }
+      
+      fileArray = dir.list(new XMLFilenameFilter());
+      for (int i=0;i<fileArray.length;i++){
+    File file = new File(dir, fileArray[i]);
+    if (file.exists() && !file.isDirectory())
+      files.add(file.getPath());
+      }
+      if (files.size() > 0)
+    return;
     }
   }
-
+  
   /**
    * Returns the next document
@@ -100 +139 @@
    * @return the next document
    */
-  public Document nextDocument() {
-    try {
-      if (!hasNextDocument()) throw new Error("Doesn't have another Document");
-      File file = (File) files.elementAt(files.size() - 1);
-      files.removeElementAt(files.size() - 1);
-       
-      Reader reader = new FileReader(file);
-      InputSource xml_source = new InputSource(reader);
-       
-      XMLUtil.getDOMParser().parse(xml_source);
-      Document doc = XMLUtil.getDOMParser().getDocument();
-       
-      return doc;
-    } catch (org.xml.sax.SAXException s) {
-      System.err.println("SAXException in nextDocument()");
-      throw new Error(s.toString());
-    } catch (IOException e) {
-      System.err.println("IOException in nextDocument()");
-      throw new Error(e.toString());
-    }
+  public Document nextDocument()
+    throws Exception {
+    
+    if (!hasNextDocument()) throw new Error("Doesn't have another Document");
+
+    String filename = (String) files.elementAt(files.size() - 1);
+    files.removeElementAt(files.size() - 1);
+    File file = new File(filename);
+    
+    Reader reader = new FileReader(file);
+    InputSource xml_source = new InputSource(reader);
+
+    XMLUtil.getDOMParser().parse(xml_source);
+    Document doc = XMLUtil.getDOMParser().getDocument();
+    
+    return doc;
   }
     
@@ -129 +164 @@
    */
 
-  public boolean hasNextDocument()  {
+  public boolean hasNextDocument()  throws Exception {
     expandIfNecessary();
-    return (files.size() > 1);
+    return (files.size() > 0);
   }
   /**
@@ -141 +176 @@
    */
 
-  public static void main(String args[]) throws IOException
+  public static void main(String args[]) throws Exception
   {
+   
+    StreamResult result = new StreamResult(System.out);
+    TransformerFactory transformerFactory = TransformerFactory.newInstance();
+    
+    FilesDocumentStream stream = new FilesDocumentStream(".");
+    while (stream.hasNextDocument()) {
+      Document document = stream.nextDocument();
+      Transformer transformer = transformerFactory.newTransformer();
+      Source source = new DOMSource(document);
+      transformer.transform(source,result);
+      System.out.println();
+      System.out.println();
+    }
 
-  }
- 
+  } 
 }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained/GeneratedDocumentStream.java

@@ -1 +1 @@
 /*
- *    XMLConverter.java
+ *    GenerateDocumentStream.java
  *    Copyright (C) 2002 New Zealand Digital Library, http://www.nzdl.org
  *
@@ -86 +86 @@
     this.next = next;
   }
+  /** 
+   * Custom constructor 
+   *
+   * @param first the first letter in the alphabet
+   * @param last the last letter in the alphabet
+   */
+  public GeneratedDocumentStream(char first, char last) {
+    this.incrementer = new IncrementRange(first,last);
+  }
 
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained/QueryDocumentStream.java

@@ -166 +166 @@
    * @see org.w3c.dom.Document
    */
-  public Document nextDocument()  {
+  public Document nextDocument() throws Exception {
 
     if (hasNextDocument() == false)
@@ -179 +179 @@
    * @return true if there are more docs
    */
-  public boolean hasNextDocument() {
+  public boolean hasNextDocument() throws Exception {
     lookInStream();
     return (cached != null);
@@ -193 +193 @@
    * @see blank
    */
-  protected boolean lookInStream()  {
+  protected boolean lookInStream() throws Exception {
 
     while (stream.hasNextDocument() && cached == null) {