[Gzz-commits] storm/org/nongnu/storm pointers/PointerId.java ...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/05/09 14:35:04

Modified files:
        org/nongnu/storm/pointers: PointerId.java PointerIndex.java 
        org/nongnu/storm/util: HTTPProxy.java 

Log message:
        Show pointers from the pool on HTTP gateway frontpage

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/pointers/PointerId.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/pointers/PointerIndex.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/HTTPProxy.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/pointers/PointerId.java
diff -u storm/org/nongnu/storm/pointers/PointerId.java:1.3 
storm/org/nongnu/storm/pointers/PointerId.java:1.4
--- storm/org/nongnu/storm/pointers/PointerId.java:1.3  Fri May  9 12:42:23 2003
+++ storm/org/nongnu/storm/pointers/PointerId.java      Fri May  9 14:35:03 2003
@@ -54,9 +54,7 @@
     private byte[] bytes;
     private String randomPart;
 
-    public PointerId(String uri) 
-       throws IllegalArgumentException, InvalidKeyException,
-              InvalidKeySpecException {
+    public PointerId(String uri) throws IllegalArgumentException {
        uri = uri.toLowerCase().intern();
        this.uri = uri;
        
Index: storm/org/nongnu/storm/pointers/PointerIndex.java
diff -u storm/org/nongnu/storm/pointers/PointerIndex.java:1.3 
storm/org/nongnu/storm/pointers/PointerIndex.java:1.4
--- storm/org/nongnu/storm/pointers/PointerIndex.java:1.3       Fri May  9 
12:42:23 2003
+++ storm/org/nongnu/storm/pointers/PointerIndex.java   Fri May  9 14:35:03 2003
@@ -27,6 +27,7 @@
  */
 package org.nongnu.storm.pointers;
 import org.nongnu.storm.*;
+import org.nongnu.storm.impl.AsyncSetCollector;
 import java.util.*;
 import com.bitzi.util.*;
 import java.io.*;
@@ -44,6 +45,22 @@
     protected IndexedPool pool;
     protected IndexedPool.DB db;
 
+    public Collector getIds() throws IOException {
+       Collector c = db.get("");
+       final AsyncSetCollector result = new AsyncSetCollector();
+       c.addCollectionListener(new CollectionListener() {
+               public boolean item(Object item) {
+                   IndexedPool.Mapping m = (IndexedPool.Mapping)item;
+                   result.receive(new PointerId(m.value));
+                   return true;
+               }
+               public void finish(boolean timeout) {
+                   result.finish(timeout);
+               }
+           });
+       return result;
+    }
+
     public BlockId get(PointerId id) 
        throws IOException, GeneralSecurityException {
        if(dbg) p("Get: "+id);
@@ -124,11 +141,20 @@
                return Collections.EMPTY_SET;
            }
 
-           return Collections.singleton
-               (new IndexedPool.Mapping(block.getId(),
-                                        p.getPointer().toString(),
-                                        ""+p.getTimestamp()));
-                                        
+           Set mappings = new HashSet();
+
+           // Mapping pointer id -> pointer blocks
+           // for resolving a pointer
+           mappings.add(new IndexedPool.Mapping(block.getId(),
+                                                p.getPointer().toString(),
+                                                ""+p.getTimestamp()));
+
+           // Mapping "" -> pointer id
+           // for finding all pointers
+           mappings.add(new IndexedPool.Mapping(block.getId(), "",
+                                                p.getPointer().toString()));
+
+           return mappings;
        }
 
        public Object createIndex(IndexedPool pool,
Index: storm/org/nongnu/storm/util/HTTPProxy.java
diff -u storm/org/nongnu/storm/util/HTTPProxy.java:1.29 
storm/org/nongnu/storm/util/HTTPProxy.java:1.30
--- storm/org/nongnu/storm/util/HTTPProxy.java:1.29     Fri May  9 11:52:47 2003
+++ storm/org/nongnu/storm/util/HTTPProxy.java  Fri May  9 14:35:04 2003
@@ -204,19 +204,31 @@
            
            writeRewriteLinks(w, rewrite);
 
+           PointerIndex pIndex = 
+               (PointerIndex)pool.getIndex(PointerIndex.uri);
+
            SetCollector ids = pool.getIds();
+           Collector pIds = pIndex.getIds();
 
            try {
                // wait for DHT to receive information from network
                Thread.sleep(2000);
            } catch(InterruptedException _) {}
 
-           System.out.println("start recv'n");
+           synchronized(pIds) {
+               for(Iterator i=pIds.iterator(); i.hasNext();) {
+                   PointerId id = (PointerId)i.next();
+                   String s = id.getURI();
+                   if(rewrite) s = base + s;
+                   w.write("<a href=\""+s+"\">"+id+"</a><br>\n");
+               }
+           }
+
+           w.write("<p>");
 
            synchronized(ids) {
                for(Iterator i=ids.iterator(); i.hasNext();) {
                    BlockId id = (BlockId)i.next();
-                   System.out.println("recvd: "+id);
                    String s = id.getURI();
                    if(rewrite) s = base + s;
                    w.write("<a href=\""+s+"\">"+id+"</a><br>\n");