/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 956

Added by Jing Tao almost 23 years ago

A constructor for this class was added. In the new constructor, user can specify the revision number he want to update. In method writeDocumentToDB, when a update action happend, the rev number would not automatictlly to add one, but it can go to specified number. This is for bug 417.

       private Connection conn = null;
       private String docid = null;
       private String updatedVersion=null;
       private String docname = null;
       private String doctype = null;
     // DOCTITLE attr cleared from the db
-...
         writeDocumentToDB(action, user, pub, catalogid, serverCode);
+      }
       /**
        * Construct a new document instance, writing the contents to the database.
        * This method is called from DBSAXHandler because we need to know the
        * root element name for documents without a DOCTYPE before creating it.
+       *
        * In this constructor, the docid is without rev. There is a string rev to
        * specify the revision user want to upadate. The revion is only need to be
        * greater than current one. It is not need to be sequent number just after
        * current one. So it is only used in update action
        * @param conn the JDBC Connection to which all information is written
        * @param rootnodeid - sequence id of the root node in the document
        * @param docname - the name of DTD, i.e. the name immediately following
        *        the DOCTYPE keyword ( should be the root element name ) or
        *        the root element name if no DOCTYPE declaration provided
        *        (Oracle's and IBM parsers are not aware if it is not the
        *        root element name)
        * @param doctype - Public ID of the DTD, i.e. the name immediately
        *                  following the PUBLIC keyword in DOCTYPE declaration or
        *                  the docname if no Public ID provided or
        *                  null if no DOCTYPE declaration provided
        * @param docid the docid to use for the UPDATE, no version number
        * @param version, need to be update
        * @param action the action to be performed (INSERT OR UPDATE)
        * @param user the user that owns the document
        * @param pub flag for public "read" access on document
        * @param serverCode the serverid from xml_replication on which this document
        *        resides.
+       *
        */
       public DocumentImpl(Connection conn, long rootNodeId, String docName,
                           String docType, String docId, String newRevision,
                           String action, String user,
                           String pub, String catalogId, int serverCode)
                           throws SQLException, Exception
+      {
         this.conn = conn;
         this.rootnodeid = rootNodeId;
         this.docname = docName;
         this.doctype = docType;
         this.docid = docId;
         this.updatedVersion = newRevision;
         writeDocumentToDB(action, user, pub, catalogId, serverCode);
+      }
       /**
        * Register a document that resides on the filesystem with the database.
        * (ie, just an entry in xml_documents, nothing in xml_nodes).
-...
       public int getRev() {
         return rev;
+      }
       /**
        /**
        * Print a string representation of the XML document
        */
       public String toString()
-...
       private void writeDocumentToDB(String action, String user, String pub,
                                      String catalogid, int serverCode)
                    throws SQLException, Exception {
         String sysdate = dbAdapter.getDateTimeFunction();
         try {
-...
             DocumentImpl.archiveDocRevision( conn, docid, user );
             DocumentImpl thisdoc = new DocumentImpl(conn, docid);
             int thisrev = thisdoc.getRev();
             thisrev++;
             //if the updated vesion is not greater than current one,
             //throw it into a exception
             if (Integer.parseInt(updatedVersion)<=thisrev)
+            {
               throw new Exception("Next revision number couldn't be less"
                                    +" than or equal "+ thisrev);
+            }
             else
+            {
               //set the user specified revision
               thisrev=Integer.parseInt(updatedVersion);
+            }
             // Delete index for the old version of docid
             // The new index is inserting on the next calls to DBSAXNode
             pstmt = conn.prepareStatement(
-...
         AccessionNumber ac = new AccessionNumber(conn, accnum, action);
         String docid = ac.getDocid();
         String rev = ac.getRev();
         MetaCatUtil.debugMessage("action: " + action + " servercode: " +
                                  serverCode + " override: " + override);
-...
+            {
               MetacatReplication.replLog("lock granted for " + accnum + " from " +
                                           server);
               XMLReader parser = initializeParser(conn, action, docid, validate,
                                                 user, groups, pub, serverCode, dtd);
               XMLReader parser = initializeParser(conn, action, docid, updaterev,
                                       validate, user, groups, pub, serverCode, dtd);
               conn.setAutoCommit(false);
               parser.parse(new InputSource(xml));
               conn.commit();
-...
         try
+        {
           XMLReader parser = initializeParser(conn, action, docid, validate,
           XMLReader parser = initializeParser(conn, action, docid, rev, validate,
                                               user, groups, pub, serverCode, dtd);
           conn.setAutoCommit(false);
           parser.parse(new InputSource(xml));
-...
         if(serverCode == 1)
         { //start the thread to replicate this new document out to the other servers
           ForceReplicationHandler frh = new ForceReplicationHandler(accnum, action);
+        }
         return(accnum);
-...
        * Set up the parser handlers for writing the document to the database
        */
       private static XMLReader initializeParser(Connection conn, String action,
                                        String docid, boolean validate,
                                    String docid, String rev, boolean validate,
                                        String user, String[] groups, String pub,
                                        int serverCode, Reader dtd)
                                throws Exception
-...
         // Set up the SAX document handlers for parsing
         //
         try {
           ContentHandler chandler = new DBSAXHandler(conn, action, docid,
           //create a DBSAXHandler object which has the revision specification
           ContentHandler chandler = new DBSAXHandler(conn, action, docid, rev,
                                                      user, groups, pub, serverCode);
           EntityResolver eresolver= new DBEntityResolver(conn,
                                                      (DBSAXHandler)chandler, dtd);
-...
                                              String user)
                                              throws SQLException {
         String sysdate = dbAdapter.getDateTimeFunction();
         // create a record in xml_revisions table
         // for that document as selected from xml_documents
         PreparedStatement pstmt = conn.prepareStatement(

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 956

Added by Jing Tao almost 23 years ago