From 4a11272489db93343dfd06352375de4eed8ba207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leif-J=C3=B6ran=20Olsson?= <ljo@fripost.org>
Date: Fri, 28 Jun 2013 16:14:40 +0200
Subject: [PATCH 1/3] Make the delete task not fail if the build dir does not
 exist.

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index ad3a66bd..7a8320ba 100644
--- a/build.xml
+++ b/build.xml
@@ -118,7 +118,7 @@
                 <include name="r.js"/>
             </fileset>
         </delete>
-        <delete>
+        <delete failonerror="false">
             <fileset dir="${build}">
                 <include name="*.xar"/>
             </fileset>
@@ -163,4 +163,4 @@
             <arg line="-T ${build}/${xar} -u admin:${server.pass} ${server.url}/${xar}"/>
         </exec>
     </target>
-</project>
\ No newline at end of file
+</project>

From f2ec1e017ae3e9aefdb70c4a329e1ba9037e5080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leif-J=C3=B6ran=20Olsson?= <ljo@fripost.org>
Date: Wed, 17 Jul 2013 00:07:54 +0200
Subject: [PATCH 2/3] Make the elapsed time calculation somewhat more robust by
 not only counting seconds but also minutes and hours.

---
 modules/session.xql | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/session.xql b/modules/session.xql
index 0c9fa3d3..0ff71b96 100644
--- a/modules/session.xql
+++ b/modules/session.xql
@@ -71,7 +71,14 @@ declare function sandbox:retrieve($num as xs:integer) as element() {
 declare function sandbox:store-in-session($results as item()*) as element(result) {
 	let $null := session:set-attribute('cached', $results)
     let $startTime := request:get-attribute("start-time")
-    let $elapsed := if ($startTime) then seconds-from-duration(current-time() - xs:time($startTime)) else 0
+    let $elapsed := 
+      if ($startTime) then
+	let $current-time := current-time()
+	let $hours :=  hours-from-duration($current-time - xs:time($startTime))
+	let $minutes :=  minutes-from-duration($current-time - xs:time($startTime))
+	let $seconds := seconds-from-duration($current-time - xs:time($startTime))
+	return ($hours * 3600) + ($minutes * 60) + $seconds
+      else 0
 	return
 		<result hits="{count($results)}" elapsed="{$elapsed}"/>
 };

From 0628b024aa58267555b1fd8cb56dd1786b745bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leif-J=C3=B6ran=20Olsson?= <ljo@fripost.org>
Date: Wed, 17 Jul 2013 02:41:36 +0200
Subject: [PATCH 3/3] Make the new document xquery template valid so that you
 do not get the error message in your face immediately.

---
 src/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor.js b/src/editor.js
index d33abbfd..1f7145da 100755
--- a/src/editor.js
+++ b/src/editor.js
@@ -363,7 +363,7 @@ eXide.edit.Editor = (function () {
         if (data && typeof data == "string") {
             session = new EditSession(data);
         } else if (type && type === "xquery") {
-            session = new EditSession("xquery version \"3.0\";\n");
+            session = new EditSession("xquery version \"3.0\";\n1");
         } else {
             session = new EditSession("");
         }