[Gzz-commits] storm/org/nongnu/storm BlockId.java BlockId.tes...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/04/08 04:03:32

Modified files:
        org/nongnu/storm: BlockId.java BlockId.test StormPool.meta 

Log message:
        port dirpool

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/StormPool.meta.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/BlockId.java
diff -u storm/org/nongnu/storm/BlockId.java:1.7 
storm/org/nongnu/storm/BlockId.java:1.8
--- storm/org/nongnu/storm/BlockId.java:1.7     Mon Apr  7 15:23:56 2003
+++ storm/org/nongnu/storm/BlockId.java Tue Apr  8 04:03:32 2003
@@ -33,8 +33,8 @@
 /** The URN of a Storm block.
  */
 public final class BlockId {
-    private static String PREFIX = "urn:x-storm:1.0:";
-    private static int PREFIX_LEN = PREFIX.length();
+    public static String PREFIX = "urn:x-storm:1.0:";
+    public static int PREFIX_LEN = PREFIX.length();
 
     public static class WrongIdException extends IOException {
        public WrongIdException(String s) { super(s); }
@@ -77,6 +77,13 @@
     public byte[] getSha1() { return sha1; }
     public byte[] getTigerTree() { return tigertree; }
     public String getContentType() { return contentType; }
+
+    /** Get the hash part with the dot, 
+     *  i.e. everything after the comma.
+     */
+    public String getBitprint() {
+       return uri.substring(uri.lastIndexOf(',')+1);
+    }
 
     public String getURI() { return uri; }
     public String toString() { return uri; }
Index: storm/org/nongnu/storm/BlockId.test
diff -u storm/org/nongnu/storm/BlockId.test:1.4 
storm/org/nongnu/storm/BlockId.test:1.5
--- storm/org/nongnu/storm/BlockId.test:1.4     Mon Apr  7 15:23:56 2003
+++ storm/org/nongnu/storm/BlockId.test Tue Apr  8 04:03:32 2003
@@ -68,6 +68,13 @@
     assert id_2 == get('application/Octet-Stream', data_2) != id_3
     assert id_3 == get('text/plain', data_3) != id_2
 
+def testGetBitprint():
+    id_1 = BlockId(uri_1)
+    assert id_1.getBitprint() == (
+        "QLFYWY2RI5WZCTEP6MJKR5CAFGP7FQ5X."
+        "VEKXTRSJPTZJLY2IKG5FQ2TCXK26SECFPP4DX7I").lower()
+
+
 def check(id, data):
     try: id.check(data)
     except BlockId.WrongIdException: return 0
Index: storm/org/nongnu/storm/StormPool.meta
diff -u storm/org/nongnu/storm/StormPool.meta:1.4 
storm/org/nongnu/storm/StormPool.meta:1.5
--- storm/org/nongnu/storm/StormPool.meta:1.4   Mon Apr  7 19:27:54 2003
+++ storm/org/nongnu/storm/StormPool.meta       Tue Apr  8 04:03:32 2003
@@ -38,6 +38,7 @@
     Create a new block in the pool, request it from the pool by ID,
     check its body (contents) and its Content-Type.
     """
+
     bos = pool.getBlockOutputStream("text/plain")
 
     assert bos.getContentType() == 'text/plain'