Changeset 5515

Timestamp:

08/01/14 14:53:52 (10 years ago)

Author:

Twan Goosen

Message:

PIDs are now based on the VC ID.
Fixes #596

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src

Files:

• main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProvider.java (modified) (2 diffs)
• test/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProviderTest.java (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProvider.java

@@ -10 +10 @@
 import java.util.Map;
 import java.util.UUID;
+import java.util.zip.CRC32;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.httpclient.HttpException;
 import org.slf4j.Logger;
@@ -55 +57 @@
         final Map<HandleField, String> fieldMap = createPIDFieldMap(vc);
         try {
-            final String requestedPid = "VCR-" + UUID.randomUUID().toString();
+            final String requestedPid = String.format("VCR-%05d", vc.getId());
             final String pid = pidWriter.registerNewPID(configuration, fieldMap, requestedPid);
             return new PersistentIdentifier(vc, PersistentIdentifier.Type.HANDLE, pid);

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/test/java/eu/clarin/cmdi/virtualcollectionregistry/pid/EPICPersistentIdentifierProviderTest.java

@@ -55 +55 @@
                                 hasEntry(HandleField.CREATOR, "Joe Unit")
                         ),
-                        startsWith("VCR-")
+                        equalTo("VCR-00123")
                 );
-                will(returnValue("9999/VCR-1234-567"));
+                will(returnValue("9999/VCR-00123"));
             }
         });
 
         PersistentIdentifier result = instance.createIdentifier(vc);
-        assertEquals("9999/VCR-1234-567", result.getIdentifier());
+        assertEquals("9999/VCR-123", result.getIdentifier());
         assertEquals(Type.HANDLE, result.getType());
     }