Wed, 13 Jul 2016 14:38:17 +0200
merge sync config parser changes
dav/scfg.c | file | annotate | diff | comparison | revisions |
--- a/dav/scfg.c Wed Jul 13 14:29:50 2016 +0200 +++ b/dav/scfg.c Wed Jul 13 14:38:17 2016 +0200 @@ -182,7 +182,7 @@ if(util_strtoint(value, &i) && i >= 0) { max_retry = (int)i; } else { - fprintf(stderr, "Warnung: sync.xml: unsigned integer value " + fprintf(stderr, "Warning: sync.xml: unsigned integer value " "expected in <max-retry> element\n"); } } else if(xstreq(node->name, "backup-on-pull")) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/sync.xsd Wed Jul 13 14:38:17 2016 +0200 @@ -0,0 +1,72 @@ +<?xml version="1.0"?> +<!-- +Copyright 2016 Olaf Wintermann. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +--> + +<xs:schema version="1.0" + targetNamespace="http://davutils.org/cfg/dav-sync" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:t="http://davutils.org/cfg/dav-sync" + elementFormDefault="qualified" +> + + <xs:complexType name="filenameFilter"> + <xs:sequence> + <xs:element name="include" type="xs:string" + minOccurs="0" maxOccurs="unbounded" /> + <xs:element name="exclude" type="xs:string" + minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="direntry"> + <xs:all> + <xs:element name="name" type="xs:string"/> + <xs:element name="database" type="xs:string"/> + <xs:element name="path" type="xs:string"/> + <xs:element name="repository" type="xs:string"/> + <xs:element name="collection" minOccurs="0" type="xs:string"/> + <xs:element name="trash" minOccurs="0" type="xs:string"/> + <xs:element name="filter" minOccurs="0" type="t:filenameFilter" /> + <xs:element name="max-retry" default="0" + minOccurs="0" type="xs:unsignedInt"/> + <xs:element name="backup-on-pull" default="false" + minOccurs="0" type="xs:boolean" /> + <xs:element name="lock-pull" default="false" + minOccurs="0" type="xs:boolean" /> + <xs:element name="lock-push" default="false" + minOccurs="0" type="xs:boolean" /> + </xs:all> + </xs:complexType> + + <xs:element name="configuration"> + <xs:complexType> + <xs:sequence> + <xs:element name="directory" type="t:direntry" + minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema>