Author: ml-fabrice@ouvaton.org
Date: Thu Jun 29 16:22:32 2006
New Revision: 3708
Log:
modif. mineur dans le shéma
relecture de la doc. pour mise à jour fichier de syntax (à priori up-to-date : 1.8.2)
Modified:
_contribs_/_assistants_/spip-web-generator/moulinette--XML/shema.xsd
_contribs_/_assistants_/spip-web-generator/moulinette--XML/syntax-SPIP.xml
Modified: _contribs_/_assistants_/spip-web-generator/moulinette--XML/shema.xsd
--- _contribs_/_assistants_/spip-web-generator/moulinette--XML/shema.xsd (original)
+++ _contribs_/_assistants_/spip-web-generator/moulinette--XML/shema.xsd Thu Jun 29 16:22:32 2006
@@ -52,8 +52,8 @@
<xsd:element name="filtre">
<complexType>
- <xsd:attribute name="version" type="xsd:string" />
- <xsd:attribute name="variabletype" type="variableType" />
+ <xsd:attribute name="variabletype" type="variableType" use="required" />
+ <xsd:attribute name="version" type="xsd:string" use="optional" />
</complexType>
</xsd:element>
@@ -79,9 +79,9 @@
<xsd:element name="critere">
<complexType>
- <xsd:element ref="documentation" minoccurs="0" maxoccurs="unbounded" />
<xsd:attribute name="type" type="xsd:string" use="required" />
- <xsd:attribute name="version" type="xsd:string" />
+ <xsd:attribute name="version" type="xsd:string" use="optional" />
+ <xsd:attribute name="surnom" type="xsd:string" use="optional" />
</complexType>
</xsd:element>
@@ -99,10 +99,9 @@
<xsd:element name="balise">
<complexType>
- <xsd:element ref="documentation" minoccurs="0" maxoccurs="unbounded" />
<xsd:attribute name="type" type="typeBalise" use="required" />
- <xsd:attribute name="version" type="xsd:string" />
- <xsd:attribute name="variabletype" type="variableType" />
+ <xsd:attribute name="version" type="xsd:string" use="optional" />
+ <xsd:attribute name="variabletype" type="variableType" use="optional" />
</complexType>
</xsd:element>
@@ -132,7 +131,9 @@
<xsd:element name="boucle">
<complexType>
<xsd:attribute name="type" type="xsd:string" use="required" />
- <xsd:attribute name="traitement" type="xsd:string" />
+ <xsd:attribute name="traitement" type="xsd:string" use="optional" />
+ <xsd:attribute name="version" type="xsd:string" use="optional" />
+ <xsd:attribute name="surnom" type="xsd:string" use="optional" />
<xsd:sequence>
<xsd:element ref="image" minoccurs="0" />
<xsd:element ref="documentation" minoccurs="0" maxoccurs="unbounded" />
@@ -182,11 +183,17 @@
<!-- Définition de élément RACINE du fichier XML -->
+ <!-- Groupe d'attributs -->
+ <xsd:attributeGroupe name="Infos">
+ <xsd:attribute name="spip_version" type="xsd:string" use="required" />
+ <xsd:attribute name="spip_version_base" type="xsd:string" use="required" />
+ <xsd:attribute name="version_syntax" type="xsd:string" use="required" />
+ <xsd:attribute name="maj" type="xsd:date" use="required" />
+ </xsd:element>
+
<xsd:element name="spip-syntaxe">
<complexType>
- <xsd:attribute name="version" type="xsd:string" />
- <xsd:attribute name="version_base" type="xsd:string" />
- <xsd:attribute name="version_syntax" type="xsd:string" />
+ <xsd:attributeGroupe ref="Infos">
<xsd:sequence>
<xsd:element ref="documentation" minoccurs="0" maxoccurs="unbounded" />
<xsd:element ref="les-boucles" />
Modified: _contribs_/_assistants_/spip-web-generator/moulinette--XML/syntax-SPIP.xml
--- _contribs_/_assistants_/spip-web-generator/moulinette--XML/syntax-SPIP.xml (original)
+++ _contribs_/_assistants_/spip-web-generator/moulinette--XML/syntax-SPIP.xml Thu Jun 29 16:22:32 2006
@@ -4,7 +4,7 @@
-<spip-syntaxe version="1-7-1" version_base="1.731" version_syntaxe="0.6">
+<spip-syntaxe spip_version="1-7-1" version_syntaxe="0.8" maj="2006-06-28">
<documentation lang="fr" url="http://www.spip.net/fr_rubrique143.html" />
<documentation lang="en" url="http://www.spip.net/en_rubrique199.html" />
@@ -34,14 +34,17 @@
<critere type="selection">tout</critere>
<critere type="selection">id_rubrique</critere>
<critere type="selection">id_secteur</critere>
+ <critere type="selection">racine</critere>
<critere type="selection">id_parent</critere>
<critere type="selection">id_enfant</critere>
<critere type="selection">meme_parent</critere>
+ <critere type="selection" version="?">branche</critere>
<critere type="selection">recherche</critere>
<critere type="selection" version="1.4">id_mot</critere>
<critere type="selection" version="1.4">id_groupe</critere>
<critere type="selection" version="1.4">titre_mot</critere>
<critere type="selection" version="1.4">type_mot</critere>
+ <critere type="selection" version="1.7.2">lang</critere>
<critere type="affichage">inverse</critere>
<critere type="affichage">par_hasard</critere>
@@ -53,6 +56,7 @@
<balise type="db">DESCRIPTIF</balise>
<balise type="db">TEXTE</balise>
<balise type="db">ID_SECTEUR</balise>
+ <balise type="db">LANG</balise>
<balise type="spip">NOTES</balise>
<balise type="spip">INTRODUCTION</balise>
@@ -64,35 +68,48 @@
<balise type="spip" variabletype="image">LOGO_RUBRIQUE</balise>
<balise type="spip" version="1.4" variabletype="image">LOGO_RUBRIQUE_NORMAL</balise>
<balise type="spip" version="1.4" variabletype="image">LOGO_RUBRIQUE_SURVOL</balise>
- <balise type="spip" version="1.7.1">EXPOSER</balise>
+ <balise type="spip" version="1.8.2">EXPOSE</balise>
</boucle>
<boucle type="HIERARCHIE">
<documentation lang="fr" url="http://www.spip.net/fr_article913.html" />
<image url="" />
+ <critere type="selection">tout</critere>
<critere type="selection">id_rubrique</critere>
<critere type="selection">id_article</critere>
- <critere type="affichage">inter</critere>
- <critere type="affichage">{a,b}</critere>
+
+ <critere type="affichage">inverse</critere>
+ <critere type="affichage">par_hasard</critere>
+ <critere type="affichage">exclus</critere>
+ <critere type="affichage">doublons</critere>
+
<les-balises idem="RUBRIQUES"></les-balises>
</boucle>
+
+
<boucle type="ARTICLES">
<documentation lang="fr" url="http://www.spip.net/fr_article902.html" />
<image url="" />
<critere type="selection">tout</critere>
+ <critere type="selection">id_article</critere>
<critere type="selection">id_rubrique</critere>
<critere type="selection">id_secteur</critere>
<critere type="selection" version="1.4">branche</critere>
- <critere type="selection">id_article</critere>
<critere type="selection">id_auteur</critere>
<critere type="selection">id_mot</critere>
<critere type="selection" version="1.4">id_groupe</critere>
<critere type="selection">titre_mot</critere>
<critere type="selection">type_mot</critere>
<critere type="selection">recherche</critere>
+ <critere type="selection" version="1.7.2">lang</critere>
+ <critere type="selection" version="1.7.2">date</critere>
+ <critere type="selection" version="1.8.2">statut</critere>
+ <critere type="selection" version="1.8.2">statut=prepa</critere>
+ <critere type="selection" version="1.8.2">statut=prop</critere>
+
<critere type="affichage">inverse</critere>
<critere type="affichage">par_hasard</critere>
@@ -100,6 +117,7 @@
<critere type="affichage">doublons</critere>
<balise type="db">ID_RUBRIQUE</balise>
+ <balise type="db">ID_SECTEUR</balise>
<balise type="db">ID_ARTICLE</balise>
<balise type="db">SURTITRE</balise>
<balise type="db">TITRE</balise>
@@ -108,26 +126,31 @@
<balise type="db">CHAPO</balise>
<balise type="db">TEXTE</balise>
<balise type="db">PS</balise>
+ <balise type="db">#NOM_SITE</balise>
+ <balise type="db">#URL_SITE</balise>
<balise type="db" variabletype="date">DATE</balise>
<balise type="db" variabletype="date">DATE_REDAC</balise>
<balise type="db" variabletype="date">DATE_MODIF</balise>
- <balise type="db">ID_SECTEUR</balise>
<balise type="db">VISITES</balise>
<balise type="db">POPULARITE</balise>
+ <balise type="db">LANG</balise>
<balise type="spip">NOTES</balise>
<balise type="spip">INTRODUCTION</balise>
<balise type="spip">LESAUTEURS</balise>
<balise type="spip">URL_ARTICLE</balise>
<balise type="spip">FORMULAIRE_FORUM</balise>
- <balise type="spip">FORMULAIRE_SIGNATURE</balise>
<balise type="spip">PARAMETRES_FORUM</balise>
+ <balise type="spip">PETITION</balise>
+ <balise type="spip">FORMULAIRE_SIGNATURE</balise>
+ <balise type="spip" version="1.8.2">FORMULAIRE_ECRIRE_AUTEUR</balise>
<balise type="spip" variabletype="image">LOGO_ARTICLE</balise>
<balise type="spip" variabletype="image">LOGO_ARTICLE_RUBRIQUE</balise>
<balise type="spip" variabletype="image">LOGO_RUBRIQUE</balise>
<balise type="spip" variabletype="image">LOGO_ARTICLE_NORMAL</balise>
<balise type="spip" variabletype="image">LOGO_ARTICLE_SURVOL</balise>
- <balise type="spip" version="1.7.1">EXPOSER</balise>
+ <balise type="spip" version="1.8.2">EXPOSE</balise>
+
</boucle>
<boucle type="BREVES">
@@ -141,6 +164,7 @@
<critere type="selection">titre_mot</critere>
<critere type="selection">type_mot</critere>
<critere type="selection">recherche</critere>
+ <critere type="selection">lang</critere>
<critere type="affichage">inverse</critere>
<critere type="affichage">par_hasard</critere>
@@ -154,6 +178,7 @@
<balise type="db">NOM_SITE</balise>
<balise type="db">URL_SITE</balise>
[... 244 lines stripped ...]