/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 779

Added by bojilova over 23 years ago

changes according to bug# 234 - metacat accession # handling, done

                                   boolean validate)
                     throws Exception
+      {
         int rev = 1;
         String docid = null;
         MetaCatUtil util = new MetaCatUtil();
         String sep = util.getOption("accNumSeparator");
     //    int rev = 1;
     //    String docid = null;
     //    MetaCatUtil util = new MetaCatUtil();
     //    String sep = util.getOption("accNumSeparator");
     /*
         if ( accnum != null ) {
           // check the correctness of accnum;
           // split accnum in docid and rev in order to
-...
           rev = (new Integer(id.getRev())).intValue();
           sep = id.getSeparator();
+        }
     */
         // OLD
         // 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);
         docid = ac.generate(docid, java.lang.String.valueOf(rev), action);
         //AccessionNumber ac = new AccessionNumber(conn);
         //docid = ac.generate(docid, java.lang.String.valueOf(rev), action);
         // NEW - WHEN CLIENT ALWAYS PROVIDE ACCESSION NUMBER INCLUDING REV IN IT
         AccessionNumber ac = new AccessionNumber(conn, accnum, action);
         String docid = ac.getDocid();
         String rev = ac.getRev();
         MetaCatUtil.debugMessage("action: " + action + " servercode: " +
                                  serverCode + " override: " + override);
-...
           //merge the differences manually.
           int istreamInt;
           char istreamChar;
           // NOT NEEDED
           //DocumentImpl newdoc = new DocumentImpl(conn, docid);
           //updaterev = newdoc.getRev();
           //String updaterev = rev;
           DocumentIdentifier id = new DocumentIdentifier(accnum);
           String updaterev = id.getRev();
           String server = MetacatReplication.getServer(serverCode);
           MetacatReplication.replLog("attempting to lock " + accnum);
           URL u = new URL("http://" + server + "?action=getlock&updaterev=" +
                           rev + "&docid=" + docid);
                           updaterev + "&docid=" + docid);
           System.out.println("sending message: " + u.toString());
           String serverResStr = MetacatReplication.getURLContent(u);
           String openingtag = serverResStr.substring(0, serverResStr.indexOf(">")+1);
-...
             //to come get a copy from here.
             ForceReplicationHandler frh = new ForceReplicationHandler(docid);
             rev++;
             return (docid + sep + rev);
             // OLD
             //rev++;
             //return (docid + sep + rev);
             return (accnum);
+          }
           else if(openingtag.equals("<filelocked>"))
-...
             throw new Exception("User " + user +
                   " does not have permission to update XML Document #" + accnum);
+          }
           rev++;
           //rev++;
+        }
         try
-...
           ForceReplicationHandler frh = new ForceReplicationHandler(docid, action);
+        }
         return (docid + sep + rev);
         //return (docid + sep + rev);
         return(accnum);
+      }
       /**
-...
                                      String user, String group )
                     throws Exception
+      {
         DocumentIdentifier id = new DocumentIdentifier(accnum);
         String docid = id.getIdentifier();
         String rev = id.getRev();
         // OLD
         //DocumentIdentifier id = new DocumentIdentifier(accnum);
         //String docid = id.getIdentifier();
         //String rev = id.getRev();
         // OLD
         // Determine if the docid,rev are OK for DELETE
         AccessionNumber ac = new AccessionNumber(conn);
         docid = ac.generate(docid, rev, "DELETE");
         //AccessionNumber ac = new AccessionNumber(conn);
         //docid = ac.generate(docid, rev, "DELETE");
         // NEW - WHEN CLIENT ALWAYS PROVIDE ACCESSION NUMBER INCLUDING REV IN IT
         AccessionNumber ac = new AccessionNumber(conn, accnum, "DELETE");
         String docid = ac.getDocid();
         String rev = ac.getRev();
         // check for 'write' permission for 'user' to delete this document
         if ( !hasPermission(conn, user, group, docid) ) {
           throw new Exception("User " + user +

       private Connection conn = null;
       private String sitecode = null;
       private String sep = null;
       private String docid = null;
       private String rev = null;
       /**
        * Construct an AccessionNumber
-...
       public AccessionNumber ()
              throws SQLException, ClassNotFoundException
+      {
         MetaCatUtil util = new MetaCatUtil();
         this.sitecode = util.getOption("sitecode");
         this.sep = util.getOption("accNumSeparator");
         // Open a connection to the database
         this.conn = util.openDBConnection();
         // Open a connection to the database from here
         this((new MetaCatUtil()).openDBConnection());
+      }
       /**
-...
        */
       public AccessionNumber (Connection conn)
+      {
         MetaCatUtil util = new MetaCatUtil();
         this.sitecode = util.getOption("sitecode");
         this.sep = util.getOption("accNumSeparator");
         this.sitecode = MetaCatUtil.getOption("sitecode");
         this.sep = MetaCatUtil.getOption("accNumSeparator");
         this.conn = conn;
+      }
       /** NEW - WHEN CLIENT ALWAYS PROVIDE ACCESSION NUMBER INCLUDING REV IN IT
        * Construct an AccessionNumber
+       *
        * @param conn the db connection to read Accession number from
        * @param accnum the accession number to be checked for validness
        */
       public AccessionNumber (Connection conn, String accnum, String action)
                              throws AccessionNumberException, SQLException
+      {
         this(conn);
         this.rev = null;
         this.docid = accnum;
         if ( accnum != null ) {
           int firstIndex = accnum.indexOf(this.sep);
           int lastIndex = accnum.lastIndexOf(this.sep);
           if ( firstIndex != lastIndex ) {
             //this docid contains a revision number
             this.rev = accnum.substring(lastIndex + 1);
             this.docid = accnum.substring(0, lastIndex);
+          }
+        }
         // INSERT
         if ( action.equals("INSERT")) {
           // check accession number for validness
           if ( docid == null ) {
             throw new AccessionNumberException("Accession number is required.");
           // rev is not provided; throw an exception to prevent the insertion
           } else if ( rev == null ) {
             throw new AccessionNumberException
                       ("Revision number is required and must be 1.");
           // docid is used; throw an exception to prevent the insertion
           } else if ( accNumberUsed(docid) ) {
             throw new AccessionNumberException
                       ("Accession number " + docid + " is already in use.");
           // rev is <> 1; throw an exception to prevent the insertion
           } else if ( !rev.equals("1") ) {
             throw new AccessionNumberException("Revision number must be 1.");
+          }
         // UPDATE or DELETE
         } else if ( action.equals("UPDATE") || action.equals("DELETE")) {
           String l_rev = "";
           // Accession# is not provided; throw an exception to prevent the action
           if ( docid == null ) {
             throw new AccessionNumberException("Accession number is required.");
           // rev is not provided; throw an exception to prevent the action
           } else if ( rev == null ) {
             throw new AccessionNumberException
                       ("Revision number is required.");
           // Accession# is not current (not in xml_documents); throw an exception
           } else if ( !accNumberIsCurrent(docid) ) {
             throw new AccessionNumberException
                       ("Document not found for Accession number " + docid);
           // Revision number is not the recent one; throw an exception
           } else if ( action.equals("UPDATE") &&
                       !rev.equals(l_rev = getNextRevision(docid)) ) {
             throw new AccessionNumberException
                       ("Next revision number must be "+ l_rev);
           // Revision number is not the recent one; throw an exception
           } else if ( action.equals("DELETE") &&
                       !rev.equals(l_rev = getLastRevision(docid)) ) {
             throw new AccessionNumberException
                       ("Last revision number is "+ l_rev);
+          }
+        }
+      }
       /**
        * Generate an Accession Number of form <sidecode>.<uniqueid>.<revisionid>
        * where <revisionid> is always 1.
-...
         return rev;
+      }
       // get the next revision number for docid
       private String getNextRevision(String docid) throws SQLException
+      {
         String rev = "";
         try {
           PreparedStatement pstmt;
           pstmt = conn.prepareStatement
                   ("SELECT rev+1 FROM xml_documents WHERE docid='" + docid + "'");
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           boolean hasRow = rs.next();
           rev = rs.getString(1);
           pstmt.close();
         } catch (SQLException e) {
           throw new SQLException(
           "Error on AccessionNumber.getNextRevision(): " + e.getMessage());
+        }
         return rev;
+      }
       /**
        * returns the docid encoded in this accession number
        */
       public String getDocid() {
         return this.docid;
+      }
       /**
        * returns the revision number encoded in this accession number
        */
       public String getRev()
+      {
         return this.rev;
+      }
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 779

Added by bojilova over 23 years ago