wikitag: comparison Controller/WikiTagController.php

equal deleted inserted replaced

-:6f643fc1de26
+:34718ebfb3c0
 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->render('WikiTagBundle:WikiTag:documentTags.html.twig', array('ordered_tags' => $ordered_tags, 'doc_id' => $id_doc, 'profile_name' => $profile_name, 'columns' => $columns_array));
 }
 /**
 *
-* TODO : Enter description here ...
+* The action called when a tag is moved in a document tag list.
+*
 * @return \Symfony\Bundle\FrameworkBundle\Controller\Response
 */
 public function tagUpDownAction()
 {
 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 the label was found, we sent a bad request
 if($found==true){
 return new Response(json_encode(array('error' => 'duplicate_tag', 'message' => sprintf("Le tag %s existe déjà pour cette fiche.", $tag_label))),400);
 }
 // We create the new tag or get the already existing tag. $tag, $revision_id, $created
-$ar = WikiTagUtils::getOrCreateTag($tag_label, $this->getDoctrine());
+$ar = $this->getDoctrine()->getRepository('WikiTagBundle:Tag')->getOrCreateTag($tag_label);
 $tag = $ar[0];
 $revision_id = $ar[1];
 $created = $ar[2];
 // We get the DocumentTag and change its tag
 return $this->renderDocTags($id_doc);
 }
 /**
-*
+* The action called to reorder the the tags of a document. The tags are reordered according to the indexation score of the tag label on the document.
-* TODO : Enter description here ...
+* The fields taken into account for calculating the score are defined in the wikitag configuration.
-* TODO : implement
 */
 public function reorderTagDocumentAction()
 {
 $id_doc = $this->getRequest()->request->get('wikitag_document_id');
 $res = $this->getDoctrine()->getRepository('WikiTagBundle:Document');
 return $this->renderDocTags($id_doc);
 }
 /**
-*
+* The action called to add a new tag (especially from the completion box)
-* TODO: Enter description here ...
 */
 public function addTagAction()
 {
 $id_doc = $this->getRequest()->request->get('wikitag_document_id');
 $tag_label = $this->getRequest()->request->get('value');
 if($found==true){
 //TODO : translation
 return new Response(json_encode(array('error' => 'duplicate_tag', 'message' => sprintf("Le tag %s existe déjà pour cette fiche.", $tag_label))),400);
 }
 // returns array($tag, $revision_id, $created)
-$ar = WikiTagUtils::getOrCreateTag($tag_label, $this->getDoctrine());// tag, revision_id, created = get_or_create_tag(tag_label)
+$ar = $this->getDoctrine()->getRepository('WikiTagBundle:Tag')->getOrCreateTag($tag_label);// tag, revision_id, created = get_or_create_tag(tag_label)
 $tag = $ar[0];
 $revision_id = $ar[1];
 $created = $ar[2];
 $tags = $this->getDoctrine()->getRepository('WikiTagBundle:DocumentTag')->findByDocumentExternalId($id_doc, array('tag'=>$tag->getId()));
 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, 'columns' => null));
 }
 /**
-*
+* 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
 if($tag!=null && $label!=null){
 if($label!=$tag->getLabel()){
 // We get the Wikipedia informations for the sent label
 $tag_label_normalized = WikiTagUtils::normalizeTag($label);
 $wp_response = WikiTagUtils::getWikipediaInfo($tag_label_normalized);
-//return new Response(var_dump($wp_response));
+$tag->setWikipediaInfo($wp_response);
-$new_label = $tag_label_normalized;
-$status = $wp_response['status'];
-$url = $wp_response['wikipedia_url'];
-$pageid = $wp_response['pageid'];
-$dbpedia_uri = $wp_response["dbpedia_uri"];
-$wikipedia_revision_id = $wp_response['revision_id'];
-// We save the datas : we DO NOT create a new tag, we change the current tag's informations
-if($new_label!=null){
-$tag->setLabel($new_label);
-}
-else{
-$tag->setLabel($tag_label_normalized);
-}
-if(!is_null($status)){
-$tag->setUrlStatus($status);
-}
-else{
-$tag->setUrlStatus(Tag::$TAG_URL_STATUS_DICT['null_result']);
-}
-$tag->setWikipediaUrl($url);
-$tag->setWikipediaPageId($pageid);
-$tag->setDbpediaUri($dbpedia_uri);
 // Save datas.
 $em = $this->getDoctrine()->getEntityManager();
 $em->persist($tag);
 $em->flush();
 }

changeset 47	34718ebfb3c0
parent 46	6f643fc1de26
parent 43	54f204bceb28
child 49	e854d8cb376c