Changeset 322

Timestamp:

02/27/10 20:48:19 (2 years ago)

Author:

martijn

Message:

Added contents page, to get a list of available organisms. Fixes #37

Location:

trunk

Files:

• org.bridgedb.rdb/src/org/bridgedb/rdb/GdbProvider.java (modified) (2 diffs)
• org.bridgedb.server/src/org/bridgedb/server/Config.java (modified) (2 diffs)
• org.bridgedb.server/src/org/bridgedb/server/Contents.java (copied) (copied from trunk/org.bridgedb.server/src/org/bridgedb/server/Config.java) (1 diff)
• org.bridgedb.server/src/org/bridgedb/server/IDMapperService.java (modified) (2 diffs)

trunk/org.bridgedb.rdb/src/org/bridgedb/rdb/GdbProvider.java

@@ -25 +25 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.bridgedb.BridgeDb;
@@ -42 +43 @@
         Map<Organism, List<IDMapper>> organism2gdb = new HashMap<Organism, List<IDMapper>>();
         List<IDMapper> globalGdbs = new ArrayList<IDMapper>();
+        
+        public Set<Organism> getOrganisms()
+        {
+                return organism2gdb.keySet();
+        }
         
         public void addOrganismGdb(Organism organism, IDMapper gdb) {

trunk/org.bridgedb.server/src/org/bridgedb/server/Config.java

@@ -5 +5 @@
 import org.bridgedb.BridgeDb;
 import org.bridgedb.rdb.GdbProvider;
+import org.bridgedb.bio.Organism;
 import org.restlet.data.Status;
 import org.restlet.resource.Get;
@@ -21 +22 @@
                 result.append ("java.version\t" + System.getProperty("java.version") + "\n");           
                 result.append ("bridgedb.version\t" + props.getProperty("bridgedb.version") + "\n");
-                result.append ("bridgedb.revision\t" + props.getProperty("REVISION") + "\n");
+                result.append ("bridgedb.revision\t" + props.getProperty("REVISION") + "\n");           
                     return result.toString();
                 } 

trunk/org.bridgedb.server/src/org/bridgedb/server/Contents.java

@@ -5 +5 @@
 import org.bridgedb.BridgeDb;
 import org.bridgedb.rdb.GdbProvider;
+import org.bridgedb.bio.Organism;
 import org.restlet.data.Status;
 import org.restlet.resource.Get;
 import org.restlet.resource.ServerResource;
 
-public class Config extends ServerResource
+public class Contents extends ServerResource
 {
         @Get
-        public String getConfig() 
+        public String getContents() 
         {
                 try
                 {
-                        Properties props = new Properties();
-                        props.load (BridgeDb.class.getResourceAsStream("BridgeDb.properties"));                 
                 StringBuilder result = new StringBuilder();
-                result.append ("java.version\t" + System.getProperty("java.version") + "\n");           
-                result.append ("bridgedb.version\t" + props.getProperty("bridgedb.version") + "\n");
-                result.append ("bridgedb.revision\t" + props.getProperty("REVISION") + "\n");
+                for (Organism org : getGdbProvider().getOrganisms())
+                {
+                        result.append (org.shortName());
+                        result.append ("\t");
+                        result.append (org.latinName());
+                        result.append ("\n");
+                }               
                     return result.toString();
                 } 

trunk/org.bridgedb.server/src/org/bridgedb/server/IDMapperService.java

@@ -202 +202 @@
         public static final String URL_CONFIG = "/config";
 
+
+        /**
+         * URL pattern for getting a list of species loaded in the server.<BR>
+         * <code>
+         * /contents
+         * </code>
+         * @see Contents#getContents()
+         */
+        public static final String URL_CONTENTS = "/contents";
+
         /**
          * URL pattern for getting backpage HTML.<BR>
@@ -231 +241 @@
 
                 router.attach(URL_CONFIG, Config.class);
+                router.attach(URL_CONTENTS, Contents.class);
 
                 /* IDMapper methods */