--- experimental/server/XMLReader/XMLPacketMaker.java	2000/11/14 09:32:31	1.3
+++ experimental/server/XMLReader/XMLPacketMaker.java	2000/11/14 12:36:11	1.9
@@ -3,12 +3,24 @@ import java.util.ArrayList;
 
 import org.xml.sax.*;
 
-import javax.xml.parsers.SAXParserFactory;  
-import javax.xml.parsers.ParserConfigurationException;  
-import javax.xml.parsers.SAXParser;  
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
 
+// Paul Mutton, pjm2@ukc.ac.uk
 
+// XMLPacketMaker - Creates an XMLPacket object.
 public class XMLPacketMaker extends HandlerBase {
+
+    public XMLPacketMaker () {
+        // default no-args constructor.
+    }
+
+    // Constructor for accepting a reference to an XMLPacket
+    public XMLPacketMaker (XMLPacket packet) {
+        this.packet = packet;
+    }
+
     public static void main(String[] args){
         if (args.length != 1) {
             System.err.println ("Usage: cmd filename");
@@ -21,12 +33,20 @@ public class XMLPacketMaker extends HandlerBase {
             // Set up output stream
             out = new OutputStreamWriter (System.out, "UTF8");
 
+            // Create the XMLPacket to store values in.
+            packet = new XMLPacket();
+
             // Parse the input
             SAXParser saxParser = factory.newSAXParser();
-            saxParser.parse(new File(args[0]), new XMLPacketMaker());
+            saxParser.parse(new File(args[0]), new XMLPacketMaker(packet));
 
+            // Print out the entire contents of the packet's HashMap.
+            System.out.println("XMLPacket contents: -");
+            packet.printAll();
+
         } catch (Throwable t) {
-            t.printStackTrace ();
+            System.out.println("The recieved packet did not contain valid XML, so I'm gonna reject it.");
+            //t.printStackTrace ();
         }
         System.exit (0);
     }
@@ -35,85 +55,75 @@ public class XMLPacketMaker extends HandlerBase {
     private String indentString = "    "; // Amount to indent
     private int indentLevel = 0;
 
+    // For storing the tag heirarchy.
     private ArrayList tagList = new ArrayList();
+    static private XMLPacket packet = null;
 
     //===========================================================
     // SAX DocumentHandler methods
     //===========================================================
 
     public void startDocument () throws SAXException {
-        nl();
-        nl();
-        emit ("START DOCUMENT");
-        nl();
-        emit ("<?xml version='1.0' encoding='UTF-8'?>");
+        // No purpose currently.
     }
 
     public void endDocument () throws SAXException {
-        nl(); emit ("END DOCUMENT");
-        try {
-            nl();
-            out.flush ();
-        } catch (IOException e) {
-            throw new SAXException ("I/O error", e);
-        }
+        // No purpose currently.
     }
 
+    // Add each tag's attribute to the XMLPacket.
+    // Note that all attributes within an opening tag are
+    // stored as "someroot.sometag.attributes.attribute_name"
+    // E.g. If <packet> is the root node, then:
+    //     <packet machine_name="raptor">
+    // is stored as:
+    //     "packet.attributes.machine_name"
+    // within the XMLPacket.
     public void startElement (String name, AttributeList attrs) throws SAXException {
         indentLevel++;
-        nl(); emit ("ELEMENT: ");
-        emit ("<"+name);
+        tagList.add(name);
         if (attrs != null) {
             for (int i = 0; i < attrs.getLength (); i++) {
-                nl();
-                emit("   ATTR: ");
-                emit (attrs.getName (i));
-                emit ("\t\"");
-                emit (attrs.getValue (i));
-                emit ("\"");
+                packet.addParam(getPath()+".attributes."+attrs.getName(i), attrs.getValue(i));
             }
         }
-        if (attrs.getLength() > 0) nl();
-        emit (">");
     }
 
+    // When an XML element is finished with, we must remove
+    // the tag name from the tagList and decrement the indent
+    // level.
     public void endElement (String name) throws SAXException {
-        nl();
-        emit ("END_ELM: ");
-        emit ("</"+name+">");
+        tagList.remove(tagList.size()-1);    
         indentLevel--;
     }
 
+    // Any text falling within a pair of terminal tags must
+    // be added to the XMLPacket.  Trim leading and trailing
+    // spaces and do not bother to add if there is no data
+    // specified within the tags.
     public void characters (char[] buf, int offset, int len) throws SAXException {
-        nl(); emit ("CHARS:   ");
         String s = new String(buf, offset, len);
-        if (!s.trim().equals("")) emit (s);
+        if (!s.trim().equals("")) {
+            packet.addParam(getPath(), s);
+        }
     }
 
+
     //===========================================================
     // Helpers ...
     //===========================================================
-
-    // Wrap I/O exceptions in SAX exceptions, to
-    // suit handler signature requirements
-    private void emit (String s) throws SAXException {
-        try {
-            out.write (s);
-            out.flush ();
-        } catch (IOException e) {
-            throw new SAXException ("I/O error", e);
+    
+    
+    // Return the heirarchical string to be used as a key value
+    // in the XMLPacket.
+    private String getPath () {
+        String path = (String)tagList.get(0);
+        if (tagList.size() > 0) {
+            for (int i = 1 ; i < tagList.size() ; i++) {
+                path = path + "." + (String)tagList.get(i);
+            }
         }
+        return path;
     }
-
-    // Start a new line
-    // and indent the next line appropriately
-    private void nl () throws SAXException {
-        String lineEnd =  System.getProperty("line.separator");
-        try {
-            out.write (lineEnd);
-            for (int i=0; i < indentLevel; i++) out.write(indentString);
-        } catch (IOException e) {
-            throw new SAXException ("I/O error", e);
-        }
-    }
+    
 }
\ No newline at end of file