weighted-multi relevance.

goverdata · Nov 12, 2012 · fc3f498 · fc3f498
1 parent 3ff206b
commit fc3f498
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/sensei-core/src/main/antlr3/com/senseidb/bql/parsers/BQL.g b/sensei-core/src/main/antlr3/com/senseidb/bql/parsers/BQL.g
@@ -2743,7 +2743,9 @@ relevance_model returns [String functionBody, JSONObject json]
                 for (String facet: _usedFacets) {
                     funcParams.put(facet);
                     String[] facetInfo = _facetInfoMap.get(facet);
-                    String typeName = (facetInfo[0].equals("multi") ? "m" : "")
+                    String typeName = (facetInfo[0].equals("multi") ? "m" :
+                                       (facetInfo[0].equals("weighted-multi") ? "wm" : "")
+                                      )
                                       + _facetInfoMap.get(facet)[1];
                     JSONArray facetsWithSameType = facets.optJSONArray(typeName);
                     if (facetsWithSameType == null) {

diff --git a/sensei-core/src/main/java/com/senseidb/search/relevance/impl/CompilationHelper.java b/sensei-core/src/main/java/com/senseidb/search/relevance/impl/CompilationHelper.java
@@ -261,8 +261,8 @@ public class CompilationHelper
     /* 29 */ "  com.senseidb.search.relevance.impl.WeightedMFacetLong %s = (com.senseidb.search.relevance.impl.WeightedMFacetLong) mFacetLongs[%d];",
     /* 30 */ "  com.senseidb.search.relevance.impl.WeightedMFacetDouble %s = (com.senseidb.search.relevance.impl.WeightedMFacetDouble) mFacetDoubles[%d];",
     /* 31 */ "  com.senseidb.search.relevance.impl.WeightedMFacetFloat %s = (com.senseidb.search.relevance.impl.WeightedMFacetFloat) mFacetFloats[%d];",
-    /* 32 */ "  com.senseidb.search.relevance.impl.WeightedMFacetString %s = (com.senseidb.search.relevance.impl.WeightedMFacetShort) mFacetStrings[%d];",
-    /* 33 */ "  com.senseidb.search.relevance.impl.WeightedMFacetShort %s = (com.senseidb.search.relevance.impl.WeightedMFacetString) mFacetShorts[%d];",
+    /* 32 */ "  com.senseidb.search.relevance.impl.WeightedMFacetString %s = (com.senseidb.search.relevance.impl.WeightedMFacetString) mFacetStrings[%d];",
+    /* 33 */ "  com.senseidb.search.relevance.impl.WeightedMFacetShort %s = (com.senseidb.search.relevance.impl.WeightedMFacetShort) mFacetShorts[%d];",
     /* 34 */ "  %s %s = (%s) objs[%d];"
   };
 
@@ -571,7 +571,7 @@ public static CustomMathModel createCustomMathScorer(JSONObject jsonModel, DataT
         catch (CannotCompileException e)
         {
           logger.info(e.getMessage());
-          throw new RelevanceException(ErrorType.JsonCompilationError, "Compilation error of json relevance model.", e);
+          throw new RelevanceException(ErrorType.JsonCompilationError, e.getMessage(), e);
         }
 
         Class h;

diff --git a/sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java b/sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java
@@ -283,7 +283,7 @@ private void handleSenseiRequest(HttpServletRequest req, HttpServletResponse res
     }
     finally
     {
-      if (queryLogger.isInfoEnabled() && requestContext.query != null)
+      if (queryLogger.isInfoEnabled() && requestContext != null && requestContext.query != null)
       {
         queryLogger.info(String.format("hits(%d/%d) took %dms: %s", numHits, totalDocs, System.currentTimeMillis() - time, requestContext.query));
       }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         finally
         {
-          if (queryLogger.isInfoEnabled() && requestContext.query != null)
+          if (queryLogger.isInfoEnabled() && requestContext != null && requestContext.query != null)
           {
             queryLogger.info(String.format("hits(%d/%d) took %dms: %s", numHits, totalDocs, System.currentTimeMillis() - time, requestContext.query));
           }
@@ Expand Down @@