Add support for multiple labels in shortestPath() function

Resolves: #7842
orientechnologies · Oct 23, 2017 · 815ca3c · 815ca3c
1 parent b549752
commit 815ca3c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/.../main/java/com/orientechnologies/orient/graph/sql/functions/OSQLFunctionShortestPath.java b/.../main/java/com/orientechnologies/orient/graph/sql/functions/OSQLFunctionShortestPath.java
@@ -46,7 +46,7 @@
  */
 @Deprecated
 public class OSQLFunctionShortestPath extends OSQLFunctionMathAbstract {
-  public static final String NAME = "shortestPath";
+  public static final String NAME            = "shortestPath";
   public static final String PARAM_MAX_DEPTH = "maxDepth";
 
   protected static final float DISTANCE = 1f;
@@ -123,7 +123,16 @@ public List<ORID> call(final OrientBaseGraph graph) {
         if (iParams.length > 3) {
           ctx.edgeType = iParams[3] == null ? null : "" + iParams[3];
         }
-        ctx.edgeTypeParam = new String[] { ctx.edgeType };
+        if (iParams != null && iParams.length > 2 && iParams[3] instanceof Collection) {
+          ctx.edgeTypeParam = new String[((Collection) iParams[3]).size()];
+          Collection coll = (Collection) iParams[3];
+          int i = 0;
+          for (Object o : coll) {
+            ctx.edgeTypeParam[i++] = "" + o;
+          }
+        } else {
+          ctx.edgeTypeParam = new String[] { ctx.edgeType };
+        }
 
         if (iParams.length > 4) {
           bindAdditionalParams(iParams[4], ctx);