/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 6277

Added by ben leinfelder over 13 years ago

allow for provisional SystemMetadata records (provisional=true)

src/xmltables-oracle.sql
404	404	*/
405	405	CREATE TABLE systemMetadata (
406	406	guid VARCHAR2(2000), -- the globally unique string identifier
	407	provisional boolean, -- for reserving IDs
407	408	date_uploaded DATE, -- the date/time the document was first submitted
408	409	rights_holder VARCHAR2(250), --the user who has rights to the document, usually the first persons to upload it
409	410	checksum VARCHAR2(512), --the checksum of the doc using the given algorithm (see below)

      */
     CREATE TABLE systemMetadata (
     	guid   text,          -- the globally unique string identifier of the object that the system metadata describes
     	provisional boolean, -- for reserved identifiers
     	date_uploaded TIMESTAMP, -- the date/time the document was first submitted
     	rights_holder VARCHAR(250), --the user who has rights to the document, usually the first persons to upload it
     	checksum VARCHAR(512), --the checksum of the doc using the given algorithm (see below)
-...
      * ALTER TABLE systemMetadata DROP COLUMN rev;
      * ALTER TABLE systemMetadata ADD COLUMN replication_allowed boolean;
      * ALTER TABLE systemMetadata ADD COLUMN number_replicas INT8;
      * ALTER TABLE systemMetadata ADD COLUMN provisional boolean;
      */
     /*

     import org.dataone.service.types.Replica;
     import org.dataone.service.types.ReplicationPolicy;
     import org.dataone.service.types.ReplicationStatus;
     import org.dataone.service.types.Session;
     import org.dataone.service.types.Subject;
     import org.dataone.service.types.SystemMetadata;
-...
             } catch (McdbDocNotFoundException e) {
             	// try system metadata only
             	try {
             		idExists = systemMetadataExisits(guid);
             		boolean provisional = false;
             		idExists = systemMetadataExisits(guid, provisional);
                 } catch (McdbDocNotFoundException e2) {
                 	idExists = false;
+                }
-...
             return idExists;
+        }
         public boolean hasReservation(Identifier pid, Session session) {
         	// check if it was reserved
           	boolean reserved = false;
           	try {
         		// check that we reserved it
         		if (IdentifierManager.getInstance().systemMetadataExisits(pid.getValue(), true)) {
         	    	SystemMetadata provisionalMetadata = IdentifierManager.getInstance().getSystemMetadata(pid.getValue());
         	    	Subject rightsHolder = provisionalMetadata.getRightsHolder();
         	    	// TODO: check groups?
         	    	if (session.getSubject().equals(rightsHolder)) {
         	    		reserved = true;
+        	    	}
+        		}
         	} catch (McdbDocNotFoundException e) {
         		reserved = false;
+        	}
         	return reserved;
+          }
         /**
+         *
          * @param guid
-...
             return guid;
+        }
         public boolean systemMetadataExisits(String guid)
         public boolean systemMetadataExisits(String guid, boolean provisional)
     			throws McdbDocNotFoundException {
     		logMetacat.debug("looking up system metadata for guid " + guid);
     		boolean exists = false;
     		String query = "select guid from systemmetadata where guid = ?";
     		String query = "select guid from systemmetadata where guid = ? and provisional = ?";
     		DBConnection dbConn = null;
     		int serialNumber = -1;
-...
     			// Execute the insert statement
     			PreparedStatement stmt = dbConn.prepareStatement(query);
     			stmt.setString(1, guid);
     			stmt.setBoolean(2, provisional);
     			ResultSet rs = stmt.executeQuery();
     			if (rs.next()) {
     				exists = true;
-...
          */
         public void createSystemMetadata(SystemMetadata sysmeta) throws McdbDocNotFoundException
+        {
             insertSystemMetadata(sysmeta.getIdentifier().getValue());
         	String guid = sysmeta.getIdentifier().getValue();
         	// remove any provisional records -- it is the responsibility of the caller to check this
         	if (systemMetadataExisits(guid, true)) {
         		deleteSystemMetadata(guid);
+        	}
         	// insert the true record
             insertSystemMetadata(guid, false);
             updateSystemMetadata(sysmeta);
+        }
-...
          * create the systemmetadata record
          * @param guid
          */
         public void insertSystemMetadata(String guid)
         private void insertSystemMetadata(String guid, boolean provisional)
+        {
             int serialNumber = -1;
-...
                 serialNumber = dbConn.getCheckOutSerialNumber();
                 // Execute the insert statement
                 String query = "insert into " + TYPE_SYSTEM_METADATA + " (guid) values (?)";
                 String query = "insert into " + TYPE_SYSTEM_METADATA + " (guid, provisional) values (?, ?)";
                 PreparedStatement stmt = dbConn.prepareStatement(query);
                 stmt.setString(1, guid);
                 stmt.setBoolean(2, provisional);
                 logMetacat.debug("system metadata query: " + stmt.toString());
                 int rows = stmt.executeUpdate();
                 stmt.close();
             } catch (Exception e) {
                 e.printStackTrace();
                 logMetacat.error("Error while creating " + TYPE_SYSTEM_METADATA + " record: "
                         + e.getMessage());
                 logMetacat.error("Error while creating " + TYPE_SYSTEM_METADATA + " record: " + guid, e );
             } finally {
                 // Return database connection to the pool
                 DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+            }
+        }
         private void deleteSystemMetadata(String guid)
+        {
             int serialNumber = -1;
             DBConnection dbConn = null;
             try {
                 // Get a database connection from the pool
                 dbConn = DBConnectionPool.getDBConnection("IdentifierManager.insertSystemMetadata");
                 serialNumber = dbConn.getCheckOutSerialNumber();
                 // Execute the statement
                 String query = "delete from " + TYPE_SYSTEM_METADATA + " where guid = ? ";
                 PreparedStatement stmt = dbConn.prepareStatement(query);
                 stmt.setString(1, guid);
                 logMetacat.debug("delete system metadata: " + stmt.toString());
                 int rows = stmt.executeUpdate();
                 stmt.close();
             } catch (Exception e) {
                 e.printStackTrace();
                 logMetacat.error("Error while deleting " + TYPE_SYSTEM_METADATA + " record: " + guid, e );
             } finally {
                 // Return database connection to the pool
                 DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+            }
+        }
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 6277

Added by ben leinfelder over 13 years ago