wikitag: comparison Controller/WikiTagController.php

equal deleted inserted replaced

-:0e57c730bb18
+:54f204bceb28
 return $this->render('WikiTagBundle:WikiTag:css.html.twig');
 }
 /**
 * Renders the little html to add the javascript
-* TODO: review why this injection in javascript, t10n?
+*
-*/
+* @param unknown_type $tags_list
-public function addJavascriptAction($tags_list=FALSE)
+* @return \Symfony\Bundle\FrameworkBundle\Controller\Response
+*/
+public function addJavascriptAction($tags_list=false)
 {
 $cats = $this->getDoctrine()->getRepository('WikiTagBundle:Category')->findOrderedCategories();
 // $cats is {"Label":"Créateur"},{"Label":"Datation"},...
 $nbCats = count($cats);
 $ar = array('' => '');
-for($i=0;$i<$nbCats;$i++){
+for($i=0;$i<$nbCats;$i++) {
 $temp = array($cats[$i]["label"] => $cats[$i]["label"]);
 $ar = array_merge($ar, $temp);
 }
 // ... so we create is json like {"":""},{"Créateur":"Créateur"},{"Datation":"Datation"},...
 $categories = json_encode($ar);
 return $this->renderDocTags($id_doc);
 }
 /**
-*
+* Action to remove a tag from a document tag list
-* TODO: Enter description here ...
 * @return \Symfony\Bundle\FrameworkBundle\Controller\Response
 */
 public function removeTagFromListAction()
 {
 $id_doc = $this->getRequest()->request->get('wikitag_document_id');
 $id_tag = $this->getRequest()->request->get('tag_id');
 // We get the DocumentTag meant to be deleted, and remove it.
 $em = $this->getDoctrine()->getEntityManager();
-//TODO: use external id
 $dt = $this->getDoctrine()->getRepository('WikiTagBundle:DocumentTag')->findOneByDocumentExternalId($id_doc, array('tag' => $id_tag));
 $em->remove($dt);
 $em->flush();
 if($created==true || $nb_tags==0){
 $new_order_ar = $this->getDoctrine()->getRepository('WikiTagBundle:DocumentTag')->getMaxOrder($id_doc);
 // The result is a double array. And reset(reset($newOrderAr)) is not allowed. And a string is returned.
 $a1 = reset($new_order_ar);
 $new_order = intval(reset($a1)) + 1;
-// TODO: use a factory that returns an DocumentTagInterface
 $new_DT = new DocumentTag();
 $new_DT->setDocument($this->getDoctrine()->getRepository('WikiTagBundle:Document')->findOneByExternalId($id_doc));
 $new_DT->setTag($tag);
 $new_DT->setOriginalOrder($new_order);
 $new_DT->setTagOrder($new_order);
 return $this->renderDocTags($id_doc);
 }
 /**
-*
+* Action to remove the wikipedia link form a tag. This action create a copy of the original tag with all the link to wikipedia set to null.
-* TODO: Enter description here ...
+*
 * @return \Symfony\Bundle\FrameworkBundle\Controller\Response
 */
 public function removeWpLinkAction()
 {
 $id_doc = $this->getRequest()->request->get('wikitag_document_id');
 $un_tag = $this->getDoctrine()->getRepository('WikiTagBundle:Tag')->findOneBy(array('label'=>$tag->getLabel(), 'urlStatus'=>Tag::$TAG_URL_STATUS_DICT['null_result']));
 $em = $this->getDoctrine()->getEntityManager();
 $un_tag_created = FALSE;
 if(!$un_tag){
 // Create another tag almost identical, without the W info
-// TODO: use a factory that return a TagInterface
 $un_tag = new Tag();
 $un_tag->setLabel($tag->getLabel());
 $un_tag->setOriginalLabel($tag->getOriginalLabel());
 $un_tag->setUrlStatus(Tag::$TAG_URL_STATUS_DICT['null_result']);
 $un_tag->setWikipediaUrl(null);
 $un_tag->setWikipediaPageId(null);
+$un_tag->setAlternativeWikipediaUrl(null);
+$un_tag->setAlternativeWikipediaPageId(null);
+$un_tag->setAlternativeLabel(null);
 $un_tag->setDbpediaUri(null);
 $un_tag->setCategory($tag->getCategory());
 $un_tag->setAlias($tag->getAlias());
 $un_tag->setPopularity($tag->getPopularity());
 $em->persist($un_tag);
-$un_tag_created = TRUE;
+$un_tag_created = true;
 }
 if($id_doc && $id_doc!=""){
 // We associate the unsemantized tag to the DocumentTag and save datas
 $dt = $this->getDoctrine()->getRepository('WikiTagBundle:DocumentTag')->findOneByDocumentExternalId($id_doc, array('tag' => $id_tag));
 }
 }
 /**
-*
+* Action to update a tag category.
-* TODO: Enter description here ...
+* @return \Symfony\Bundle\FrameworkBundle\Controller\Response
 */
 public function updateTagCategoryAction()
 {
 $id_doc = $this->getRequest()->request->get('wikitag_document_id');
 $id_tag = $this->getRequest()->request->get('id');
 return $this->render('WikiTagBundle:WikiTag:tagTable.html.twig', array('ordered_tags' => $ordered_tags, 'doc_id' => $id_doc));
 }
 /**
-*
+* Action to update the tag alias.
-* TODO : Enter description here ...
+	 *
-* TODO : implement
 * @return \Symfony\Bundle\FrameworkBundle\Controller\Response
 */
 public function updateTagAliasAction()
 {
 $id_tag = $this->getRequest()->request->get('id');
 return $this->renderAllTags($num_page, $nb_by_page, $sort, $searched);
 }
 }
 /**
-* List of all tags
+* List all tags, with pagination and search.
-* TODO: Enter description here ...
+*
+* @return \Symfony\Bundle\FrameworkBundle\Controller\Response
 */
 public function allTagsAction()
 {
 // $this->getRequest()->query->get('foo') does not work "because" we are a second controller. So we have to use $_GET.
 // Searched string

changeset 43	54f204bceb28
parent 42	0e57c730bb18
child 47	34718ebfb3c0