/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 243

Added by Matt Jones over 24 years ago

Fixed bug in DBEntityResolver so that it now properly delegates to
the system id found inthe database.
Changed DBValidate to use DBEntityResolver, rather than the OASIS
catalog, and to return validation results in XML format.

                               implements LexicalHandler, DeclHandler {
        private boolean	atFirstElement;
        private boolean	processingDTD;
        private String 	docname = null;
        private String 	doctype;
        private String 	systemid;
-...
        public DBSAXHandler(Connection conn) {
          this.conn = conn;
          this.atFirstElement = true;
          this.processingDTD = false;
          // Create the stack for keeping track of node context
          // if it doesn't already exist
-...
         * SAX Handler that receives notification of the start of entities
         */
        public void startEntity(String name) throws SAXException {
          MetaCatUtil.debugMessage("start ENTITY");
          MetaCatUtil.debugMessage("start ENTITY: " + name);
          if (name.equals("[dtd]")) {
            processingDTD = true;
+         }
+       }
        /**
         * SAX Handler that receives notification of the end of entities
         */
        public void endEntity(String name) throws SAXException {
          MetaCatUtil.debugMessage("end ENTITY");
          MetaCatUtil.debugMessage("end ENTITY: " + name);
          if (name.equals("[dtd]")) {
            processingDTD = false;
+         }
+       }
        /**
-...
         */
        public void elementDecl(String name, String model)
                             throws org.xml.sax.SAXException {
          MetaCatUtil.debugMessage("ELEMENTDECL");
          MetaCatUtil.debugMessage("ELEMENTDECL: " + name + " " + model);
+       }
        /**
-...
        public void attributeDecl(String eName, String aName,
                             String type, String valueDefault, String value)
                             throws org.xml.sax.SAXException {
          MetaCatUtil.debugMessage("ATTRIBUTEDECL");
          MetaCatUtil.debugMessage("ATTRIBUTEDECL: " + eName + " "
                             + aName + " " + type + " " + valueDefault + " "
                             + value);
+       }
        /**
-...
         */
        public void internalEntityDecl(String name, String value)
                             throws org.xml.sax.SAXException {
          MetaCatUtil.debugMessage("INTERNENTITYDECL");
          MetaCatUtil.debugMessage("INTERNENTITYDECL: " + name + " " + value);
+       }
        /**
-...
        public void externalEntityDecl(String name, String publicId,
                             String systemId)
                             throws org.xml.sax.SAXException {
          MetaCatUtil.debugMessage("EXTERNENTITYDECL");
          MetaCatUtil.debugMessage("EXTERNENTITYDECL: " + name + " " + publicId
                                   + " " + systemId);
+       }
        //
-...
        /**
         * get the document processing state
         */
        public boolean atFirstElement() {
          return atFirstElement;
        public boolean processingDTD() {
          return processingDTD;
+       }
+    }
     /**
      * '$Log$
      * 'Revision 1.30  2000/06/28 03:14:35  jones
      * 'Fixed bug where TEXT nodes couldn't be longer than 4000 characters, which
      * 'is the maximum length of a VARCHAR2 field in Oracle.  Now, if text
      * 'exceeds the field length, I break the text up into a series of TEXT
      * 'nodes each of the max field length, and the remainder in the last
      * 'TEXT node. The only problem with this is that our current search
      * 'algorithms only will find phrases within a single TEXT nodes, so if
      * 'the search term spans the node boundary, the search algorithm will not
      * 'return a hit. I expect this is extremely rare, basically inconsequential.
      * '
      * 'Revision 1.29  2000/06/27 04:31:07  jones
      * 'Fixed bugs associated with the new UPDATE and DELETE functions of
      * 'DBWriter.  There were problematic interactions between some static

     import java.util.*;
     import java.io.*;
     import java.lang.reflect.*;
     import java.sql.*;
     import org.w3c.dom.*;
     import org.xml.sax.*;
-...
      *     Copyright: 2000 Regents of the University of California and the
      *                National Center for Ecological Analysis and Synthesis
      *                April 28, 2000
+     *
      * @author Dan Higgins
      * @version 1.0
      *    Authors: Dan Higgins, Matt Jones
      */
     public class DBValidate {
-...
         } catch (Exception e) {
           System.err.println("Could not create parser!!!");
+        }
         CatalogEntityResolver cer = new CatalogEntityResolver();
         try {
           Catalog myCatalog = new Catalog();
           myCatalog.loadSystemCatalogs();
           cer.setCatalog(myCatalog);
         } catch (Exception e) {System.out.println("Problem creating Catalog!");}
         parser.setEntityResolver(cer);
+      }
       /** Construct a new validation object */
       /** Construct a new validation object using an OASIS catalog file */
       public DBValidate(String parserName, String xmlcatalogfile)  {
         this(parserName);
         try {
           // Get an instance of the parser
           parser = XMLReaderFactory.createXMLReader(parserName);
           parser.setFeature("http://xml.org/sax/features/validation",true);
           //parser.setValidationMode(true);     // Oracle
         } catch (Exception e) {
           System.err.println("Could not create parser!!!");
+        }
         CatalogEntityResolver cer = new CatalogEntityResolver();
         try {
           Catalog myCatalog = new Catalog();
-...
         parser.setEntityResolver(cer);
+      }
       /** Construct a new validation object using a database entity resolver */
       public DBValidate(String parserName, Connection conn) {
         this(parserName);
         DBEntityResolver dbresolver = new DBEntityResolver(conn);
         parser.setEntityResolver(dbresolver);
+      }
       /**
        * validate an xml document against its DTD
+       *
-...
         } catch (IOException e) {
           System.out.println("IOException:Could not parse :"+xml_doc);
           ParseError eip = null;
           eip = new ParseError("",0,0,"",
           eip = new ParseError("",0,0,
                     "IOException:Could not parse :"+xml_doc);
           if (ef.errorNodes == null)  ef.errorNodes = new Vector();
           ef.errorNodes.addElement(eip);
-...
+        }
+      }
       /** provide a list of errors fromthe validation process */
       /** provide a list of errors from the validation process */
       public String returnErrors() {
         String errorstring = "";
         StringBuffer errorstring = new StringBuffer();
         errorstring.append("<?xml version=\"1.0\" ?>\n");
         if (ef != null && ef.getErrorNodes()!=null &&
             ef.getErrorNodes().size() > 0 ) {
           Vector errors = ef.getErrorNodes();
           errorstring.append("<validationerrors>\n");
           for (Enumeration e = errors.elements() ; e.hasMoreElements() ;) {
             errorstring = errorstring +
                           ((ParseError)(e.nextElement())).getMsg()+"\n";
             errorstring = errorstring + "----\n";
             errorstring.append(
                           ((ParseError)(e.nextElement())).toXML());
+          }
           errorstring.append("</validationerrors>\n");
         } else {
           errorstring = "No errors were detected!!!";
           errorstring.append("<valid />\n");
+        }
         return errorstring;
         return errorstring.toString();
+      }
       /** Create a URL object from either a URL string or a plain file name. */
-...
         String doc = args[0];
         MetaCatUtil util = new MetaCatUtil();
         DBValidate gxv = new DBValidate(util.getOption("saxparser"));
         if (gxv.validate(doc)) {
           System.out.println("XML is valid.");
         } else {
           System.out.print(gxv.returnErrors());
         try {
           Connection conn = util.openDBConnection();
           DBValidate gxv = new DBValidate(util.getOption("saxparser"), conn);
           if (gxv.validate(doc)) {
             System.out.print(gxv.returnErrors());
           } else {
             System.out.print(gxv.returnErrors());
+          }
         } catch (SQLException e) {
           System.out.println("<error>Couldn't open database connection.</error>");
         } catch (ClassNotFoundException e) {
           System.out.println("<error>Couldn't open database connection.</error>");
+        }
+      }
-...
         private void handleError(SAXParseException ex, int type) {
           // System.out.println("!!! handleError: "+ex.getMessage());
           StringBuffer errorString = new StringBuffer();
           errorString.append("at line number, ");
           errorString.append(ex.getLineNumber());
           errorString.append(": ");
           errorString.append(ex.getMessage());
           if (errorNodes == null) {
             errorNodes = new Vector();
+          }
           ParseError eip = null;
           eip = new ParseError(ex.getSystemId(),ex.getLineNumber(),
                 ex.getColumnNumber(),"",errorString.toString());
           eip = new ParseError(ex.getSystemId(), ex.getLineNumber(),
                                ex.getColumnNumber(), ex.getMessage());
           // put it in the Hashtable.
           errorNodes.addElement(eip);
-...
         String fileName;
         int lineNo;
         int charOffset;
         Object key;
         String msg;
         /**
          * Constructor
          */
         public ParseError(String fileName, int lineNo, int charOffset,
                            Object key, String msg) {
           this. fileName=fileName;
           this. lineNo=lineNo;
           this. charOffset=charOffset;
           this. key=key;
           this. msg=msg;
         public ParseError(String fileName, int lineNo, int charOffset, String msg) {
           this.fileName=fileName;
           this.lineNo=lineNo;
           this.charOffset=charOffset;
           this.msg=msg;
+        }
         //
-...
         public String getFileName() { return fileName; }
         public int getLineNo() { return lineNo; }
         public int getCharOffset() { return charOffset;}
         public Object getKey() { return key; }
         public String getMsg() { return msg; }
         public void setMsg(String s) { msg = s; }
         /** Return the error message as an xml fragment */
         public String toXML() {
           StringBuffer err = new StringBuffer();
           err.append("<error>\n");
           err.append("<filename>").append(getFileName()).append("</filename>\n");
           err.append("<line>").append(getLineNo()).append("</line>\n");
           err.append("<offset>").append(getCharOffset()).append("</offset>\n");
           err.append("<message>").append(getMsg()).append("</message>\n");
           err.append("</error>\n");
           return err.toString();
+        }
+      }
+    }
     /**
      * '$Log$
      * 'Revision 1.7  2000/06/26 10:35:05  jones
      * 'Merged in substantial changes to DBWriter and associated classes and to
      * 'the MetaCatServlet in order to accomodate the new UPDATE and DELETE
      * 'functions.  The command line tools and the parameters for the
      * 'servlet have changed substantially.
      * '
      * 'Revision 1.6.2.3  2000/06/25 23:38:16  jones
      * 'Added RCSfile keyword
      * '

      *             for resolving external entities
      *  Copyright: 2000 Regents of the University of California and the
      *             National Center for Ecological Analysis and Synthesis
      *    Authors: Jivka Bojilova
      *    Authors: Jivka Bojilova, Matt Jones
+     *
      *   '$Author$'
      *     '$Date$'
-...
     import org.xml.sax.*;
     import java.sql.*;
     import java.io.File;
     import java.io.FileReader;
     import java.io.InputStream;
     import java.io.InputStreamReader;
     import java.io.IOException;
     import java.net.URL;
     import java.net.URLConnection;
     import java.net.MalformedURLException;
     import java.io.IOException;
     import java.util.Stack;
     import java.util.EmptyStackException;
-...
     public class DBEntityResolver implements EntityResolver
+    {
        private Connection conn = null;
        private DBSAXHandler handler;
        private DBSAXHandler handler = null;
        /** Construct an instance of the DBEntityResolver clas
        /**
         * Construct an instance of the DBEntityResolver class
+        *
         * @param conn the JDBC connection to which information is written
         */
        public DBEntityResolver(Connection conn)
+       {
           this.conn = conn;
+       }
        /**
         * Construct an instance of the DBEntityResolver class
+        *
         * @param conn the JDBC connection to which information is written
         * @param handler the SAX handler to determine parsing context
         */
        public DBEntityResolver(Connection conn, DBSAXHandler handler)
+       {
           this.conn = conn;
           this(conn);
           this.handler = handler;
+       }
-...
         * referenced within the document element)
         */
        public InputSource resolveEntity (String publicId, String systemId)
                     throws MalformedURLException, IOException
                     throws SAXException, IOException
+       {
          String dbSystemId;
          String doctype = null;
          // Only process entities if its the DTD
          if (handler.atFirstElement()) {
             if (publicId != null) {       // If we have a public ID, use it
                 doctype = publicId;
                 MetaCatUtil.debugMessage("DOCTYPE-c: " + doctype);
             } else if ( systemId != null) {  // Otherwise, use system id if we can
                 doctype = handler.getDocname();
                 MetaCatUtil.debugMessage("DOCTYPE-d: " + doctype);
+            }
             // look at the db XML Catalog and get dbSystemId for this doctype
             dbSystemId = getDTDSystemID (conn, doctype);
             if (dbSystemId == "") {
                 // if it is not found inthe database, then
                 // register publicId in db and use the provided systemId
                 if (systemId != "") {
                     checkURLConnection(systemId);
                     registerDTDSystemID (conn, doctype, doctype, systemId);
                     return null;
+                }
             } else {
                 // If it is in the database, return the systemid fromthe database
                 checkURLConnection(dbSystemId);
                 return new InputSource(dbSystemId);
+            }
          if (publicId != null) {       // If we have a public ID, use it
            doctype = publicId;
            MetaCatUtil.debugMessage("DOCTYPE-c: " + doctype);
          } else if (systemId != null) {  // Otherwise, use system id if we can
            if (handler != null) {        // Won't have a handler under all cases
              if (handler.processingDTD()) {  // Assume the public ID is the docname
                doctype = handler.getDocname();
                MetaCatUtil.debugMessage("DOCTYPE-d: " + doctype);
+             }
+           }
+         }
          // look at the db XML Catalog and get dbSystemId for this doctype
          if (doctype != null) {
            dbSystemId = getDTDSystemID (conn, doctype);
            if (dbSystemId == null) {
              MetaCatUtil.debugMessage("  RESOLVED NOTHING");
              // if it is not found in the database, then
              // register publicId in db and use the provided systemId
              if (systemId != null) {
                InputStreamReader isr = checkURLConnection(systemId);
                if (handler != null) {    // Won't have a handler under all cases
                  if (handler.processingDTD()) {
                    registerDTDSystemID (conn, doctype, doctype, systemId);
+                 }
+               }
                return null;
+             }
            } else {
              MetaCatUtil.debugMessage("  RESOLVED SYSTEMID: " + dbSystemId);
              // If it is in the database, return the systemid from the database
              InputStreamReader isr = checkURLConnection(dbSystemId);
              InputSource is = new InputSource(dbSystemId);
              is.setCharacterStream(isr);
              MetaCatUtil.debugMessage("  INPUTSOURCE SYSTEMID: "
                                           + is.getSystemId());
              return is;
+           }
+         }
          // use the default behaviour for other cases
          checkURLConnection(systemId);
          // use the provided systemID for other cases
          InputStreamReader isr = checkURLConnection(systemId);
          return null;
+       }
-...
         * Return empty string if there are not
         */
        private String getDTDSystemID (Connection conn, String doctype)  {
             String system_id = "";
             String system_id = null;
             Statement stmt;
             try {
               stmt = conn.createStatement();
-...
             } catch (SQLException e) {
               System.out.println("DBEntityResolver.getDTDSystemID() " +
                                  "- Error getting id: " + e.getMessage());
               System.exit(1);
+            }
             // return the selected System ID
-...
        private void registerDTDSystemID (Connection conn, String doctype,
                                          String publicId, String systemId)
+       {
             try {
               PreparedStatement pstmt;
               pstmt = conn.prepareStatement(
                     "INSERT INTO xml_catalog " +
                     "(catalog_id, entry_type, source_doctype, " +
                     "public_id, system_id) " +
                     "VALUES (null, 'DTD', ?, ?, ?)");
               // Bind the values to the query
               pstmt.setString(1, doctype);
               pstmt.setString(2, publicId);
               pstmt.setString(3, systemId);
               // Do the insertion
               pstmt.execute();
               pstmt.close();
             } catch (SQLException e) {
               System.out.println(e.getMessage());
+            }
          try {
            PreparedStatement pstmt;
            pstmt = conn.prepareStatement(
                  "INSERT INTO xml_catalog " +
                  "(catalog_id, entry_type, source_doctype, " +
                  "public_id, system_id) " +
                  "VALUES (null, 'DTD', ?, ?, ?)");
            // Bind the values to the query
            pstmt.setString(1, doctype);
            pstmt.setString(2, publicId);
            pstmt.setString(3, systemId);
            // Do the insertion
            pstmt.execute();
            pstmt.close();
          } catch (SQLException e) {
            System.out.println(e.getMessage());
+         }
+       }
        /**
         * Check URL Connection for systemId
         * Check URL Connection for systemId, and return an InputStreamReader
         * that can be used to read from the systemId URL.  The parser ends
         * up using this via the InputSource to read the DTD.
+        *
         * @param systemID a URI (in practice URL) to be checked and opened
         */
        private void checkURLConnection (String systemId)
        private InputStreamReader checkURLConnection (String systemId)
                     throws MalformedURLException, IOException
+       {
             try {
                 URLConnection urlConn = (new URL(systemId)).openConnection();
                 urlConn.connect();
             } catch (MalformedURLException e) {
                 System.out.println("from checkURLConnection(): " + e.getMessage());
                 throw e;
             } catch (IOException e) {
                 System.out.println("from checkURLConnection(): " + e.getMessage());
                 throw e;
+            }
          try {
            InputStreamReader isr = new InputStreamReader(
                                    new URL(systemId).openStream());
            return isr;
          } catch (MalformedURLException e) {
            System.out.println("from checkURLConnection(): " + e.getMessage());
            throw e;
          } catch (IOException e) {
            System.out.println("from checkURLConnection(): " + e.getMessage());
            throw e;
+         }
+       }
+    }
     /**
      * '$Log$
      * 'Revision 1.12  2000/06/27 04:31:07  jones
      * 'Fixed bugs associated with the new UPDATE and DELETE functions of
      * 'DBWriter.  There were problematic interactions between some static
      * 'variables used in DBEntityResolver and the way in which the
      * 'Servlet objects are re-used across multiple client invocations.
      * '
      * 'Generally cleaned up error reporting.  Now all errors and success
      * 'results are reported as XML documents from MetaCatServlet.  Need
      * 'to make the command line tools do the same.
      * '
      * 'Revision 1.11  2000/06/26 10:35:04  jones
      * 'Merged in substantial changes to DBWriter and associated classes and to
      * 'the MetaCatServlet in order to accomodate the new UPDATE and DELETE

                              chandler);
           parser.setProperty("http://xml.org/sax/properties/lexical-handler",
                              chandler);
           parser.setContentHandler(chandler);
           parser.setEntityResolver(dbresolver);
           parser.setDTDHandler(dtdhandler);
           parser.setContentHandler((ContentHandler)chandler);
           parser.setEntityResolver((EntityResolver)dbresolver);
           parser.setDTDHandler((DTDHandler)dtdhandler);
           parser.setErrorHandler((ErrorHandler)chandler);
         } catch (Exception e) {
-...
     /**
      * '$Log$
      * 'Revision 1.22  2000/06/27 04:31:07  jones
      * 'Fixed bugs associated with the new UPDATE and DELETE functions of
      * 'DBWriter.  There were problematic interactions between some static
      * 'variables used in DBEntityResolver and the way in which the
      * 'Servlet objects are re-used across multiple client invocations.
      * '
      * 'Generally cleaned up error reporting.  Now all errors and success
      * 'results are reported as XML documents from MetaCatServlet.  Need
      * 'to make the command line tools do the same.
      * '
      * 'Revision 1.21  2000/06/26 10:35:05  jones
      * 'Merged in substantial changes to DBWriter and associated classes and to
      * 'the MetaCatServlet in order to accomodate the new UPDATE and DELETE

             valtext = docreader.readXMLDocument(docid);
           } catch (NullPointerException npe) {
             response.setContentType("text/html");
             out.println("Error getting document ID: " + docid );
             response.setContentType("text/xml");
             out.println("<error>Error getting document ID: " + docid + "</error>");
+          }
+        }
         try {
           DBValidate valobj = new DBValidate(saxparser,xmlcatalogfile);
           DBValidate valobj = new DBValidate(saxparser,conn);
           boolean valid = valobj.validateString(valtext);
           // set content type and other response header fields first
           response.setContentType("text/html");
           out.println("<html>");
           out.println("<head><link rel=\"stylesheet\" type=\"text/css\" " +
                       "href=\"/xmltodb/rowcol.css\" /></head>");
           out.println("<body class=\"emlbody\">");
           if (valid) {
             out.println("The input XML is VALID!");
           } else {
             out.println("The input XML is NOT VALID<br />\n<pre>\n"
                         + valobj.returnErrors() + "\n</pre>\n");
+          }
           out.println("</body></html>");
           response.setContentType("text/xml");
           out.println(valobj.returnErrors());
         } catch (NullPointerException npe2) {
           // set content type and other response header fields first
           response.setContentType("text/html");
           out.println("Error validating document.");
           response.setContentType("text/xml");
           out.println("<error>Error validating document.</error>");
+        }
+      }
-...
     /**
      * '$Log$
      * 'Revision 1.48  2000/06/29 20:04:51  bojilova
      * 'testing login
      * '
      * 'Revision 1.36  2000/06/28 02:36:26  jones
      * 'Added feature to now ouput COMMENTs and PIs when the document is
      * 'read from the database with DBReader.

bin/loadxml
1	1	#!/bin/sh
2	2
3		export PARSER=/home/jones/software/xml-xerces/java/build/xerces.jar
	3	export PARSER=/home/httpd/servlets/xerces.jar
4	4	export PDIR=/home/jones/projects/pbi/development/xmltodb
5	5	export JDBC=${ORACLE_HOME}/jdbc/lib/classes111.zip
6	6

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 243

Added by Matt Jones over 24 years ago