[bugfix] base-uri() was returning empty string instead of the document path

The xml:base lookup in getBaseURI() was returning empty string when the attribute didn't exist. Removed it so we fall through to getDocumentURI() which gives the correct result.
Closes #186

Author: Laurettta

exist-core/pom.xml

@@ -803,6 +803,7 @@
                                 <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/resources/standalone-webapp/WEB-INF/web.xml</include>
                                 <include>src/main/xjb/rest-api.xjb</include>
+                                <include>src/test/xquery/base-uri.xql</include>
                                 <include>src/test/xquery/parenthesizedLocationStep.xml</include>
                                 <include>src/test/xquery/tail-recursion.xml</include>
                                 <include>src/test/xquery/maps/maps.xqm</include>
@@ -1510,6 +1511,7 @@
                                 <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/test/resources/standalone-webapp/WEB-INF/web.xml</exclude>
                                 <exclude>src/main/xjb/rest-api.xjb</exclude>
+                                <exclude>src/test/xquery/base-uri.xql</exclude>
                                 <exclude>src/test/xquery/binary-value.xqm</exclude>
                                 <exclude>src/test/xquery/instance-of.xqm</exclude>
                                 <exclude>src/test/xquery/operator-mapping.xqm</exclude>

exist-core/src/main/java/org/exist/dom/memtree/DocumentImpl.java

@@ -1658,26 +1658,18 @@ public XQueryContext getContext() {
 
     @Override
     public String getBaseURI() {
-        final Element el = getDocumentElement();
-        if(el != null) {
-            final String baseURI = getDocumentElement().getAttributeNS(Namespaces.XML_NS, "base");
-            if(baseURI != null) {
-                return baseURI;
-            }
-        }
         final String docURI = getDocumentURI();
         if(docURI != null) {
             return docURI;
-        } else {
-            if(context!=null && context.isBaseURIDeclared()) {
-                try {
-                    return context.getBaseURI().getStringValue();
-                } catch(final XPathException e) {
-                    //TODO : make something !
-                }
+        }
+        if(context != null && context.isBaseURIDeclared()) {
+            try {
+                return context.getBaseURI().getStringValue();
+            } catch(final XPathException e) {
+                //TODO : make something !
             }
-            return XmldbURI.EMPTY_URI.toString();
         }
+        return XmldbURI.EMPTY_URI.toString();
     }
 
     @Override

exist-core/src/test/java/org/exist/dom/memtree/DocumentImplTest.java

@@ -206,6 +206,36 @@ public void testGetInScopePrefix() throws IOException, ParserConfigurationExcept
         assertEquals(Namespaces.XHTML_NS, namespaceUri);
     }
 
+    @Test
+    public void getBaseURI_withDocumentURI() throws IOException, SAXException, ParserConfigurationException {
+        final DocumentImpl doc;
+        try(final InputStream is = new UnsynchronizedByteArrayInputStream("<root/>".getBytes(UTF_8))) {
+            doc = parseExist(is);
+        }
+        doc.setDocumentURI("file:///intranet/xsl/template.xsl");
+        assertEquals("file:///intranet/xsl/template.xsl", doc.getBaseURI());
+    }
+
+    @Test
+    public void getBaseURI_prefersXmlBaseOnRoot() throws IOException, SAXException, ParserConfigurationException {
+        final DocumentImpl doc;
+        try(final InputStream is = new UnsynchronizedByteArrayInputStream(
+                "<root xml:base=\"http://example.org/\"/>".getBytes(UTF_8))) {
+            doc = parseExist(is);
+        }
+        doc.setDocumentURI("file:///intranet/xsl/template.xsl");
+        assertEquals("http://example.org/", doc.getBaseURI());
+    }
+
+    @Test
+    public void getBaseURI_noDocumentURI() throws IOException, SAXException, ParserConfigurationException {
+        final DocumentImpl doc;
+        try(final InputStream is = new UnsynchronizedByteArrayInputStream("<root/>".getBytes(UTF_8))) {
+            doc = parseExist(is);
+        }
+        assertNull("", doc.getBaseURI());
+    }
+
     private Document parseXerces(final InputStream is) throws ParserConfigurationException, SAXException, IOException {
         final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);

exist-core/src/test/xquery/base-uri.xql

@@ -1,4 +1,28 @@
 (:
+ : Elemental
+ : Copyright (C) 2024, Evolved Binary Ltd
+ :
+ : admin@evolvedbinary.com
+ : https://www.evolvedbinary.com | https://www.elemental.xyz
+ :
+ : This library is free software; you can redistribute it and/or
+ : modify it under the terms of the GNU Lesser General Public
+ : License as published by the Free Software Foundation; version 2.1.
+ :
+ : This library is distributed in the hope that it will be useful,
+ : but WITHOUT ANY WARRANTY; without even the implied warranty of
+ : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ : Lesser General Public License for more details.
+ :
+ : You should have received a copy of the GNU Lesser General Public
+ : License along with this library; if not, write to the Free Software
+ : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ :
+ : NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ :       The original license header is included below.
+ :
+ : =====================================================================
+ :
  : eXist-db Open Source Native XML Database
  : Copyright (C) 2001 The eXist-db Authors
  :
@@ -100,7 +124,7 @@ function baseuri:root() {
 };
 
 declare
-    %test:assertEquals("http://example.org/a/","http://example.org/b/","http://example.org/c/","/yy","zz")
+    %test:assertEquals("http://example.org/a/","http://example.org/b/","http://example.org/c/","/yy")
 function baseuri:sub1() {
      for $sub in $baseuri:DOCUMENT//sub
      return base-uri($sub)