X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=docs%2Fexport-0.6.xsd;h=4668794ee3e2202ef7657b3cac3e81663b0681e0;hb=7ba1880c751be0a45354ff93ff50550f05380e87;hp=a225e5206cdc18ba8e69d710f1cf59e5f6d67a33;hpb=eadfd5a5819ff2752675f3bdd62f31f8e9125ece;p=lhc%2Fweb%2Fwiklou.git

diff --git a/docs/export-0.6.xsd b/docs/export-0.6.xsd
index a225e5206c..4668794ee3 100644
--- a/docs/export-0.6.xsd
+++ b/docs/export-0.6.xsd
@@ -2,57 +2,57 @@
 <!--
 	This is an XML Schema description of the format
 	output by MediaWiki's Special:Export system.
-	
+
 	Version 0.2 adds optional basic file upload info support,
 	which is used by our OAI export/import submodule.
-	
+
 	Version 0.3 adds some site configuration information such
 	as a list of defined namespaces.
-	
+
 	Version 0.4 adds per-revision delete flags, log exports,
 	discussion threading data, a per-page redirect flag, and
 	per-namespace capitalization.
 
 	Version 0.5 adds byte count per revision.
-	
-	Version 0.6 adds a separate namespace tag, locates the
-	redirect target and strips of the namespace from the title. 
-	
+
+	Version 0.6 adds a separate namespace tag, and resolves the
+	redirect target and adds a separate sha1 tag for each revision.
+
 	The canonical URL to the schema document is:
 	http://www.mediawiki.org/xml/export-0.6.xsd
-	
+
 	Use the namespace:
 	http://www.mediawiki.org/xml/export-0.6/
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:mw="http://www.mediawiki.org/xml/export-0.6/"
-        targetNamespace="http://www.mediawiki.org/xml/export-0.6/"
-        elementFormDefault="qualified">
+		xmlns:mw="http://www.mediawiki.org/xml/export-0.6/"
+		targetNamespace="http://www.mediawiki.org/xml/export-0.6/"
+		elementFormDefault="qualified">
 
 	<annotation>
 		<documentation xml:lang="en">
 			MediaWiki's page export format
 		</documentation>
 	</annotation>
-	
+
 	<!-- Need this to reference xml:lang -->
 	<import namespace="http://www.w3.org/XML/1998/namespace"
-		schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	
+			schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
 	<!-- Our root element -->
 	<element name="mediawiki" type="mw:MediaWikiType"/>
-	
+
 	<complexType name="MediaWikiType">
 		<sequence>
 			<element name="siteinfo" type="mw:SiteInfoType"
-				minOccurs="0" maxOccurs="1"/>
+					 minOccurs="0" maxOccurs="1"/>
 			<element name="page" type="mw:PageType"
-				minOccurs="0" maxOccurs="unbounded"/>
+					 minOccurs="0" maxOccurs="unbounded"/>
 		</sequence>
 		<attribute name="version" type="string" use="required"/>
 		<attribute ref="xml:lang" use="required"/>
 	</complexType>
-	
+
 	<complexType name="SiteInfoType">
 		<sequence>
 			<element name="sitename" type="string" minOccurs="0" />
@@ -62,23 +62,23 @@
 			<element name="namespaces" type="mw:NamespacesType" minOccurs="0" />
 		</sequence>
 	</complexType>
-	
+
 	<simpleType name="CaseType">
 		<restriction base="NMTOKEN">
 			<!-- Cannot have two titles differing only by case of first letter. -->
 			<!-- Default behavior through 1.5, $wgCapitalLinks = true -->
 			<enumeration value="first-letter" />
-			
+
 			<!-- Complete title is case-sensitive -->
 			<!-- Behavior when $wgCapitalLinks = false -->
 			<enumeration value="case-sensitive" />
-			
+
 			<!-- Cannot have non-case senstitive titles eg [[FOO]] == [[Foo]] -->
 			<!-- Not yet implemented as of MediaWiki 1.18 -->
 			<enumeration value="case-insensitive" />
 		</restriction>
 	</simpleType>
-	
+
 	<simpleType name="DeletedFlagType">
 		<restriction base="NMTOKEN">
 			<enumeration value="deleted"/>
@@ -88,10 +88,10 @@
 	<complexType name="NamespacesType">
 		<sequence>
 			<element name="namespace" type="mw:NamespaceType"
-				minOccurs="0" maxOccurs="unbounded" />
+					 minOccurs="0" maxOccurs="unbounded" />
 		</sequence>
 	</complexType>
-	
+
 	<complexType name="NamespaceType">
 		<simpleContent>
 			<extension base="string">
@@ -100,36 +100,36 @@
 			</extension>
 		</simpleContent>
 	</complexType>
-	
+
 	<complexType name="PageType">
 		<sequence>
 			<!-- Title in text form. (Using spaces, not underscores; with namespace ) -->
 			<element name="title" type="string"/>
-			
-			<!-- Namesapce in text form -->
-			<element name="ns" type="string"/>
-			
+
+			<!-- Namespace in canonical form -->
+			<element name="ns" type="positiveInteger"/>
+
 			<!-- optional page ID number -->
 			<element name="id" type="positiveInteger" minOccurs="0"/>
-			
+
 			<!-- flag if the current revision is a redirect -->
-			<element name="redirect" type="string" minOccurs="0"/>	
+			<element name="redirect" type="string" minOccurs="0"/>
 
 			<!-- comma-separated list of string tokens, if present -->
 			<element name="restrictions" type="string" minOccurs="0"/>
-			
+
 			<!-- Zero or more sets of revision or upload data -->
 			<choice minOccurs="0" maxOccurs="unbounded">
 				<element name="revision" type="mw:RevisionType" />
 				<element name="upload" type="mw:UploadType" />
 				<element name="logitem" type="mw:LogItemType" />
 			</choice>
-			
+
 			<!-- Zero or One sets of discussion threading data -->
 			<element name="discussionthreadinginfo" minOccurs="0" maxOccurs="1" type="mw:DiscussionThreadingInfo" />
 		</sequence>
 	</complexType>
-	
+
 	<complexType name="RevisionType">
 		<sequence>
 			<element name="id" type="positiveInteger" minOccurs="0"/>
@@ -137,6 +137,7 @@
 			<element name="contributor" type="mw:ContributorType"/>
 			<element name="minor" minOccurs="0" />
 			<element name="comment" type="mw:CommentType" minOccurs="0"/>
+			<element name="sha1" type="string" />
 			<element name="text" type="mw:TextType" />
 		</sequence>
 	</complexType>
@@ -152,7 +153,7 @@
 			<element name="text" type="mw:TextType" />
 		</sequence>
 	</complexType>
-	
+
 	<complexType name="CommentType">
 		<simpleContent>
 			<extension base="string">
@@ -168,7 +169,7 @@
 			<extension base="string">
 				<attribute ref="xml:space" use="optional" default="preserve" />
 				<!-- This allows deleted=deleted on non-empty elements, but XSD is not omnipotent -->
-				<attribute name="deleted" use="optional" type="mw:DeletedFlagType"/>	
+				<attribute name="deleted" use="optional" type="mw:DeletedFlagType"/>
 				<!-- This isn't a good idea; we should be using "ID" instead of "NMTOKEN" -->
 				<!-- However, "NMTOKEN" is strictest definition that is both compatible with existing -->
 				<!-- usage ([0-9]+) and with the "ID" type. -->
@@ -177,37 +178,37 @@
 			</extension>
 		</simpleContent>
 	</complexType>
-	
+
 	<complexType name="ContributorType">
 		<sequence>
 			<element name="username" type="string" minOccurs="0"/>
 			<element name="id" type="positiveInteger" minOccurs="0" />
-			
+
 			<element name="ip" type="string" minOccurs="0"/>
 		</sequence>
 		<!-- This allows deleted=deleted on non-empty elements, but XSD is not omnipotent -->
 		<attribute name="deleted" use="optional" type="mw:DeletedFlagType"/>
 	</complexType>
-	
+
 	<complexType name="UploadType">
 		<sequence>
 			<!-- Revision-style data... -->
 			<element name="timestamp" type="dateTime"/>
 			<element name="contributor" type="mw:ContributorType"/>
 			<element name="comment" type="string" minOccurs="0"/>
-			
+
 			<!-- Filename. (Using underscores, not spaces. No 'Image:' namespace marker.) -->
 			<element name="filename" type="string"/>
-			
+
 			<!-- URI at which this resource can be obtained -->
 			<element name="src" type="anyURI"/>
-			
+
 			<element name="size" type="positiveInteger" />
-			
+
 			<!-- TODO: add other metadata fields -->
 		</sequence>
 	</complexType>
-	
+
 	<!-- Discussion threading data for LiquidThreads -->
 	<complexType name="DiscussionThreadingInfo">
 		<sequence>
@@ -221,5 +222,5 @@
 			<element name="ThreadType" type="string" />
 		</sequence>
 	</complexType>
-	
+
 </schema>