exist-commits Mailing List for eXist-db

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9093
          http://exist.svn.sourceforge.net/exist/?rev=9093&view=rev
Author:   wolfgang_m
Date:     2009-05-31 16:39:16 +0000 (Sun, 31 May 2009)

Log Message:
-----------
[bugfix] versioning extension: don't store xmlns:v namespace declaration into the db; fixed configuration.

Modified Paths:
--------------
    trunk/eXist/conf.xml.tmpl
    trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningHelper.java
    trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningTrigger.java
    trunk/eXist/extensions/versioning/src/org/exist/versioning/xquery/versioning.xqm

Modified: trunk/eXist/conf.xml.tmpl
===================================================================

--- trunk/eXist/conf.xml.tmpl	2009-05-31 12:06:24 UTC (rev 9092)
+++ trunk/eXist/conf.xml.tmpl	2009-05-31 16:39:16 UTC (rev 9093)
@@ -585,8 +585,9 @@
     -->
     <serializer add-exist-id="none" compress-output="no" enable-xinclude="yes"
                 enable-xsl="no" indent="yes" match-tagging-attributes="no" 
-                match-tagging-elements="no"/>
+                match-tagging-elements="no">
 		<!--custom-filter class="org.exist.versioning.VersioningFilter"/-->
+	</serializer>
 
     <!--
         Default settings for the XSLT Transformer. Allow's for a choice of 

Modified: trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningHelper.java
===================================================================
--- trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningHelper.java	2009-05-31 12:06:24 UTC (rev 9092)
+++ trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningHelper.java	2009-05-31 16:39:16 UTC (rev 9093)
@@ -59,6 +59,23 @@
 
     private final static StringSource GET_CONFLICTING_REV_SOURCE = new StringSource(GET_CONFLICTING_REV);
 
+    private final static String GET_BASE_REV_FOR_KEY =
+            "declare namespace v=\"http://exist-db.org/versioning\";\n" +
+            "declare variable $collection external;\n" +
+            "declare variable $document external;\n" +
+            "declare variable $base external;\n" +
+            "declare variable $key external;\n" +
+            "let $p := collection($collection)//v:properties[v:document = $document]\n" +
+            "let $withKey := for $r in $p[v:revision > $base][v:key = $key] " +
+            "                   order by $r/v:revision descending return $r\n" +
+            "return\n" +
+            "   if ($withKey) then\n" +
+            "       xs:long($withKey[1]/v:revision)\n" +
+            "   else\n" +
+            "       xs:long($p[v:revision = $base]/v:revision)";
+    
+    private final static StringSource GET_BASE_REV_FOR_KEY_SOURCE = new StringSource(GET_BASE_REV_FOR_KEY);
+    
     public static long getCurrentRevision(DBBroker broker, XmldbURI docPath) throws XPathException, IOException {
         String docName = docPath.lastSegment().toString();
         XmldbURI collectionPath = docPath.removeLastSegment();
@@ -111,4 +128,35 @@
             pool.returnCompiledXQuery(GET_CONFLICTING_REV_SOURCE, compiled);
         }
     }
+
+    public static long getBaseRevision(DBBroker broker, XmldbURI docPath, long baseRev, String sessionKey) throws XPathException, IOException {
+        String docName = docPath.lastSegment().toString();
+        XmldbURI collectionPath = docPath.removeLastSegment();
+        XmldbURI path = VersioningTrigger.VERSIONS_COLLECTION.append(collectionPath);
+        XQuery xquery = broker.getXQueryService();
+        XQueryPool pool = xquery.getXQueryPool();
+        XQueryContext context;
+        CompiledXQuery compiled = pool.borrowCompiledXQuery(broker, GET_BASE_REV_FOR_KEY_SOURCE);
+        if(compiled == null)
+            context = xquery.newContext(AccessContext.VALIDATION_INTERNAL);
+        else
+            context = compiled.getContext();
+        context.declareVariable("collection", path.toString());
+        context.declareVariable("document", docName);
+        context.declareVariable("base", new IntegerValue(baseRev));
+        context.declareVariable("key", sessionKey);
+
+        if(compiled == null)
+            compiled = xquery.compile(context, GET_BASE_REV_FOR_KEY_SOURCE);
+        try {
+            Sequence s = xquery.execute(compiled, Sequence.EMPTY_SEQUENCE);
+            if (s.isEmpty())
+                return 0;
+
+            IntegerValue iv = (IntegerValue) s.itemAt(0);
+            return iv.getLong();
+        } finally {
+            pool.returnCompiledXQuery(GET_BASE_REV_FOR_KEY_SOURCE, compiled);
+        }
+    }
 }

Modified: trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningTrigger.java
===================================================================
--- trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningTrigger.java	2009-05-31 12:06:24 UTC (rev 9092)
+++ trunk/eXist/extensions/versioning/src/org/exist/versioning/VersioningTrigger.java	2009-05-31 16:39:16 UTC (rev 9093)
@@ -316,9 +316,12 @@
                 }
             }
             if (documentKey != null && documentRev != null) {
+                LOG.debug("v:key = " + documentKey + "; v:revision = " + documentRev);
                 try {
                     long rev = Long.parseLong(documentRev);
                     if (VersioningHelper.newerRevisionExists(broker, documentPath, rev, documentKey)) {
+                        long baseRev = VersioningHelper.getBaseRevision(broker, documentPath, rev, documentKey);
+                        LOG.debug("base revision: " + baseRev);
                         throw new TriggerException("Possible version conflict detected for document: " + documentPath);
                     }
                 } catch (XPathException e) {
@@ -331,6 +334,8 @@
             }
         }
         if (elementStack == 0) {
+            // Remove the versioning attributes which were inserted during serialization. We don't want
+            // to store them in the db
             AttributesImpl nattrs = new AttributesImpl();
             for (int i = 0; i < attributes.getLength(); i++) {
                 if (!StandardDiff.NAMESPACE.equals(attributes.getURI(i)))
@@ -347,4 +352,10 @@
         elementStack--;
         super.endElement(namespaceURI, localName, qname);
     }
+
+    public void startPrefixMapping(String prefix, String namespaceURI) throws SAXException {
+        if (StandardDiff.NAMESPACE.equals(namespaceURI))
+            return;
+        super.startPrefixMapping(prefix, namespaceURI);
+    }
 }
\ No newline at end of file

Modified: trunk/eXist/extensions/versioning/src/org/exist/versioning/xquery/versioning.xqm
===================================================================
--- trunk/eXist/extensions/versioning/src/org/exist/versioning/xquery/versioning.xqm	2009-05-31 12:06:24 UTC (rev 9092)
+++ trunk/eXist/extensions/versioning/src/org/exist/versioning/xquery/versioning.xqm	2009-05-31 16:39:16 UTC (rev 9093)
@@ -133,11 +133,13 @@
 					doc(concat($vCollection, "/", $docName, ".base"))
 				else
 					v:doc($doc, $revisions[$p - 1])
+			let $diff := collection($vCollection)/v:version[
+							v:properties[v:document = $docName]
+							[v:revision = $rev]
+						]			
 			return
 				version:annotate(
-					$previous, 
-					collection($vCollection)/v:version[v:properties[v:document = $docName]
-						[v:revision = $rev]]
+					$previous, $diff 
 				)
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2004	Jan	Feb	Mar (57)	Apr (103)	May (164)	Jun (139)	Jul (173)	Aug (196)	Sep (221)	Oct (333)	Nov (214)	Dec (88)
2005	Jan (163)	Feb (165)	Mar (98)	Apr (93)	May (199)	Jun (118)	Jul (200)	Aug (212)	Sep (185)	Oct (297)	Nov (437)	Dec (272)
2006	Jan (542)	Feb (329)	Mar (267)	Apr (332)	May (267)	Jun (130)	Jul (161)	Aug (348)	Sep (166)	Oct (305)	Nov (173)	Dec (173)
2007	Jan (199)	Feb (118)	Mar (133)	Apr (200)	May (208)	Jun (146)	Jul (198)	Aug (146)	Sep (187)	Oct (182)	Nov (181)	Dec (83)
2008	Jan (252)	Feb (124)	Mar (124)	Apr (101)	May (143)	Jun (122)	Jul (129)	Aug (60)	Sep (80)	Oct (89)	Nov (54)	Dec (112)
2009	Jan (88)	Feb (145)	Mar (105)	Apr (164)	May (123)	Jun (154)	Jul (374)	Aug (341)	Sep (219)	Oct (137)	Nov (373)	Dec (240)
2010	Jan (197)	Feb (270)	Mar (253)	Apr (150)	May (102)	Jun (51)	Jul (300)	Aug (512)	Sep (254)	Oct (258)	Nov (288)	Dec (143)
2011	Jan (238)	Feb (179)	Mar (253)	Apr (332)	May (248)	Jun (255)	Jul (216)	Aug (282)	Sep (146)	Oct (77)	Nov (86)	Dec (69)
2012	Jan (172)	Feb (234)	Mar (229)	Apr (101)	May (212)	Jun (267)	Jul (129)	Aug (210)	Sep (239)	Oct (271)	Nov (368)	Dec (220)
2013	Jan (179)	Feb (155)	Mar (59)	Apr (47)	May (99)	Jun (158)	Jul (185)	Aug (16)	Sep (16)	Oct (7)	Nov (20)	Dec (12)
2014	Jan (21)	Feb (17)	Mar (18)	Apr (13)	May (27)	Jun (15)	Jul (19)	Aug (22)	Sep (30)	Oct (16)	Nov (19)	Dec (16)
2015	Jan (14)	Feb (24)	Mar (33)	Apr (41)	May (14)	Jun (80)	Jul (53)	Aug (8)	Sep (7)	Oct (15)	Nov (13)	Dec (2)
2016	Jan (22)	Feb (12)	Mar (30)	Apr (6)	May (33)	Jun (16)	Jul (8)	Aug (20)	Sep (12)	Oct (18)	Nov (12)	Dec (11)
2017	Jan (24)	Feb (26)	Mar (47)	Apr (23)	May (19)	Jun (14)	Jul (28)	Aug (30)	Sep (17)	Oct	Nov	Dec
2019	Jan (1)	Feb (73)	Mar (90)	Apr (42)	May (116)	Jun (90)	Jul (127)	Aug (103)	Sep (56)	Oct (42)	Nov (95)	Dec (58)
2020	Jan (102)	Feb (31)	Mar (93)	Apr (60)	May (57)	Jun (45)	Jul (29)	Aug (32)	Sep (44)	Oct (86)	Nov (51)	Dec (71)
2021	Jan (44)	Feb (25)	Mar (78)	Apr (130)	May (64)	Jun (74)	Jul (21)	Aug (64)	Sep (40)	Oct (43)	Nov (21)	Dec (99)
2022	Jan (154)	Feb (64)	Mar (45)	Apr (95)	May (62)	Jun (48)	Jul (73)	Aug (37)	Sep (71)	Oct (27)	Nov (40)	Dec (65)
2023	Jan (89)	Feb (130)	Mar (124)	Apr (50)	May (93)	Jun (46)	Jul (45)	Aug (68)	Sep (62)	Oct (71)	Nov (108)	Dec (82)
2024	Jan (53)	Feb (76)	Mar (64)	Apr (75)	May (36)	Jun (54)	Jul (98)	Aug (137)	Sep (58)	Oct (177)	Nov (84)	Dec (52)
2025	Jan (70)	Feb (53)	Mar (72)	Apr (47)	May (88)	Jun (49)	Jul (86)	Aug (51)	Sep (65)	Oct (91)	Nov (18)	Dec

S	M	T	W	T	F	S
					1 (4)	2 (3)
3 (2)	4 (8)	5 (7)	6	7 (2)	8 (2)	9 (5)
10 (5)	11 (3)	12 (6)	13 (10)	14 (8)	15 (6)	16 (5)
17 (6)	18 (8)	19 (4)	20 (3)	21	22	23 (4)
24	25 (1)	26 (2)	27 (1)	28 (4)	29 (2)	30 (7)
31 (5)

exist-commits Mailing List for eXist-db

eXist-db is a feature rich Open Source native XML database

exist-commits — Receive notifications about CVS commits.