wikitag: comparison Controller/WikiTagController.php

equal deleted inserted replaced

-:780ef37e63b9
+:99c15cfe420b
 /**
 * Renders the little html to add the javascript
 * TODO: review why this injection in javascript, t10n?
 */
-public function addJavascriptAction()
+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('' => '');
 $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:javascript.html.twig', array('categories' => $categories));
+return $this->render('WikiTagBundle:WikiTag:javascript.html.twig', array('categories' => $categories,'tags_list' => $tags_list));
 }
 /**
 * Display a list of ordered tag for a document
 * @param integer $id_doc
 return $this->renderDocTags($id_doc);
 }
 /**
-*
+* Modify the tag in the context of a tag list for one document
-* TODO: Enter description here ...
+*
 */
 public function modifyDocumentTagAction()
 {
 $id_doc = $this->getRequest()->request->get('wikitag_document_id');
 $tag_label = $this->getRequest()->request->get('value');
 // We create the new tag or get the already existing tag. $tag, $revision_id, $created
 $ar = WikiTagUtils::getOrCreateTag($tag_label, $this->getDoctrine());// tag, revision_id, created = get_or_create_tag(tag_label)
 $tag = $ar[0];
 $revision_id = $ar[1];
 $created = $ar[2];
 // We get the DocumentTag and change its tag
 $dt = $this->getDoctrine()->getRepository('WikiTagBundle:DocumentTag')->findOneBy(array('document' => $id_doc, 'tag' => $id_moved_tag));
 $dt->setTag($tag);
 $dt->setWikipediaRevisionId($revision_id);
 //
 //kwargs = {DJANGO_ID + "__exact": unicode(ds_id)}
 //results = SearchQuerySet().filter(title=tag_label).filter_or(description=tag_label).filter(**kwargs)
 //if len(results) > 0:
 //    ts.index_note = results[0].score
 //
+// We set ManualOrder = true for the current document
+$doc = $this->getDoctrine()->getRepository('WikiTagBundle:Document')->findOneBy(array('externalId' => $id_doc));
+$doc->setManualOrder(true);
 // We save the datas
-$doc = $this->getDoctrine()->getRepository('WikiTagBundle:Document')->findOneBy(array('id' => $id_doc));
-$doc->setManualOrder(true);
 $em->flush();
-}
+// We render the document's tags
+return $this->renderDocTags($id_doc);
-return $this->renderDocTags($id_doc);
+}
 }
 /**
 *
 * @Route("/wtrtd")
 public function renderDocTags($id_doc)
 {
 $ordered_tags = $this->getDoctrine()->getRepository('WikiTagBundle:DocumentTag')->findOrderedTagsForDoc($id_doc);
 return $this->render('WikiTagBundle:WikiTag:tagTable.html.twig', array('ordered_tags' => $ordered_tags, 'doc_id' => $id_doc));
 }
-/**
-*
-* TODO: Enter description here ...
-* TODO : implement
-*/
-public function resetWpInfoAction()
-{
-$id_doc = $this->getRequest()->request->get('wikitag_document_id');
-return $this->renderDocTags($id_doc);
-}
 /**
 *
 * TODO : Enter description here ...
 array('tags' => $tags, 'searched' => $searched, 'search_def' => $search_def, 'nb_by_page' => $nb_by_page, 'sort' => $sort,
 'start_index' => $start_index, 'end_index' => $end_index, 'nb_total' => $nb_total, 'num_page' => $num_page, 'last_page' => $last_page,
 	'prev_page' => $prev_page, 'next_page' => $next_page, 'reverse_sort' => $reverse_sort, 'route_for_documents_by_tag' => $this->container->getParameter("wiki_tag.route_for_documents_by_tag")));
 }
+/**
+* Modify the tag in the context of all tags list.
+*/
+public function modifyTagAction()
+{
+$tag_label = $this->getRequest()->request->get('value');
+$id_moved_tag = $this->getRequest()->request->get('id');
+$moved_tag = $this->getDoctrine()->getRepository('WikiTagBundle:Tag')->findOneBy(array('id' => $id_moved_tag));
+// We update the tag label and its wikipedia info with the new label.
+$this->updateTagWithNewLabel($moved_tag, $tag_label);
+// We render the tag list.
+$num_page = $this->getRequest()->request->get('num_page');
+$nb_by_page = $this->getRequest()->request->get('nb_by_page');
+$sort = $this->getRequest()->request->get('sort');
+$searched = $this->getRequest()->request->get('searched');
+return $this->renderAllTags($num_page, $nb_by_page, $sort, $searched);
+}
+/**
+*
+* Resemantize the tag with its original label. Kind of undo if we changed the tag's label.
+*
+*/
+public function resetWpInfoAction()
+{
+$id_moved_tag = $this->getRequest()->request->get('tag_id');
+$moved_tag = $this->getDoctrine()->getRepository('WikiTagBundle:Tag')->findOneBy(array('id' => $id_moved_tag));
+// We update the tag label and its wikipedia info with the original label.
+$this->updateTagWithNewLabel($moved_tag, $moved_tag->getOriginalLabel());
+// We render the tag list.
+$num_page = $this->getRequest()->request->get('num_page');
+$nb_by_page = $this->getRequest()->request->get('nb_by_page');
+$sort = $this->getRequest()->request->get('sort');
+$searched = $this->getRequest()->request->get('searched');
+return $this->renderAllTags($num_page, $nb_by_page, $sort, $searched);
+}
+/**
+* Generic render partial template for tag list
+*/
+private function updateTagWithNewLabel($tag, $label)
+{
+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);
+$new_label = $wp_response['new_label'];
+$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);
+}
+if($status!=null){
+$tag->setUrlStatus($status);
+}
+$tag->setWikipediaUrl($url);
+$tag->setWikipediaPageId($pageid);
+$tag->setDbpediaUri($dbpedia_uri);
+// Save datas.
+$em = $this->getDoctrine()->getEntityManager();
+$em->persist($tag);
+$em->flush();
+}
+}
+}
 /**
 * Generic render partial template for tag list
 */
 public function renderAllTags($num_page=NULL, $nb_by_page=NULL, $sort=NULL, $searched=NULL)
 $sort = $ar[4];
 $reverse_sort = $ar[5];
 return $this->render('WikiTagBundle:WikiTag:TagListTable.html.twig',
 array('tags' => $tags, 'searched' => $searched, 'nb_by_page' => $nb_by_page, 'sort' => $sort, 'num_page' => $num_page,
-	'reverse_sort' => $reverse_sort, 'route_for_documents_by_tag' => WikiTagController::$ROUTE_FOR_DOCUMENTS_BY_TAG));
+	'reverse_sort' => $reverse_sort, 'route_for_documents_by_tag' => $this->container->getParameter("wiki_tag.route_for_documents_by_tag")));
 return $this->getAllTags();
 }

changeset 22	99c15cfe420b
parent 21	780ef37e63b9
child 26	9eab3e86db7d