svn commit: r535914 - in /lucene/solr/trunk/src: java/org/apache/solr/request/RequiredSolrParams.java java/org/apache/solr/request/SolrParams.java test/org/apache/solr/util/SolrParamTest.java

[ry...@apache.org]

Author: ryan
Date: Mon May  7 09:03:02 2007
New Revision: 535914

URL: http://svn.apache.org/viewvc?view=rev&rev=535914
Log:
SOLR-228 -- adding missing functions to SolrParams
 getFieldFloat(String field, String param, float def)
 getFieldParam(String field, String param, String def)
 

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java
    lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java
    lucene/solr/trunk/src/test/org/apache/solr/util/SolrParamTest.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java?view=diff&rev=535914&r1=535913&r2=535914
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java Mon May  7 09:03:02 2007
@@ -106,4 +106,14 @@
   public boolean getFieldBool(String field, String param, boolean def) {
     return params.getFieldBool(field, param, def);
   }
+
+  @Override
+  public float getFieldFloat(String field, String param, float def) {
+    return params.getFieldFloat(field, param, def);
+  }
+
+  @Override
+  public String getFieldParam(String field, String param, String def) {
+    return params.getFieldParam(field, param, def);
+  }
 }

Modified: lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java?view=diff&rev=535914&r1=535913&r2=535914
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java Mon May  7 09:03:02 2007
@@ -196,6 +196,14 @@
     return val!=null ? val : get(param);
   }
 
+  /** returns the String value of the field parameter, "f.field.param", or
+   *  the value for "param" if that is not set.  If that is not set, def
+   */
+  public String getFieldParam(String field, String param, String def) {
+    String val = get(fpname(field,param));
+    return val!=null ? val : get(param, def);
+  }
+  
   /** returns the String values of the field parameter, "f.field.param", or
    *  the values for "param" if that is not set.
    */
@@ -299,6 +307,29 @@
     }
   }
 
+  /** Returns the float value of the field param. */
+  public Float getFieldFloat(String field, String param) {
+    String val = getFieldParam(field, param);
+    try {
+      return val==null ? null : Float.valueOf(val);
+    }
+    catch( Exception ex ) {
+      throw new SolrException( 400, ex.getMessage(), ex );
+    }
+  }
+
+  /** Returns the float value of the field param,
+  or the value for param, or def if neither is set. */
+  public float getFieldFloat(String field, String param, float def) {
+    String val = getFieldParam(field, param);
+    try {
+      return val==null ? def : Float.parseFloat(val);
+    }
+    catch( Exception ex ) {
+      throw new SolrException( 400, ex.getMessage(), ex );
+    }
+  }
+  
   /** how to transform a String into a boolean... more flexible than
    * Boolean.parseBoolean() to enable easier integration with html forms.
    */
@@ -362,6 +393,7 @@
     return result;
   }
 }
+
 
 
 

Modified: lucene/solr/trunk/src/test/org/apache/solr/util/SolrParamTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/util/SolrParamTest.java?view=diff&rev=535914&r1=535913&r2=535914
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/util/SolrParamTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/util/SolrParamTest.java Mon May  7 09:03:02 2007
@@ -82,7 +82,8 @@
     assertEquals( pstr   , params.getFieldParam( "fl", "str"  ) );
     assertEquals( pbool  , params.getFieldBool(  "fl", "bool" ) );
     assertEquals( pint   , params.getFieldInt(   "fl", "int"  ) );
-
+    assertEquals( pfloat , params.getFieldFloat( "fl", "float" ) );
+    
     // Test field defaulting (fall through to non-field-specific value)
     assertEquals( pint   , params.getFieldInt( "fff",  "int"      ) );
     
@@ -112,6 +113,8 @@
     assertEquals( pfloat.floatValue()   , params.getFloat(     "xxx", pfloat  ) );
     assertEquals( pbool.booleanValue()  , params.getFieldBool( "xxx", "bool", pbool ) );
     assertEquals( pint.intValue()       , params.getFieldInt(  "xxx", "int", pint  ) );
+    assertEquals( pfloat.floatValue()   , params.getFieldFloat("xxx", "float", pfloat  ) );
+    assertEquals( pstr                  , params.getFieldParam("xxx", "str", pstr  ) );
 
     // Required params testing uses decorator
     final SolrParams required = params.required();