[FIX] JNodes, fn:generate-id

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/func/fn/FnGenerateId.java

@@ -15,16 +15,6 @@ public final class FnGenerateId extends ContextFn {
   @Override
   public Str item(final QueryContext qc, final InputInfo ii) throws QueryException {
     final GNode node = toGNodeOrNull(context(qc), qc);
-    if(node == null) return Str.EMPTY;
-
-    final TokenBuilder tb = new TokenBuilder(Token.ID);
-    if(node instanceof final DBNode dbnode) {
-      tb.addInt(dbnode.data().dbid).add('d').addInt(dbnode.pre());
-    } else if(node instanceof final FNode fnode) {
-      tb.addInt(fnode.id);
-    } else {
-      tb.add('j').addInt(node.hashCode());
-    }
-    return Str.get(tb.finish());
+    return node != null ? Str.get(node.id()) : Str.EMPTY;
   }
 }

basex-core/src/main/java/org/basex/query/value/node/DBNode.java

@@ -118,6 +118,11 @@ public final int pre() {
     return pre;
   }
 
+  @Override
+  public final byte[] id() {
+    return Token.concat(Token.ID, data().dbid, 'd', pre());
+  }
+
   @Override
   public final byte[] string() {
     return data.atom(pre);

basex-core/src/main/java/org/basex/query/value/node/FNode.java

@@ -72,6 +72,11 @@ public boolean hasAttributes() {
     return false;
   }
 
+  @Override
+  public final byte[] id() {
+    return Token.concat(Token.ID, id);
+  }
+
   /**
    * Returns the string value for the specified nodes.
    * @param nodes nodes

basex-core/src/main/java/org/basex/query/value/node/GNode.java

@@ -66,6 +66,12 @@ public final boolean test(final QueryContext qc, final InputInfo ii, final long
    */
   public abstract int compare(GNode node);
 
+  /**
+   * Returns a node ID.
+   * @return ID
+   */
+  public abstract byte[] id();
+
   /**
    * Returns the root of a node (the topmost ancestor without parent node).
    * @return root node

basex-core/src/main/java/org/basex/query/value/node/JNode.java

@@ -156,13 +156,13 @@ private long index() {
     long i = index;
     if(i != -1) return i;
     if(parent.value instanceof final XQMap map) {
-      i = 1;
+      i = 0;
       for(final Item k : map.keys()) {
         if(JNodeTest.equals(k, key)) break;
         i++;
       }
     } else {
-      i = ((Itr) key).itr();
+      i = ((Itr) key).itr() - 1;
     }
     index = i;
     return i;
@@ -174,6 +174,15 @@ public int compare(final Item item, final Collation coll, final boolean transiti
     throw Util.notExpected();
   }
 
+  @Override
+  public byte[] id() {
+    final TokenBuilder tb = new TokenBuilder(Token.ID);
+    for(JNode n = this; n != null; n = n.parent) {
+      tb.addLong(n.parent != null ? n.index() + 1 : n.hashCode()).add('j');
+    }
+    return tb.removeLast().finish();
+  }
+
   @Override
   public GNode root() {
     return parent != null ? parent.root() : this;
@@ -213,7 +222,7 @@ public BasicNodeIter childIter(final Test test, final boolean descendant) {
           if(struct instanceof final XQMap map) {
             try {
               c = map.getOrNull(s);
-            } catch(QueryException ex) {
+            } catch(final QueryException ex) {
               throw Util.notExpected(ex);
             }
           } else {