/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5453

Added by berkley over 14 years ago

still working on getting guid problems fixed with replication

                 if(isScienceMetadata)
+                {
                     //update the doc
                     updateDocument(object, obsoletedGuid, guid, sessionData);
                     updateDocument(object, obsoletedGuid, guid, sessionData, false);
+                }
                 else
+                {
-...
             Identifier sysMetaGuid = new Identifier();
             sysMetaGuid.setValue(DocumentUtil.generateDocumentId(1));
             sysmeta.setDateSysMetadataModified(new Date());
             System.out.println("****inserting new system metadata with modified date " + sysmeta.getDateSysMetadataModified());
             System.out.println("****inserting new system metadata with modified date " +
                     sysmeta.getDateSysMetadataModified());
             String xml = new String(serializeSystemMetadata(sysmeta).toByteArray());
             System.out.println("sysmeta: " + xml);
             String localId = insertDocument(xml, sysMetaGuid, sessionData);
             String localId = insertDocument(xml, sysMetaGuid, sessionData, true);
             System.out.println("sysmeta inserted with localId " + localId);
             //insert the system metadata doc id into the identifiers table to
             //insert the system metadata doc id into the systemmetadata table to
             //link it to the data or metadata document
             IdentifierManager.getInstance().createSystemMetadataMapping(
                     sysmeta.getIdentifier().getValue(), sysMetaGuid.getValue());
-...
                 String xml = new String(serializeSystemMetadata(sm).toByteArray());
                 Identifier id = new Identifier();
                 id.setValue(smId);
                 String localId = updateDocument(xml, id, null, sessionData);
                 String localId = updateDocument(xml, id, null, sessionData, true);
                 IdentifierManager.getInstance().updateSystemMetadataMapping(sm.getIdentifier().getValue(), localId);
+            }
             catch(Exception e)
-...
+            }
+        }
         private String insertDocument(String xml, Identifier guid, SessionData sessionData)
             throws ServiceFailure
+        {
             return insertDocument(xml, guid, sessionData, false);
+        }
         /**
          * insert a document
          * NOTE: this method shouldn't be used from the update or create() methods.
          * we shouldn't be putting the science metadata or data objects into memory.
          */
         private String insertDocument(String xml, Identifier guid, SessionData sessionData)
         private String insertDocument(String xml, Identifier guid, SessionData sessionData,
                 boolean isSystemMetadata)
             throws ServiceFailure
+        {
             return insertOrUpdateDocument(xml, guid, sessionData, "insert");
             return insertOrUpdateDocument(xml, guid, sessionData, "insert", isSystemMetadata);
+        }
         /**
-...
          * NOTE: this method shouldn't be used from the update or create() methods.
          * we shouldn't be putting the science metadata or data objects into memory.
          */
         private String updateDocument(String xml, Identifier obsoleteGuid, Identifier guid, SessionData sessionData)
         private String updateDocument(String xml, Identifier obsoleteGuid,
                 Identifier guid, SessionData sessionData, boolean isSystemMetadata)
             throws ServiceFailure
+        {
             return insertOrUpdateDocument(xml, obsoleteGuid, sessionData, "update");
             return insertOrUpdateDocument(xml, obsoleteGuid, sessionData, "update", isSystemMetadata);
+        }
         /**
          * update a document from a stream
          */
         private String updateDocument(InputStream is, Identifier obsoleteGuid, Identifier guid, SessionData sessionData)
         private String updateDocument(InputStream is, Identifier obsoleteGuid,
                 Identifier guid, SessionData sessionData, boolean isSystemMetadata)
           throws IOException, ServiceFailure
+        {
             //HACK: change this eventually.  we should not be converting the stream to a string
             String xml = IOUtils.toString(is);
             String localId = updateDocument(xml, obsoleteGuid, guid, sessionData);
             String localId = updateDocument(xml, obsoleteGuid, guid, sessionData, isSystemMetadata);
             IdentifierManager im = IdentifierManager.getInstance();
             if(guid != null)
+            {
-...
         /**
          * insert a document, return the id of the document that was inserted
          */
         protected String insertOrUpdateDocument(String xml, Identifier guid, SessionData sessionData, String insertOrUpdate)
         protected String insertOrUpdateDocument(String xml, Identifier guid,
                 SessionData sessionData, String insertOrUpdate, boolean isSystemMetadata)
             throws ServiceFailure {
             logMetacat.debug("Starting to insert xml document...");
             IdentifierManager im = IdentifierManager.getInstance();
-...
             String localId = null;
             if(insertOrUpdate.equals("insert"))
+            {
                 localId = im.generateLocalId(guid.getValue(), 1);
                 localId = im.generateLocalId(guid.getValue(), 1, isSystemMetadata);
+            }
             else
+            {

+        {
             createGenericMapping(guid, localId, TYPE_IDENTIFIER);
+        }
         /**
+         *
          * @param guid
          * @param rev
          * @return
          */
         public String generateLocalId(String guid, int rev)
+        {
             return generateLocalId(guid, rev, false);
+        }
         /**
          * Given a global identifier (guid), create a suitable local identifier that
-...
          * @param rev the revision number to be used in the localId
          * @return String containing the localId to be used for Metacat operations
          */
         public String generateLocalId(String guid, int rev)
         public String generateLocalId(String guid, int rev, boolean isSystemMetadata)
+        {
             String localId = "";
             boolean conformsToDocidFormat = false;
-...
+            }
             // Register this new pair in the identifier mapping table
             createMapping(guid, localId);
             System.out.println("creating mapping in generateLocalId");
             if(!isSystemMetadata)
             { //don't do this if we're generating for system metadata
                 createMapping(guid, localId);
+            }
             return localId;
+        }
-...
          * @param type
          */
         private void createGenericMapping(String guid, String localId, String type)
+        {
+        {
             if(!type.equals(TYPE_IDENTIFIER) &&
             !type.equals(TYPE_SYSTEM_METADATA))
+            {

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5453

Added by berkley over 14 years ago