#92 qconsole import works in ML9 now

Author: rjrudin

src/main/java/com/marklogic/client/ext/qconsole/impl/DefaultWorkspaceManager.java

@@ -77,13 +77,15 @@ public List<File> importWorkspaces(String user, String... workspaceNames) {
 			return files;
 		}
 
+		final String importQuery = determineImportScriptToUse();
+
 		for (String workspace : workspaceNames) {
 			File f = new File(userDir, workspace + ".xml");
 			if (f.isFile() && f.exists()) {
 				client.newServerEval()
 					.addVariable("user", user)
 					.addVariable("exported-workspace", new FileHandle(f).withFormat(Format.XML))
-					.xquery(QconsoleScripts.IMPORT).eval();
+					.xquery(importQuery).eval();
 
 				if (logger.isInfoEnabled()) {
 					logger.info(format("Imported workspace from %s", f.getAbsolutePath()));
@@ -96,6 +98,15 @@ public List<File> importWorkspaces(String user, String... workspaceNames) {
 		return files;
 	}
 
+	protected String determineImportScriptToUse() {
+		String version = client.newServerEval().xquery("xdmp:version()").evalAs(String.class);
+		String xquery = QconsoleScripts.IMPORT;
+		if (version != null && version.startsWith("8")) {
+			return xquery.replace("qconsole-model:default-database()", "qconsole-model:default-content-source()");
+		}
+		return xquery;
+	}
+
 	/**
 	 * Defaults to ~/.qconsole/workspaces.
 	 *

src/main/java/com/marklogic/client/ext/qconsole/impl/QconsoleScripts.java

@@ -6,6 +6,11 @@
  */
 public class QconsoleScripts {
 
+	/**
+	 * This relies on internal APIs in the qconsole-model function that have changed between MarkLogic 8 and 9.
+	 * Specifically, qconsole-model:default-content-source() in ML8 was removed and qconsole-model:default-database()
+	 * can be used instead.
+	 */
 	public static final String IMPORT = "xquery version \"1.0-ml\";\n" +
 		"\n" +
 		"declare namespace qconsole=\"http://marklogic.com/appservices/qconsole\";\n" +
@@ -73,7 +78,7 @@ public class QconsoleScripts {
 		"                            let $content-source :=\n" +
 		"                                if ( exists($q/@content-source) )\n" +
 		"                                then string($q/@content-source)\n" +
-		"                                else qconsole-model:default-content-source()\n" +
+		"                                else qconsole-model:default-database()\n" +
 		"                            let $mode := string($q/@mode)\n" +
 		"                            let $query-text := text { $q }\n" +
 		"                            let $q-uri := concat(\"/queries/\", $qid, \".txt\")\n" +