From 7476590037569ad511b448fdaaba8371ac81e40b Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@luxion>
Date: Wed, 1 Oct 2008 13:12:34 +0000
Subject: better tag handling

git-svn-id: svn://luxion/repos/WebCoso/trunk@381 fcb26f47-9200-0410-b104-b98ab5b095f3
---
 lib/WebCoso/Common.pm                              | 2 +-
 t/test-site-output/bar/baz/document.en.html        | 5 ++++-
 t/test-site-output/bar/baz/document.it.html        | 5 ++++-
 t/test-site-output/bar/document.en.html            | 5 ++++-
 t/test-site-output/bar/document.it.html            | 5 ++++-
 t/test-site-output/document.en.html                | 5 ++++-
 t/test-site-output/document.it.html                | 5 ++++-
 t/test-site-output/foo/document.en.html            | 5 ++++-
 t/test-site-output/foo/document.it.html            | 5 ++++-
 t/test-site-output/tags/one/document.en.html       | 5 ++++-
 t/test-site-output/tags/one/document.it.html       | 5 ++++-
 t/test-site-output/tags/three/bis/document.en.html | 5 ++++-
 t/test-site-output/tags/three/bis/document.it.html | 5 ++++-
 t/test-site-output/tags/three/document.en.html     | 5 ++++-
 t/test-site-output/tags/three/document.it.html     | 5 ++++-
 t/test-site-output/tags/two/document.en.html       | 8 ++++++--
 t/test-site-output/tags/two/document.it.html       | 8 ++++++--
 17 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/lib/WebCoso/Common.pm b/lib/WebCoso/Common.pm
index 0a0effe..9640135 100644
--- a/lib/WebCoso/Common.pm
+++ b/lib/WebCoso/Common.pm
@@ -139,7 +139,7 @@ sub getTags {
         my $doc=$fc->get($doc_name);
         my @tags=map {$_->textContent}
             $xpath->findnodes(
-                q{/document/docinfo/field[field_name='tags']/field_body/*/list_item},
+                q{/document/docinfo/field[field_name='tags']/field_body/*/list_item|/document/docinfo/field[field_name='tags']/field_body/paragraph},
                 $doc);
         chomp for @tags;
         push @{$tagged{$_}},$doc_name for @tags;
diff --git a/t/test-site-output/bar/baz/document.en.html b/t/test-site-output/bar/baz/document.en.html
index 530f7bd..7621bb1 100644
--- a/t/test-site-output/bar/baz/document.en.html
+++ b/t/test-site-output/bar/baz/document.en.html
@@ -18,6 +18,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/bar/baz/document.it.html b/t/test-site-output/bar/baz/document.it.html
index e258865..c257503 100644
--- a/t/test-site-output/bar/baz/document.it.html
+++ b/t/test-site-output/bar/baz/document.it.html
@@ -16,6 +16,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/bar/document.en.html b/t/test-site-output/bar/document.en.html
index ea706dd..a84b6e8 100644
--- a/t/test-site-output/bar/document.en.html
+++ b/t/test-site-output/bar/document.en.html
@@ -21,6 +21,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/bar/document.it.html b/t/test-site-output/bar/document.it.html
index 5ad0574..f90b351 100644
--- a/t/test-site-output/bar/document.it.html
+++ b/t/test-site-output/bar/document.it.html
@@ -19,6 +19,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/document.en.html b/t/test-site-output/document.en.html
index 1692418..f88fe09 100644
--- a/t/test-site-output/document.en.html
+++ b/t/test-site-output/document.en.html
@@ -18,6 +18,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 2008-03-01 10:04:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/document.it.html b/t/test-site-output/document.it.html
index 386f70a..8c17a42 100644
--- a/t/test-site-output/document.it.html
+++ b/t/test-site-output/document.it.html
@@ -15,6 +15,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/foo/document.en.html b/t/test-site-output/foo/document.en.html
index 7d11fc7..a69175e 100644
--- a/t/test-site-output/foo/document.en.html
+++ b/t/test-site-output/foo/document.en.html
@@ -18,6 +18,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/foo/document.it.html b/t/test-site-output/foo/document.it.html
index 12f2016..5a7fe12 100644
--- a/t/test-site-output/foo/document.it.html
+++ b/t/test-site-output/foo/document.it.html
@@ -14,6 +14,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/one/document.en.html b/t/test-site-output/tags/one/document.en.html
index 12fcba4..99e7b46 100644
--- a/t/test-site-output/tags/one/document.en.html
+++ b/t/test-site-output/tags/one/document.en.html
@@ -19,6 +19,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/one/document.it.html b/t/test-site-output/tags/one/document.it.html
index 85655e8..57876be 100644
--- a/t/test-site-output/tags/one/document.it.html
+++ b/t/test-site-output/tags/one/document.it.html
@@ -16,6 +16,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/three/bis/document.en.html b/t/test-site-output/tags/three/bis/document.en.html
index cc93ccb..5e904c3 100644
--- a/t/test-site-output/tags/three/bis/document.en.html
+++ b/t/test-site-output/tags/three/bis/document.en.html
@@ -18,6 +18,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/three/bis/document.it.html b/t/test-site-output/tags/three/bis/document.it.html
index 0e6d159..42d23fb 100644
--- a/t/test-site-output/tags/three/bis/document.it.html
+++ b/t/test-site-output/tags/three/bis/document.it.html
@@ -16,6 +16,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/three/document.en.html b/t/test-site-output/tags/three/document.en.html
index 97f482b..d769920 100644
--- a/t/test-site-output/tags/three/document.en.html
+++ b/t/test-site-output/tags/three/document.en.html
@@ -17,6 +17,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/three/document.it.html b/t/test-site-output/tags/three/document.it.html
index 4c225a0..83f699e 100644
--- a/t/test-site-output/tags/three/document.it.html
+++ b/t/test-site-output/tags/three/document.it.html
@@ -15,6 +15,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/two/document.en.html b/t/test-site-output/tags/two/document.en.html
index 6439ab1..7667ba7 100644
--- a/t/test-site-output/tags/two/document.en.html
+++ b/t/test-site-output/tags/two/document.en.html
@@ -2,7 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wc="http://webcoso.thenautilus.net/" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Category 'two'
 </title></head><body><div><h1>Category 'two'
-</h1><ul><li><a href="/foo/">foo page
+</h1><ul><li><a href="/bar/">bar (from template)
+</a></li><li><a href="/foo/">foo page
 </a></li></ul></div><div><dl><dt>Category 'one'
 </dt><dd><ul><li><a href="/bar/baz/">bar-baz english
 </a>
@@ -18,6 +19,9 @@
 </dt><dd><ul><li><a href="/foo/">foo page
 </a>
    (<a href="/foo/it">it</a> | en)
+  </li><li><a href="/bar/">bar (from template)
+</a>
+   (<a href="/bar/it">it</a> | en)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
diff --git a/t/test-site-output/tags/two/document.it.html b/t/test-site-output/tags/two/document.it.html
index 9b57700..12499d1 100644
--- a/t/test-site-output/tags/two/document.it.html
+++ b/t/test-site-output/tags/two/document.it.html
@@ -2,7 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wc="http://webcoso.thenautilus.net/" xml:lang="it" lang="it"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Categoria 'two'
 </title></head><body><div><h1>Categoria 'two'
-</h1><ul><li><a href="/foo/">Pagina <em>foo</em></a></li></ul></div><div><dl><dt>Categoria 'uno'
+</h1><ul><li><a href="/bar/">bar (generato)
+</a></li><li><a href="/foo/">Pagina <em>foo</em></a></li></ul></div><div><dl><dt>Categoria 'uno'
 </dt><dd><ul><li><a href="/bar/baz/">bar-baz italiano
 </a>
    (it | <a href="/bar/baz/en">en</a>)
@@ -15,6 +16,9 @@
   </li></ul></dd><dt>Categoria 'two'
 </dt><dd><ul><li><a href="/foo/">Pagina <em>foo</em></a>
    (it | <a href="/foo/en">en</a>)
+  </li><li><a href="/bar/">bar (generato)
+</a>
+   (it | <a href="/bar/en">en</a>)
   </li></ul></dd></dl></div><div>
   Creato: 1970-01-01 00:00:00
-  Ultima modifica: 2008-03-01 09:23:11</div></body></html>
+  Ultima modifica: 2008-10-01 13:11:30</div></body></html>
-- 
cgit v1.2.3