/src/edu/ucsb/nceas/metacat/DocumentImpl.java - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 734

Added by bojilova almost 23 years ago

- changes to expect revisionid to come from the client on INSERT/UPDATE/DELETE;
now the client should send accession# as:
sitecode.uniqueid.revisionid
INSERT checks if sitecode.uniqueid part does not exist in xml_documents and xml_revisions and revisionid=1
UPDATE/DELETE check if sitecode.uniqueid part is in xml_document and revisionid is the recent number
- keep the old implementation where the client can send accession# without revisionid

+        }
+      }
     // DOCTITLE attr cleared from the db
     //  /**
     //   * Get the document title
     //   */
     //  public String getTitle() {
     //    return doctitle;
     //  }
     // DOCTITLE attr cleared from the db
     //  /**
     //   * Set the document title
     //   *
     //   * @param title the new title for the document
     //   */
     //  public void setTitle( String title ) {
     //    this.doctitle = title;
     //    try {
     //      PreparedStatement pstmt;
     //      pstmt = conn.prepareStatement(
     //            "UPDATE xml_documents " +
     //            " SET doctitle = ? " +
     //            "WHERE docid = ?");
     //
     //      // Bind the values to the query
     //      pstmt.setString(1, doctitle);
     //      pstmt.setString(2, docid);
     //
     //      // Do the insertion
     //      pstmt.execute();
     //      pstmt.close();
     //    } catch (SQLException e) {
     //      System.out.println("Error in DocumentImpl.setTitle: " + e.getMessage());
     //    }
     //  }
       /**
        * Write an XML file to the database, given a filename
+       *
-...
        * @param xml the xml stream to be loaded into the database
        * @param pub flag for public "read" access on xml document
        * @param dtd the dtd to be uploaded on server's file system
        * @param action the action to be performed (INSERT OR UPDATE)
        * @param docid the docid to use for the INSERT OR UPDATE
        * @param action the action to be performed (INSERT or UPDATE)
        * @param accnum the docid + rev# to use on INSERT or UPDATE
        * @param user the user that owns the document
        * @param group the group to which user belongs
        * @param serverCode the serverid from xml_replication on which this document
-...
        */
       public static String write( Connection conn,Reader xml,String pub,Reader dtd,
                                   String action, String docid, String user,
                                   String action, String accnum, String user,
                                   String group, int serverCode, boolean override,
                                   boolean validate)
                     throws Exception
+      {
         //MOVED DOWN IN RelationHandler obj before write of relations
         //if(action.equals("UPDATE"))
         //{
         //  RelationHandler.deleteRelations(docid);
         //}
         String rev = "1";
         String docid = null;
         MetaCatUtil util = new MetaCatUtil();
         String sep = util.getOption("accNumSeparator");
         int updaterev;
         MetaCatUtil util = new MetaCatUtil();
             // Determine if the docid is OK for INSERT or UPDATE
         if ( accnum != null ) {
           // check the correctness of accnum;
           // split accnum in docid and rev in order to
           // preserve the current implementation of processing and storing,
           // but show the whole accnum to the client.
           DocumentIdentifier id = new DocumentIdentifier(accnum);
           docid = id.getIdentifier();
           rev = id.getRev();
           sep = id.getSeparator();
+        }
         // Determine if the docid,rev are OK for INSERT or UPDATE
         // Generate new docid on INSERT, if one is not provided.
         AccessionNumber ac = new AccessionNumber(conn);
         String newdocid = ac.generate(docid, action);
         docid = ac.generate(docid, rev, action);
         MetaCatUtil.debugMessage("action: " + action + " servercode: " +
                                  serverCode + " override: " + override);
-...
           //merge the differences manually.
           int istreamInt;
           char istreamChar;
           DocumentImpl newdoc = new DocumentImpl(conn, docid);
           updaterev = newdoc.getRev();
           // NOT NEEDED
           //DocumentImpl newdoc = new DocumentImpl(conn, docid);
           //updaterev = newdoc.getRev();
           String updaterev = rev;
           String server = MetacatReplication.getServer(serverCode);
           MetacatReplication.replLog("attempting to lock " + docid);
           MetacatReplication.replLog("attempting to lock " + accnum);
           URL u = new URL("http://" + server + "?action=getlock&updaterev=" +
                           updaterev + "&docid=" + docid);
           System.out.println("sending message: " + u.toString());
-...
           {//the lock was granted go ahead with the insert
             try
+            {
               MetacatReplication.replLog("lock granted for " + docid + " from " +
               MetacatReplication.replLog("lock granted for " + accnum + " from " +
                                           server);
               XMLReader parser = initializeParser(conn, action, newdocid, validate,
               XMLReader parser = initializeParser(conn, action, docid, validate,
                                                   user, group, pub, serverCode, dtd);
               conn.setAutoCommit(false);
               parser.parse(new InputSource(xml));
-...
             //to come get a copy from here.
             ForceReplicationHandler frh = new ForceReplicationHandler(docid);
             if ( (docid != null) && !(newdocid.equals(docid)) )
+            {
               return new String("New document ID generated:" + newdocid);
+            }
             else
+            {
               return newdocid;
+            }
             return (docid + sep + rev);
+          }
           else if(openingtag.equals("<filelocked>"))
           {//the file is currently locked by another user
            //notify our user to wait a few minutes, check out a new copy and try
            //again.
             //System.out.println("file locked");
             MetacatReplication.replLog("lock denied for " + docid + " on " +
             MetacatReplication.replLog("lock denied for " + accnum + " on " +
                                        server + " reason: file already locked");
             throw new Exception("The file specified is already locked by another " +
                                 "user.  Please wait 30 seconds, checkout the " +
-...
           {//our file is outdated.  notify our user to check out a new copy of the
            //file and merge his version with the new version.
             //System.out.println("outdated file");
             MetacatReplication.replLog("lock denied for " + docid + " on " +
             MetacatReplication.replLog("lock denied for " + accnum + " on " +
                                         server + " reason: local file outdated");
             throw new Exception("The file you are trying to update is an outdated" +
                                 " version.  Please checkout the newest document, " +
-...
           if ( !hasPermission(conn, user, group, docid) ) {
             throw new Exception("User " + user +
                   " does not have permission to update XML Document #" + docid);
                   " does not have permission to update XML Document #" + accnum);
+          }
+        }
         try
+        {
           XMLReader parser = initializeParser(conn, action, newdocid, validate,
           XMLReader parser = initializeParser(conn, action, docid, validate,
                                               user, group, pub, serverCode, dtd);
           conn.setAutoCommit(false);
           parser.parse(new InputSource(xml));
-...
         //force replicate out the new document to each server in our server list.
         if(serverCode == 1)
         { //start the thread to replicate this new document out to the other servers
           ForceReplicationHandler frh = new ForceReplicationHandler(newdocid,
                                                                     action);
           ForceReplicationHandler frh = new ForceReplicationHandler(docid, action);
+        }
         if ( (docid != null) && !(newdocid.equals(docid)) )
+        {
           return new String("New document ID generated:" + newdocid);
+        }
         else
+        {
           return newdocid;
+        }
         return (docid + sep + rev);
+      }
       /**
-...
+       *
        * @param docid the ID of the document to be deleted from the database
        */
       public static void delete( Connection conn, String docid,
       public static void delete( Connection conn, String accnum,
                                      String user, String group )
                     throws Exception {
         DocumentIdentifier id = new DocumentIdentifier(docid);
         docid = id.getSiteCode() + id.getSeparator() + id.getUniqueId();
                     throws Exception
+      {
         DocumentIdentifier id = new DocumentIdentifier(accnum);
         String docid = id.getIdentifier();
         String rev = id.getRev();
         // Determine if the docid is OK for DELETE
         // Determine if the docid,rev are OK for DELETE
         AccessionNumber ac = new AccessionNumber(conn);
         String newdocid = ac.generate(docid, "DELETE");
         docid = ac.generate(docid, rev, "DELETE");
         // check for 'write' permission for 'user' to delete this document
         if ( !hasPermission(conn, user, group, docid) ) {
           throw new Exception("User " + user +
                   " does not have permission to delete XML Document #" + docid);
                   " does not have permission to delete XML Document #" + accnum);
+        }
         conn.setAutoCommit(false);
-...
         //if the deleted document is a package document its relations should
         //no longer be active if it has been deleted from the system.
     //    MOVED UP IN THE TRANSACTION
     //    RelationHandler.deleteRelations(docid);
+      }
       /**

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 734

Added by bojilova almost 23 years ago