Changeset 307

Timestamp:

02/19/10 06:56:50 (5 months ago)

Author:

jgao

Message:

Add isFreeAttributeSearchSupported() to AttributeMapper?

Location:

trunk

Files:

• corelib/src/org/bridgedb/AttributeMapper.java (modified) (1 diff)
• corelib/src/org/bridgedb/IDMapperStack.java (modified) (2 diffs)
• corelib/src/org/bridgedb/rdb/SimpleGdbImpl2.java (modified) (1 diff)
• corelib/src/org/bridgedb/rdb/SimpleGdbImpl3.java (modified) (1 diff)
• corelib/src/org/bridgedb/webservice/biomart/IDMapperBiomart.java (modified) (1 diff)
• corelib/src/org/bridgedb/webservice/bridgerest/BridgeRest.java (modified) (1 diff)
• picr/src/org/bridgedb/webservice/picr/IDMapperPicr.java (modified) (1 diff)

trunk/corelib/src/org/bridgedb/AttributeMapper.java

@@ -44 +44 @@
         public Map<String, Set<String>> getAttributes(Xref ref) throws IDMapperException;
 
+        /**
+         *
+         * @return true if free attribute search is supported, false otherwise.
+         */
+        public boolean isFreeAttributeSearchSupported();
+
         /**
          * free text search for matching symbols.

trunk/corelib/src/org/bridgedb/IDMapperStack.java

@@ -341 +341 @@
         }
 
+        /**
+         * @return true if free attribute search is supported by one of the children
+         */
+        public boolean isFreeAttributeSearchSupported()
+        {
+                // returns true if any returns true
+                // TODO: not sure if this is the right logic?
+                for (IDMapper child : IDMapperStack.this.gdbs)
+                {
+                        if (child != null && child instanceof AttributeMapper)
+                        {
+                                if (((AttributeMapper)child).isFreeAttributeSearchSupported())
+                                        return true;
+                        }
+                }
+                return false;
+        }
+
         /** {@inheritDoc} */
         public Map<Xref, String> freeAttributeSearch (String query, String attrType, int limit) throws IDMapperException
@@ -347 +365 @@
                 for (IDMapper child : gdbs)
                 {
-                        if (child != null && child instanceof AttributeMapper && child.isConnected())
+                        if (child != null && child instanceof AttributeMapper && child.isConnected()
+                                && ((AttributeMapper)child).isFreeAttributeSearchSupported())
                         {
                                 Map<Xref, String> childResult = 

trunk/corelib/src/org/bridgedb/rdb/SimpleGdbImpl2.java

@@ -661 +661 @@
 
         /**
+         *
+         * @return true
+         */
+        public boolean isFreeAttributeSearchSupported()
+        {
+                return true;
+        }
+
+        /**
          * free text search for matching symbols.
          * @return references that match the query

trunk/corelib/src/org/bridgedb/rdb/SimpleGdbImpl3.java

@@ -581 +581 @@
                 } catch (SQLException e) { throw new IDMapperException ("Xref:" + ref, e); } // Database unavailable
         }
+
+        /**
+         *
+         * @return true
+         */
+        public boolean isFreeAttributeSearchSupported()
+        {
+                return true;
+        }
         
         /**

trunk/corelib/src/org/bridgedb/webservice/biomart/IDMapperBiomart.java

@@ -370 +370 @@
 
     /**
+     *
+     * @return false
+     */
+    public boolean isFreeAttributeSearchSupported()
+    {
+        return false;
+    }
+
+    /**
      * {@inheritDoc}
      */

trunk/corelib/src/org/bridgedb/webservice/bridgerest/BridgeRest.java

@@ -409 +409 @@
         }
 
+        /**
+         *
+         * @return true
+         */
+        public boolean isFreeAttributeSearchSupported()
+        {
+                return true;
+        }
+
         /** {@inheritDoc} */
         public Map<Xref, String> freeAttributeSearch(String query, String attrType,

trunk/picr/src/org/bridgedb/webservice/picr/IDMapperPicr.java

@@ -202 +202 @@
         }
 
+        /**
+         *
+         * @return false
+         */
+        public boolean isFreeAttributeSearchSupported()
+        {
+                return false;
+        }
+
         public Map<Xref, String> freeAttributeSearch(String query, String attrType,
                         int limit) throws IDMapperException