# HG changeset patch
# User cavaliet
# Date 1330077301 -3600
# Node ID 021131fbe2c571695ce3bac8f1ff26ccae33cc72
# Parent  bb7808e180c36f859a9d986d6639d87504c9e71e# Parent  ca2a145e67f350ba8d00c9ff62e9ad001f2c1c8e
merge

diff -r bb7808e180c3 -r 021131fbe2c5 .buildpath
--- a/.buildpath	Thu Feb 23 18:52:59 2012 +0100
+++ b/.buildpath	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+<!--
+  This file is part of the WikiTagBundle package.
+
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+-->
 <?xml version="1.0" encoding="UTF-8"?>
 <buildpath>
 	<buildpathentry kind="src" path=""/>
diff -r bb7808e180c3 -r 021131fbe2c5 .hgignore
--- a/.hgignore	Thu Feb 23 18:52:59 2012 +0100
+++ b/.hgignore	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+##
+#  This file is part of the WikiTagBundle package.
+#
+#  (c) IRI <http://www.iri.centrepompidou.fr/>
+#
+#  For the full copyright and license information, please view the LICENSE
+#  file that was distributed with this source code.
+##
 syntax: regexp
 ^\.settings$
 .*\.orig$
diff -r bb7808e180c3 -r 021131fbe2c5 .project
--- a/.project	Thu Feb 23 18:52:59 2012 +0100
+++ b/.project	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+<!--
+  This file is part of the WikiTagBundle package.
+
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+-->
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>wikitag</name>
diff -r bb7808e180c3 -r 021131fbe2c5 Command/CreateSchemaDoctrineCommand.php
--- a/Command/CreateSchemaDoctrineCommand.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Command/CreateSchemaDoctrineCommand.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of the WikiTagBundle package.
  *
diff -r bb7808e180c3 -r 021131fbe2c5 Controller/WikiTagController.php
--- a/Controller/WikiTagController.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Controller/WikiTagController.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,12 +1,12 @@
 <?php
 /*
-* This file is part of the WikiTagBundle package.
-*
-* (c) IRI <http://www.iri.centrepompidou.fr/>
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Controller;
 
diff -r bb7808e180c3 -r 021131fbe2c5 DependencyInjection/Configuration.php
--- a/DependencyInjection/Configuration.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/DependencyInjection/Configuration.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,5 +1,12 @@
 <?php
-
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 namespace IRI\Bundle\WikiTagBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\ScalarNode;
diff -r bb7808e180c3 -r 021131fbe2c5 DependencyInjection/WikiTagExtension.php
--- a/DependencyInjection/WikiTagExtension.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/DependencyInjection/WikiTagExtension.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\DependencyInjection;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Entity/Category.php
--- a/Entity/Category.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Entity/Category.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Entity;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Entity/CategoryRepository.php
--- a/Entity/CategoryRepository.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Entity/CategoryRepository.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Entity;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Entity/DocumentRepository.php
--- a/Entity/DocumentRepository.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Entity/DocumentRepository.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Entity;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Entity/DocumentTag.php
--- a/Entity/DocumentTag.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Entity/DocumentTag.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Entity;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Entity/DocumentTagRepository.php
--- a/Entity/DocumentTagRepository.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Entity/DocumentTagRepository.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Entity;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Entity/Tag.php
--- a/Entity/Tag.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Entity/Tag.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Entity;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Entity/TagRepository.php
--- a/Entity/TagRepository.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Entity/TagRepository.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Entity;
 
@@ -36,8 +44,10 @@
     public function getCompletion($seed)
     {
         $qb = $this->getEntityManager()->createQueryBuilder();
-        $qb->select('DISTINCT t.label');
+        $qb->select('t.label', 'COUNT(dt.id) AS nb_docs');
         $qb->from('WikiTagBundle:Tag','t');
+        $qb->leftJoin('t.documents', 'dt', 'WITH', 't = dt.tag');
+        $qb->addGroupBy('t.label');
         $qb->where($qb->expr()->orx(
             $qb->expr()->like('t.label',$qb->expr()->literal(addcslashes(mysql_real_escape_string($seed),"%_")."%")),
             $qb->expr()->like('t.label',$qb->expr()->literal("%".addcslashes(mysql_real_escape_string($seed),"%_"))),
diff -r bb7808e180c3 -r 021131fbe2c5 Model/DocumentInterface.php
--- a/Model/DocumentInterface.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Model/DocumentInterface.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of the WikiTagBundle package.
  *
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/config/doctrine/Category.orm.yml
--- a/Resources/config/doctrine/Category.orm.yml	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/config/doctrine/Category.orm.yml	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+##
+# This file is part of the WikiTagBundle package.
+#
+# (c) IRI <http://www.iri.centrepompidou.fr/>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+##
+
 IRI\Bundle\WikiTagBundle\Entity\Category:
   type: entity
   repositoryClass: IRI\Bundle\WikiTagBundle\Entity\CategoryRepository
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/config/doctrine/Document.orm.yml
--- a/Resources/config/doctrine/Document.orm.yml	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/config/doctrine/Document.orm.yml	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+##
+# This file is part of the WikiTagBundle package.
+#
+# (c) IRI <http://www.iri.centrepompidou.fr/>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+##
+
 IRI\Bundle\WikiTagBundle\Entity\Document:
   type: entity
   repositoryClass: IRI\Bundle\WikiTagBundle\Entity\DocumentRepository
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/config/doctrine/DocumentTag.orm.yml
--- a/Resources/config/doctrine/DocumentTag.orm.yml	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/config/doctrine/DocumentTag.orm.yml	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+##
+# This file is part of the WikiTagBundle package.
+#
+# (c) IRI <http://www.iri.centrepompidou.fr/>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+##
+
 IRI\Bundle\WikiTagBundle\Entity\DocumentTag:
   type: entity
   repositoryClass: IRI\Bundle\WikiTagBundle\Entity\DocumentTagRepository
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/config/doctrine/Tag.orm.yml
--- a/Resources/config/doctrine/Tag.orm.yml	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/config/doctrine/Tag.orm.yml	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+##
+# This file is part of the WikiTagBundle package.
+#
+# (c) IRI <http://www.iri.centrepompidou.fr/>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+##
+
 IRI\Bundle\WikiTagBundle\Entity\Tag:
   type: entity
   repositoryClass: IRI\Bundle\WikiTagBundle\Entity\TagRepository
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/config/routing.yml
--- a/Resources/config/routing.yml	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/config/routing.yml	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+##
+# This file is part of the WikiTagBundle package.
+#
+# (c) IRI <http://www.iri.centrepompidou.fr/>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+##
+
 wikitag_home:
     pattern:  /
     defaults: { _controller: WikiTagBundle:WikiTag:index }
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/config/services.yml
--- a/Resources/config/services.yml	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/config/services.yml	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+##
+# This file is part of the WikiTagBundle package.
+#
+# (c) IRI <http://www.iri.centrepompidou.fr/>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+##
+
 parameters:
 #    wiki_tag.example.class: IRI\Bundle\WikiTagBundle\Example
     wiki_tag.document_listener.class: IRI\Bundle\WikiTagBundle\Listener\DocumentListener
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/public/css/clickmenu.css
--- a/Resources/public/css/clickmenu.css	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/public/css/clickmenu.css	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 div.cmDiv
 {
 	border: 1px solid black;
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/public/css/wikiTag.css
--- a/Resources/public/css/wikiTag.css	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/public/css/wikiTag.css	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,12 @@
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 @charset "UTF-8";
 
 .wikitag_hand_cursor, .wikitag_reset_wp_info {
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/public/js/wikiTag.js
--- a/Resources/public/js/wikiTag.js	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/public/js/wikiTag.js	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,13 @@
 // -*- coding: utf-8 -*-
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 function wikitag_init_tags_events()
 {
     // Tag simple operations : activate/unactivate wp link, reset wp info, remove wp link, remove tag from list
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/translations/messages.fr.xliff
--- a/Resources/translations/messages.fr.xliff	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/translations/messages.fr.xliff	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+<!--
+  This file is part of the WikiTagBundle package.
+
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+-->
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
     <file source-language="en" datatype="plaintext" original="file.ext">
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/TagList.html.twig
--- a/Resources/views/WikiTag/TagList.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/TagList.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 <form method="GET" action="">
   <p>Chercher : 
     {% for k,v in search_def %}
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/TagListTable.html.twig
--- a/Resources/views/WikiTag/TagListTable.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/TagListTable.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 {% block tag_table %}
     <table id="wikitag_alltags_table">
     <tr><th>id</th>
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/contextSearchDiv.html.twig
--- a/Resources/views/WikiTag/contextSearchDiv.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/contextSearchDiv.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 {# partial display for context search div #}
 <div id="wikitag_context_div" class="wikitag_context_static wikitag_context_change">
 <p>Choisissez le tag à ajouter<span style="float:right" class="wikitag_hand_cursor" id="wikitag_context_close" ><b>X</b></span></p>
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/css.html.twig
--- a/Resources/views/WikiTag/css.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/css.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 {# partial display to add the needed CSS #}
 <link rel="stylesheet" href="{{ asset('bundles/wikitag/css/clickmenu.css') }}" type="text/css"/>
 <link rel="stylesheet" href="{{ asset('bundles/wikitag/css/wikiTag.css') }}" type="text/css"/>
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/documentTags.html.twig
--- a/Resources/views/WikiTag/documentTags.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/documentTags.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 {# partial display document's tags #}
 {% block document_tags %}
 <div id="tags_commands" style="float:left;width: 100%" >
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/javascript.html.twig
--- a/Resources/views/WikiTag/javascript.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/javascript.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 {# partial display to add the needed Javascript #}
 <script type="text/javascript" src="{{ asset('bundles/wikitag/js/jquery.min.js') }}" ></script>
 <script type="text/javascript" src="{{ asset('bundles/wikitag/js/jquery.qtip.min.js') }}" ></script>
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/javascriptForContextSearch.html.twig
--- a/Resources/views/WikiTag/javascriptForContextSearch.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/javascriptForContextSearch.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 {# partial display to add the needed Javascript for context search #}
 {# We suppose the all the JS (jquery and stuffs and wikiTag.js) have already been loaded. See javascript.html.twig #}
 <script type="text/javascript">
diff -r bb7808e180c3 -r 021131fbe2c5 Resources/views/WikiTag/tagTable.html.twig
--- a/Resources/views/WikiTag/tagTable.html.twig	Thu Feb 23 18:52:59 2012 +0100
+++ b/Resources/views/WikiTag/tagTable.html.twig	Fri Feb 24 10:55:01 2012 +0100
@@ -1,3 +1,11 @@
+{#
+  This file is part of the WikiTagBundle package.
+ 
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+ 
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+#}
 {# partial display document's tags (table only) #}
   <table id="wikitag_table">
    <thead>
diff -r bb7808e180c3 -r 021131fbe2c5 Services/SearchService.php
--- a/Services/SearchService.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Services/SearchService.php	Fri Feb 24 10:55:01 2012 +0100
@@ -49,12 +49,12 @@
     
     
     /**
+     * Search.
      *
-     * Enter description here ...
      * @param mixed $value : either a string or the list of fields to search into ; format : ['<field_name>' => ['weight'=><relative weight of the field>, 'value' => value]]
      * @param array $conditions : array : key : field name, value : simple value (operator is "=") or array(valuea, value2,...) (operator is IN) or array("operator"=>"=","!=","<".">","<=".">=","like","ilike","in">, "value"=>value)
      * @param array $fields : The field of field names to export, one of the list specified in the configuration file
-     * @return array []
+     * @return array [{'host_doc_id'=>,'wikitag_doc_id'=>, 'wikitag_doc'=>, '_score'=>,'field1'=>, 'field2'=>, }]
      */
     public function search($value, array $conditions = null, array $fields = null)
     {
@@ -145,16 +145,17 @@
     /**
      * List the tag label containing the seed given as an argument.
      * The seed is either at the beggining, the end of the label or at the beggining of a word.
-     * @param unknown_type $seed
-     * @return : an array containing the possible tag labels
+     * @param string $seed
+     * @param boolean $doc_nb
+     * @return : an array containing the possible tag labels with the number of documents
      */
-    public function completion($seed)
+    public function completion($seed, $doc_nb=False)
     {
         $rep = $this->getDoctrine()->getRepository('WikiTagBundle:Tag');
         
         $res = array();
         foreach ($rep->getCompletion($seed) as $value) {
-            $res[] = $value['label'];
+            $res[] = array('label' => $value['label'], 'nb_docs' => $value['nb_docs']);
         }
         
         return $res;
diff -r bb7808e180c3 -r 021131fbe2c5 Tests/Controller/WikiTagControllerTest.php
--- a/Tests/Controller/WikiTagControllerTest.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Tests/Controller/WikiTagControllerTest.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Tests\Controller;
 
diff -r bb7808e180c3 -r 021131fbe2c5 Tests/Services/SearchServiceTest.php
--- a/Tests/Services/SearchServiceTest.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Tests/Services/SearchServiceTest.php	Fri Feb 24 10:55:01 2012 +0100
@@ -97,12 +97,20 @@
         $search_service = $this->get("wiki_tag.search");
     
         $result = $search_service->completion("tag");
+        $completion_result = array(
+        	'Tag1' => 2,
+        	'Tag2' => 4,
+        	'Tag3' => 5,
+            'Tag4' => 6
+        );
     
         $this->assertNotNull($result, "completion should not be null");
         $this->assertEquals(4, count($result));
         
         foreach ($result as $tagname) {
-            $this->assertEquals(0,strpos($tagname,"tag"));
+            $this->assertEquals(0,strpos($tagname['label'],"Tag"));
+            $this->assertArrayHasKey($tagname['label'], $completion_result);
+            $this->assertEquals($completion_result[$tagname['label']], $tagname['nb_docs']);
         }
     }
     
diff -r bb7808e180c3 -r 021131fbe2c5 Utils/WikiTagUtils.php
--- a/Utils/WikiTagUtils.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/Utils/WikiTagUtils.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle\Utils;
 
diff -r bb7808e180c3 -r 021131fbe2c5 WikiTagBundle.php
--- a/WikiTagBundle.php	Thu Feb 23 18:52:59 2012 +0100
+++ b/WikiTagBundle.php	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,12 @@
 <?php
+/*
+ * This file is part of the WikiTagBundle package.
+ *
+ * (c) IRI <http://www.iri.centrepompidou.fr/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace IRI\Bundle\WikiTagBundle;
 
diff -r bb7808e180c3 -r 021131fbe2c5 phpunit.xml.dist
--- a/phpunit.xml.dist	Thu Feb 23 18:52:59 2012 +0100
+++ b/phpunit.xml.dist	Fri Feb 24 10:55:01 2012 +0100
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  This file is part of the WikiTagBundle package.
+
+  (c) IRI <http://www.iri.centrepompidou.fr/>
+
+  For the full copyright and license information, please view the LICENSE
+  file that was distributed with this source code.
+-->
+
 
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
 <!-- command line in the host application : php bin/phpunit.php  -d memory_limit=512M -c vendor/bundles/IRI/Bundle/WikiTagBundle vendor/bundles/IRI/Bundle/WikiTagBundle/Tests/Services/SearchServiceTest.php -->