/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 800

Added by Matt Jones over 23 years ago

Added fix to DocumentImpl that showed problems when the DocumentImpl(conn)
constructor was called. Now there is a new constructor:
DocumentImpl(Connection, String, boolean)
where the boolean value is used to determine if the nodeset should be
read a t the time the cosntructor is called. if false, then
nodeRecordList will be null. Later calls to "toXml()" and other methods
that use nodeRecordList now make sure it is non-null before using it.
So, even if the nodeRecordList isn't read in by the constructor, the toXml()
method will still work as expected.

Changed the "getDocumentInfo(String) method to private scope because there
is now no reason for it to be called outside of the class.

Updated DBQuery and RelationHandler to utilize these changes.

                 { //there was a backtrackable document found
                   DocumentImpl xmldoc = null;
                   String packageDocid = btrs.getString(1);
                   util.debugMessage("Getting document for docid: " + packageDocid);
                   try
+                  {
                   //  THIS CONSTRUCTOR BUILDS THE WHOLE XML doc not needed here
                   //  xmldoc = new DocumentImpl(dbconn, packageDocid);
                   //  thus use the following to get the doc info only
                     xmldoc = new DocumentImpl(dbconn);
                     xmldoc.getDocumentInfo(packageDocid);
                     //  THIS CONSTRUCTOR BUILDS THE WHOLE XML doc not needed here
                     // xmldoc = new DocumentImpl(dbconn, packageDocid);
                     //  thus use the following to get the doc info only
                     //  xmldoc = new DocumentImpl(dbconn);
                     xmldoc = new DocumentImpl(dbconn, packageDocid, false);
                     if (xmldoc == null) {
                       util.debugMessage("Document was null for: " + packageDocid);
+                    }
+                  }
                   catch(Exception e)
+                  {
-...
                                        "DBQuery.findDocuments: " + e.getMessage());
+                  }
                   docid   = xmldoc.getDocID().trim();
                   String docid_org = xmldoc.getDocID();
                   if (docid_org == null) {
                     util.debugMessage("Docid_org was null.");
+                  }
                   docid   = docid_org.trim();
                   docname = xmldoc.getDocname();
                   doctype = xmldoc.getDoctype();
                   createDate = xmldoc.getCreateDate();
-...
             System.err.println("IO error in DBQuery.findDocuments:");
             System.err.println(ioe.getMessage());
           } catch (Exception ee) {
             System.out.println("Exception in DBQuery.findDocuments: " +
             System.err.println("Exception in DBQuery.findDocuments: " +
                                ee.getMessage());
             ee.printStackTrace(System.err);
+          }
           finally {
             try

         // Deal with forms that are encoded as "multipart/form-data" differently
         // this is mainly used for uploading non-xml files using that may be binary
         if (request.getContentType().startsWith("multipart/form-data")) {
         String ctype = request.getContentType();
         if (ctype != null && ctype.startsWith("multipart/form-data")) {
           handleMultipartForm(request, response);
         } else {
           // This probably means the data is "application/x-www-url-encoded", we hope :-)

       private TreeSet nodeRecordList = null;
       /**
        * Constructor used from DBQuery.findDocuments();
        * used with getDocumentInfo() to get document info from xml_documents
        * Constructor used to create a document and read the document information
        * from the database.  If readNodes is false, then the node data is not
        * read at this time, but is deferred until it is needed (such as when a
        * call to toXml() is made).
+       *
        * @param conn the database connection from which to read the document
        * @param docid the identifier of the document to be created
        * @param readNodes flag indicating whether the xmlnodes should be read
        */
       public DocumentImpl(Connection conn) throws McdbException
       public DocumentImpl(Connection conn, String docid, boolean readNodes) throws McdbException
+      {
         this.conn = conn;
         this(conn, docid);
         if (readNodes) {
           try {
             // Download all of the document nodes using a single SQL query
             // The sort order of the records is determined by the NodeComparator
             // class, and needs to represent a depth-first traversal for the
             // toXml() method to work properly
             nodeRecordList = getNodeRecordList(rootnodeid);
           } catch (McdbException ex) {
             throw ex;
           } catch (Throwable t) {
             throw new McdbException("Error reading document from " +
                                     "DocumentImpl.DocumentImpl: " + docid);
+          }
+        }
+      }
       /**
-...
           this.conn = conn;
           this.docid = docid;
           // NOT NEEDED
           //DocumentIdentifier id = new DocumentIdentifier(docid);
           // Look up the document information
           getDocumentInfo(docid);
           // Download all of the document nodes using a single SQL query
           // The sort order of the records is determined by the NodeComparator
           // class, and needs to represent a depth-first traversal for the
           // toXml() method to work properly
           nodeRecordList = getNodeRecordList(rootnodeid);
         } catch (McdbException ex) {
           throw ex;
         } catch (Throwable t) {
-...
       public String toString()
+      {
         StringWriter docwriter = new StringWriter();
         this.toXml(docwriter);
         try {
           this.toXml(docwriter);
         } catch (McdbException mcdbe) {
           return null;
+        }
         String document = docwriter.toString();
         return document;
+      }
-...
        * to completion is O(N^N) wrt the number of nodes.  See toXml() for a
        * better algorithm.
        */
       public String readUsingSlowAlgorithm()
       public String readUsingSlowAlgorithm() throws McdbException
+      {
         StringBuffer doc = new StringBuffer();
         // First, check that we have the needed node data, and get it if not
         if (nodeRecordList == null) {
           nodeRecordList = getNodeRecordList(rootnodeid);
+        }
         // Create the elements from the downloaded data in the TreeSet
         rootNode = new ElementNode(nodeRecordList, rootnodeid);
-...
+       *
        * @param pw the Writer to which we print the document
        */
       public void toXml(Writer pw)
       public void toXml(Writer pw) throws McdbException
+      {
         PrintWriter out = null;
         if (pw instanceof PrintWriter) {
-...
         MetaCatUtil util = new MetaCatUtil();
         // First, check that we have the needed node data, and get it if not
         if (nodeRecordList == null) {
           nodeRecordList = getNodeRecordList(rootnodeid);
+        }
         Stack openElements = new Stack();
         boolean atRootElement = true;
         boolean previousNodeWasElement = false;
-...
                             "' does not exist");
+      }
       public void getDocumentInfo(String docid) throws McdbException,
       private void getDocumentInfo(String docid) throws McdbException,
                                                         AccessionNumberException
+      {
         getDocumentInfo(new DocumentIdentifier(docid));

         //    add a new row to xml_relation that represents this new relation
         try {
           DocumentImpl xmldoc = new DocumentImpl(conn);
           xmldoc.getDocumentInfo(docid);
           DocumentImpl xmldoc = new DocumentImpl(conn,docid,false);
           //DocumentImpl xmldoc = new DocumentImpl(conn);
           //xmldoc.getDocumentInfo(docid);
           String packagetype = xmldoc.getDoctype();
           // first delete the relations for this package document if any

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 800

Added by Matt Jones over 23 years ago