From 00d7c3f0b79e8322ba7485ef864c025502e76ca9 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 31 May 2017 00:57:05 +0200 Subject: [PATCH 1/7] =?UTF-8?q?-=20Un=20warning=20PHP=20en=20moins=20;=20-?= =?UTF-8?q?=20Les=20citations=20ne=20sont=20pas=20des=20blockquotes=20dans?= =?UTF-8?q?=20le=20diff=C3=A9rents=20XML=20du=20service-public=20;=20-=20U?= =?UTF-8?q?n=20tag=20
  • =20mal=20ferm=C3=A9=20;=20-=20ServiceEnLigne=20:?= =?UTF-8?q?=20On=20r=C3=A9cup=C3=A8re=20tous=20les=20tags=20encore=20pr?= =?UTF-8?q?=C3=A9sents.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comarquage_fonctions.php | 2 +- xml_templates/balises/attention.html | 2 +- xml_templates/balises/citation.html | 2 +- xml_templates/balises/reference.html | 1 + xml_templates/balises/serviceenligne.html | 11 ++++++++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/comarquage_fonctions.php b/comarquage_fonctions.php index 609eeb7..ee995c2 100644 --- a/comarquage_fonctions.php +++ b/comarquage_fonctions.php @@ -223,7 +223,7 @@ function inc_comarquagexml_to_array($u, $utiliser_namespace = false) { if ($paragraphe) { for ($i = 0; $i < $paragraphe->length; $i++) { for ($x = 0; $x < $paragraphe->item($i)->childNodes->length; $x++) { - if (is_null($paragraphe->item($i)->childNodes->item($x)->tagName)) { + if (isset($paragraphe->item($i)->childNodes->item($x)->tagName) and is_null($paragraphe->item($i)->childNodes->item($x)->tagName)) { // code http://php.net/manual/fr/domnode.replacechild.php#48485 // Ajouts d'un noeud "texteInterne" diff --git a/xml_templates/balises/attention.html b/xml_templates/balises/attention.html index 5e85078..2bbc2dc 100644 --- a/xml_templates/balises/attention.html +++ b/xml_templates/balises/attention.html @@ -10,4 +10,4 @@ [(#CLE|=={titre}|non)] - +] \ No newline at end of file diff --git a/xml_templates/balises/citation.html b/xml_templates/balises/citation.html index 6b193f7..0259f3d 100644 --- a/xml_templates/balises/citation.html +++ b/xml_templates/balises/citation.html @@ -4,5 +4,5 @@ -->] -
    [(#VALEUR{text})]
    +[(#VALEUR{text})] diff --git a/xml_templates/balises/reference.html b/xml_templates/balises/reference.html index 85c492d..96ee486 100644 --- a/xml_templates/balises/reference.html +++ b/xml_templates/balises/reference.html @@ -16,6 +16,7 @@

    <:comarquage:reference:>

  • [(#VALEUR{children/titre/0/text}) ] [
    (#VALEUR{children/complement/0/text})] +
    • [(#ENV{bloc}|!={non}|oui) diff --git a/xml_templates/balises/serviceenligne.html b/xml_templates/balises/serviceenligne.html index c55f4a1..3f59aa1 100644 --- a/xml_templates/balises/serviceenligne.html +++ b/xml_templates/balises/serviceenligne.html @@ -16,11 +16,16 @@

    <:comarquage:services_en_ligne:>

    ] From bcf89cf26b0dec194d325dc68afdd361121567c4 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 31 May 2017 00:57:58 +0200 Subject: [PATCH 2/7] Oups! --- xml_templates/balises/attention.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml_templates/balises/attention.html b/xml_templates/balises/attention.html index 2bbc2dc..3a079bf 100644 --- a/xml_templates/balises/attention.html +++ b/xml_templates/balises/attention.html @@ -10,4 +10,4 @@ [(#CLE|=={titre}|non)]
    -] \ No newline at end of file + \ No newline at end of file From f1b1fd3de8f613bc48e9b6d2aa4cf7918aa90573 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 31 May 2017 09:31:16 +0200 Subject: [PATCH 3/7] Up de z --- paquet.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paquet.xml b/paquet.xml index e9cdc40..33e084e 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@ Date: Wed, 31 May 2017 10:46:11 +0200 Subject: [PATCH 4/7] Maj XML MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Il semble que le XML ait changé récemment… la v3.1 du comaquarge ? --- xml_templates/balises/cas.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xml_templates/balises/cas.html b/xml_templates/balises/cas.html index 038cf5a..738538e 100644 --- a/xml_templates/balises/cas.html +++ b/xml_templates/balises/cas.html @@ -11,7 +11,7 @@ ] [(#_elements:COMPTEUR_BOUCLE|=={1}|oui) @@ -23,3 +23,5 @@

    + +[
    (#ENV**|unserialize|print_r{1})
    ] \ No newline at end of file From 0b7c70fb629f360380e4cce54702d930e8856b20 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 31 May 2017 10:47:31 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Oups=E2=80=A6=20d=C3=A9cid=C3=A9ment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xml_templates/balises/cas.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/xml_templates/balises/cas.html b/xml_templates/balises/cas.html index 738538e..8f6a447 100644 --- a/xml_templates/balises/cas.html +++ b/xml_templates/balises/cas.html @@ -23,5 +23,3 @@

    - -[
    (#ENV**|unserialize|print_r{1})
    ] \ No newline at end of file From 6da94f734dd57e207ea20830324203ac8b55040f Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 31 May 2017 11:18:13 +0200 Subject: [PATCH 6/7] Boucle conditionnelle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Si l’élément est vide, ne pas afficher le tag html englobant. --- xml_templates/balises/liste.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xml_templates/balises/liste.html b/xml_templates/balises/liste.html index f986876..a04d00b 100644 --- a/xml_templates/balises/liste.html +++ b/xml_templates/balises/liste.html @@ -6,11 +6,13 @@ [(#VALEUR{attributes/type}|=={puce}|oui)
      ] +
      • +       [(#VALEUR{attributes/type}|=={puce}|oui)
    ] From 179687d8c9c98446298af1412d9de82409bfe9f3 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 31 May 2017 15:51:35 +0200 Subject: [PATCH 7/7] =?UTF-8?q?Le=20test=20isset()=20faussait=20l=E2=80=99?= =?UTF-8?q?ordre=20d=E2=80=99affichage=20des=20tags.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comarquage_fonctions.php | 2 +- xml_templates/balises/texteinterne.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/comarquage_fonctions.php b/comarquage_fonctions.php index ee995c2..609eeb7 100644 --- a/comarquage_fonctions.php +++ b/comarquage_fonctions.php @@ -223,7 +223,7 @@ function inc_comarquagexml_to_array($u, $utiliser_namespace = false) { if ($paragraphe) { for ($i = 0; $i < $paragraphe->length; $i++) { for ($x = 0; $x < $paragraphe->item($i)->childNodes->length; $x++) { - if (isset($paragraphe->item($i)->childNodes->item($x)->tagName) and is_null($paragraphe->item($i)->childNodes->item($x)->tagName)) { + if (is_null($paragraphe->item($i)->childNodes->item($x)->tagName)) { // code http://php.net/manual/fr/domnode.replacechild.php#48485 // Ajouts d'un noeud "texteInterne" diff --git a/xml_templates/balises/texteinterne.html b/xml_templates/balises/texteinterne.html index c7073e3..c2bf234 100644 --- a/xml_templates/balises/texteinterne.html +++ b/xml_templates/balises/texteinterne.html @@ -6,3 +6,4 @@ #VALEUR{text} +[(#FILTRE{trim})] \ No newline at end of file