Changeset 31

Timestamp:

12/12/05 19:54:21 (3 years ago)

Author:

fabien

Message:

day 13 modifications

Files:

• trunk/config/schema.xml (modified) (1 diff)
• trunk/data/fixtures/test_data.yml (modified) (1 diff)
• trunk/frontend/config/routing.yml (modified) (1 diff)
• trunk/frontend/lib/helper/QuestionHelper.php (modified) (1 diff)
• trunk/frontend/modules/question/config/view.yml (added)
• trunk/frontend/modules/question/templates/_question_list.php (modified) (2 diffs)
• trunk/frontend/modules/sidebar/actions/actions.class.php (modified) (1 diff)
• trunk/frontend/modules/sidebar/templates/questionSuccess.php (added)
• trunk/frontend/modules/tag (added)
• trunk/frontend/modules/tag/actions (added)
• trunk/frontend/modules/tag/actions/actions.class.php (added)
• trunk/frontend/modules/tag/config (added)
• trunk/frontend/modules/tag/config/.sf (added)
• trunk/frontend/modules/tag/lib (added)
• trunk/frontend/modules/tag/lib/.sf (added)
• trunk/frontend/modules/tag/templates (added)
• trunk/frontend/modules/tag/templates/_question_tags.php (added)
• trunk/frontend/modules/tag/templates/showSuccess.php (added)
• trunk/frontend/modules/tag/validate (added)
• trunk/frontend/modules/tag/validate/.sf (added)
• trunk/lib/Tag.class.php (added)
• trunk/lib/model/Question.php (modified) (1 diff)
• trunk/lib/model/QuestionPeer.php (modified) (1 diff)
• trunk/lib/model/QuestionTag.php (added)
• trunk/lib/model/QuestionTagPeer.php (added)
• trunk/lib/model/map/QuestionTagMapBuilder.php (added)
• trunk/lib/model/om/BaseQuestion.php (modified) (5 diffs)
• trunk/lib/model/om/BaseQuestionTag.php (added)
• trunk/lib/model/om/BaseQuestionTagPeer.php (added)
• trunk/lib/model/om/BaseUser.php (modified) (5 diffs)
• trunk/test/frontend/tagActionsTest.php (added)

trunk/config/schema.xml

@@ -69 +69 @@
-   </table>
-
+   <table name="ask_question_tag" phpName="QuestionTag">
+     <column name="question_id" type="integer" />
+     <foreign-key foreignTable="ask_question">
+       <reference local="question_id" foreign="id" />
+     </foreign-key>
+     <column name="user_id" type="integer" />
+     <foreign-key foreignTable="ask_user">
+       <reference local="user_id" foreign="id" />
+     </foreign-key>
+     <column name="created_at" type="timestamp" />
+     <column name="tag" type="varchar" size="100" />
+     <column name="normalized_tag" type="varchar" size="100" />
+     <index name="normalized_tag_index">
+       <index-column name="normalized_tag" />
+     </index>
+   </table>
+
- </database>

trunk/data/fixtures/test_data.yml

@@ -91 +91 @@
-    user_id:   francois
-    score:     -1
+
+QuestionTag:
+  t1: { question_id: q1, user_id: fabien, tag: relatives }
+  t2: { question_id: q1, user_id: fabien, tag: girl }
+  t4: { question_id: q1, user_id: francois, tag: activities }
+  t6: { question_id: q2, user_id: francois, tag: 'real life' }
+  t5: { question_id: q2, user_id: fabien, tag: relatives }
+  t5: { question_id: q2, user_id: fabien, tag: present }
+  t6: { question_id: q2, user_id: francois, tag: 'real life' }
+  t7: { question_id: q3, user_id: francois, tag: blog }
+  t8: { question_id: q3, user_id: francois, tag: activities }

trunk/frontend/config/routing.yml

@@ -59 +59 @@
-  param: { module: user, action: logout }
-
+# tag
+tag:
+  url:   /tag/:tag
+  param: { module: tag, action: show }
+
-# feeds
-feed_recent_answers:

trunk/frontend/lib/helper/QuestionHelper.php

@@ -1 +1 @@
-<?php
-
+function tags_for_question($question, $max = 5)
+{
+  $tags = array();
+ 
+  foreach ($question->getPopularTags($max) as $tag => $count)
+  {
+    $tags[] = link_to($tag, '@tag?tag='.$tag);
+  }
+ 
+  return implode(' + ', $tags);
+}
+
-?>

trunk/frontend/modules/question/templates/_question_list.php

@@ -1 @@
-
+, 'Question'
-
-<?php foreach($question_pager->getResults() as $question): ?>
-  <div class="interested_block" id="block_<?php echo $question->getId() ?>">
-
+question/
-  </div>
-
@@ -11 +11 @@
-    <?php echo truncate_text(strip_tags($question->getHtmlBody()), 200) ?>
-  </div>
+  tags: <?php echo tags_for_question($question) ?>
-<?php endforeach ?>
-

trunk/frontend/modules/sidebar/actions/actions.class.php

@@ -14 +14 @@
-  {
-  }
+
+  public function executeQuestion()
+  {
+    $this->question = QuestionPeer::getQuestionFromTitle($this->getRequestParameter('stripped_title'));
+  }
-}
-

trunk/lib/model/Question.php

@@ -55 +55 @@
-    return $pager;
-  }
+
+  public function getTags()
+  {
+    $c = new Criteria();
+    $c->add(QuestionTagPeer::QUESTION_ID, $this->getId());
+    $c->addGroupByColumn(QuestionTagPeer::NORMALIZED_TAG);
+    $c->setDistinct();
+    $c->addAscendingOrderByColumn(QuestionTagPeer::NORMALIZED_TAG);
+
+    $tags = array();
+    foreach (QuestionTagPeer::doSelect($c) as $tag)
+    {
+      $tags[] = $tag->getNormalizedTag();
+    }
+
+    return $tags;
+  }
+
+  public function getPopularTags($max = 5)
+  {
+    $tags = array();
+
+    $con = Propel::getConnection();
+    $query = '
+      SELECT %s AS tag, COUNT(%s) AS count
+      FROM %s
+      WHERE %s = ?
+      GROUP BY %s
+      ORDER BY count DESC
+    ';
+
+    $query = sprintf($query,
+      QuestionTagPeer::NORMALIZED_TAG,
+      QuestionTagPeer::NORMALIZED_TAG,
+      QuestionTagPeer::TABLE_NAME,
+      QuestionTagPeer::QUESTION_ID,
+      QuestionTagPeer::NORMALIZED_TAG
+    );
+
+    $stmt = $con->prepareStatement($query);
+    $stmt->setInt(1, $this->getId());
+    $stmt->setLimit($max);
+    $rs = $stmt->executeQuery();
+    while ($rs->next())
+    {
+      $tags[$rs->getString('tag')] = $rs->getInt('count');
+    }
+
+    return $tags;
+  }
-}
-

trunk/lib/model/QuestionPeer.php

@@ -56 +56 @@
-    return $pager;
-  }
+
+  public static function getPopularByTag($tag, $page)
+  {
+    $c = new Criteria();
+    $c->add(QuestionTagPeer::NORMALIZED_TAG, $tag);
+    $c->addDescendingOrderByColumn(QuestionPeer::INTERESTED_USERS);
+    $c->addJoin(QuestionTagPeer::QUESTION_ID, QuestionPeer::ID, Criteria::LEFT_JOIN);
+
+    $pager = new sfPager('Question', 20);
+    $pager->setCriteria($c);
+    $pager->setPage($page);
+    $pager->init();
+
+    return $pager;
+  }
-}
-

trunk/lib/model/om/BaseQuestion.php

@@ -119 +119 @@
-     */
-    private $lastInterestCriteria = null;
+
+    /**
+     * Collection to store aggregation of collQuestionTags.
+     * @var array
+     */
+    protected $collQuestionTags;
+    
+    /**
+     * The criteria used to select the current contents of collQuestionTags.
+     * @var Criteria
+     */
+    private $lastQuestionTagCriteria = null;
-
-    /**
@@ -615 +627 @@
-            }
-
+            if ($this->collQuestionTags !== null) {
+                foreach($this->collQuestionTags as $referrerFK) {
+                    if (!$referrerFK->isDeleted()) {
+                        $affectedRows += $referrerFK->save($con);
+                    }
+                }
+            }
+
-            $this->alreadyInSave = false;
-        }
@@ -685 +705 @@
-                if ($this->collInterests !== null) {
-                    foreach($this->collInterests as $referrerFK) {
+                        if (($retval = $referrerFK->validate()) !== true) {
+                            $failureMap = array_merge($failureMap, $retval);
+                        }
+                    }
+                }
+
+                if ($this->collQuestionTags !== null) {
+                    foreach($this->collQuestionTags as $referrerFK) {
-                        if (($retval = $referrerFK->validate()) !== true) {
-                            $failureMap = array_merge($failureMap, $retval);
@@ -975 +1003 @@
-            }
-
+            foreach($this->getQuestionTags() as $relObj) {
+                $copyObj->addQuestionTag($relObj->copy($deepCopy));
+            }
+
-        } // if ($deepCopy)
-
@@ -1383 +1415 @@
-    }
-
+    /**
+     * Temporary storage of collQuestionTags to save a possible db hit in
+     * the event objects are add to the collection, but the
+     * complete collection is never requested.
+     * @return void
+     */
+    public function initQuestionTags()
+    {
+        if ($this->collQuestionTags === null) {
+            $this->collQuestionTags = array();
+        }
+    }
+
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this Question has previously
+     * been saved, it will retrieve related QuestionTags from storage.
+     * If this Question is new, it will return
+     * an empty collection or the current collection, the criteria
+     * is ignored on a new object.
+     *
+     * @param Connection $con
+     * @param Criteria $criteria
+     * @throws PropelException
+     */
+    public function getQuestionTags($criteria = null, $con = null)
+    {
+        // include the Peer class
+        include_once 'model/om/BaseQuestionTagPeer.php';
+        if ($criteria === null) {
+            $criteria = new Criteria();
+        }
+        elseif ($criteria instanceof Criteria)
+        {
+            $criteria = clone $criteria;
+        }
+
+        if ($this->collQuestionTags === null) {
+            if ($this->isNew()) {
+               $this->collQuestionTags = array();
+            } else {
+
+                $criteria->add(QuestionTagPeer::QUESTION_ID, $this->getId());
+
+                QuestionTagPeer::addSelectColumns($criteria);
+                $this->collQuestionTags = QuestionTagPeer::doSelect($criteria, $con);
+            }
+        } else {
+            // criteria has no effect for a new object
+            if (!$this->isNew()) {
+                // the following code is to determine if a new query is
+                // called for.  If the criteria is the same as the last
+                // one, just return the collection.
+
+
+                $criteria->add(QuestionTagPeer::QUESTION_ID, $this->getId());
+
+                QuestionTagPeer::addSelectColumns($criteria);
+                if (!isset($this->lastQuestionTagCriteria) || !$this->lastQuestionTagCriteria->equals($criteria)) {
+                    $this->collQuestionTags = QuestionTagPeer::doSelect($criteria, $con);
+                }
+            }
+        }
+        $this->lastQuestionTagCriteria = $criteria;
+        return $this->collQuestionTags;
+    }
+
+    /**
+     * Returns the number of related QuestionTags.
+     *
+     * @param Criteria $criteria
+     * @param Connection $con
+     * @throws PropelException
+     */
+    public function countQuestionTags($criteria = null, $con = null)
+    {
+        // include the Peer class
+        include_once 'model/om/BaseQuestionTagPeer.php';
+        if ($criteria === null) {
+            $criteria = new Criteria();
+        }
+        elseif ($criteria instanceof Criteria)
+        {
+            $criteria = clone $criteria;
+        }
+
+        $criteria->add(QuestionTagPeer::QUESTION_ID, $this->getId());
+
+        return QuestionTagPeer::doCount($criteria, $con);
+    }
+
+    /**
+     * Method called to associate a QuestionTag object to this object
+     * through the QuestionTag foreign key attribute
+     *
+     * @param QuestionTag $l QuestionTag
+     * @return void
+     * @throws PropelException
+     */
+    public function addQuestionTag(QuestionTag $l)
+    {
+        $this->collQuestionTags[] = $l;
+        $l->setQuestion($this);
+    }
+
+
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this Question is new, it will return
+     * an empty collection; or if this Question has previously
+     * been saved, it will retrieve related QuestionTags from storage.
+     *
+     * This method is protected by default in order to keep the public
+     * api reasonable.  You can provide public methods for those you
+     * actually need in Question.
+     */
+    public function getQuestionTagsJoinUser($criteria = null, $con = null)
+    {
+        // include the Peer class
+        include_once 'model/om/BaseQuestionTagPeer.php';
+        if ($criteria === null) {
+            $criteria = new Criteria();
+        }
+        elseif ($criteria instanceof Criteria)
+        {
+            $criteria = clone $criteria;
+        }
+
+        if ($this->collQuestionTags === null) {
+            if ($this->isNew()) {
+                $this->collQuestionTags = array();
+            } else {
+
+                $criteria->add(QuestionTagPeer::QUESTION_ID, $this->getId());
+
+                $this->collQuestionTags = QuestionTagPeer::doSelectJoinUser($criteria, $con);
+            }
+        } else {
+            // the following code is to determine if a new query is
+            // called for.  If the criteria is the same as the last
+            // one, just return the collection.
+
+            $criteria->add(QuestionTagPeer::QUESTION_ID, $this->getId());
+
+            if (!isset($this->lastQuestionTagCriteria) || !$this->lastQuestionTagCriteria->equals($criteria)) {
+                $this->collQuestionTags = QuestionTagPeer::doSelectJoinUser($criteria, $con);
+            }
+        }
+        $this->lastQuestionTagCriteria = $criteria;
+
+        return $this->collQuestionTags;
+    }
+
-} // BaseQuestion

trunk/lib/model/om/BaseUser.php

@@ -131 +131 @@
-     */
-    private $lastRelevancyCriteria = null;
+
+    /**
+     * Collection to store aggregation of collQuestionTags.
+     * @var array
+     */
+    protected $collQuestionTags;
+    
+    /**
+     * The criteria used to select the current contents of collQuestionTags.
+     * @var Criteria
+     */
+    private $lastQuestionTagCriteria = null;
-
-    /**
@@ -568 +580 @@
-            }
-
+            if ($this->collQuestionTags !== null) {
+                foreach($this->collQuestionTags as $referrerFK) {
+                    if (!$referrerFK->isDeleted()) {
+                        $affectedRows += $referrerFK->save($con);
+                    }
+                }
+            }
+
-            $this->alreadyInSave = false;
-        }
@@ -642 +662 @@
-                if ($this->collRelevancys !== null) {
-                    foreach($this->collRelevancys as $referrerFK) {
+                        if (($retval = $referrerFK->validate()) !== true) {
+                            $failureMap = array_merge($failureMap, $retval);
+                        }
+                    }
+                }
+
+                if ($this->collQuestionTags !== null) {
+                    foreach($this->collQuestionTags as $referrerFK) {
-                        if (($retval = $referrerFK->validate()) !== true) {
-                            $failureMap = array_merge($failureMap, $retval);
@@ -929 +957 @@
-            }
-
+            foreach($this->getQuestionTags() as $relObj) {
+                $copyObj->addQuestionTag($relObj->copy($deepCopy));
+            }
+
-        } // if ($deepCopy)
-
@@ -1547 +1579 @@
-    }
-
+    /**
+     * Temporary storage of collQuestionTags to save a possible db hit in
+     * the event objects are add to the collection, but the
+     * complete collection is never requested.
+     * @return void
+     */
+    public function initQuestionTags()
+    {
+        if ($this->collQuestionTags === null) {
+            $this->collQuestionTags = array();
+        }
+    }
+
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this User has previously
+     * been saved, it will retrieve related QuestionTags from storage.
+     * If this User is new, it will return
+     * an empty collection or the current collection, the criteria
+     * is ignored on a new object.
+     *
+     * @param Connection $con
+     * @param Criteria $criteria
+     * @throws PropelException
+     */
+    public function getQuestionTags($criteria = null, $con = null)
+    {
+        // include the Peer class
+        include_once 'model/om/BaseQuestionTagPeer.php';
+        if ($criteria === null) {
+            $criteria = new Criteria();
+        }
+        elseif ($criteria instanceof Criteria)
+        {
+            $criteria = clone $criteria;
+        }
+
+        if ($this->collQuestionTags === null) {
+            if ($this->isNew()) {
+               $this->collQuestionTags = array();
+            } else {
+
+                $criteria->add(QuestionTagPeer::USER_ID, $this->getId());
+
+                QuestionTagPeer::addSelectColumns($criteria);
+                $this->collQuestionTags = QuestionTagPeer::doSelect($criteria, $con);
+            }
+        } else {
+            // criteria has no effect for a new object
+            if (!$this->isNew()) {
+                // the following code is to determine if a new query is
+                // called for.  If the criteria is the same as the last
+                // one, just return the collection.
+
+
+                $criteria->add(QuestionTagPeer::USER_ID, $this->getId());
+
+                QuestionTagPeer::addSelectColumns($criteria);
+                if (!isset($this->lastQuestionTagCriteria) || !$this->lastQuestionTagCriteria->equals($criteria)) {
+                    $this->collQuestionTags = QuestionTagPeer::doSelect($criteria, $con);
+                }
+            }
+        }
+        $this->lastQuestionTagCriteria = $criteria;
+        return $this->collQuestionTags;
+    }
+
+    /**
+     * Returns the number of related QuestionTags.
+     *
+     * @param Criteria $criteria
+     * @param Connection $con
+     * @throws PropelException
+     */
+    public function countQuestionTags($criteria = null, $con = null)
+    {
+        // include the Peer class
+        include_once 'model/om/BaseQuestionTagPeer.php';
+        if ($criteria === null) {
+            $criteria = new Criteria();
+        }
+        elseif ($criteria instanceof Criteria)
+        {
+            $criteria = clone $criteria;
+        }
+
+        $criteria->add(QuestionTagPeer::USER_ID, $this->getId());
+
+        return QuestionTagPeer::doCount($criteria, $con);
+    }
+
+    /**
+     * Method called to associate a QuestionTag object to this object
+     * through the QuestionTag foreign key attribute
+     *
+     * @param QuestionTag $l QuestionTag
+     * @return void
+     * @throws PropelException
+     */
+    public function addQuestionTag(QuestionTag $l)
+    {
+        $this->collQuestionTags[] = $l;
+        $l->setUser($this);
+    }
+
+
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this User is new, it will return
+     * an empty collection; or if this User has previously
+     * been saved, it will retrieve related QuestionTags from storage.
+     *
+     * This method is protected by default in order to keep the public
+     * api reasonable.  You can provide public methods for those you
+     * actually need in User.
+     */
+    public function getQuestionTagsJoinQuestion($criteria = null, $con = null)
+    {
+        // include the Peer class
+        include_once 'model/om/BaseQuestionTagPeer.php';
+        if ($criteria === null) {
+            $criteria = new Criteria();
+        }
+        elseif ($criteria instanceof Criteria)
+        {
+            $criteria = clone $criteria;
+        }
+
+        if ($this->collQuestionTags === null) {
+            if ($this->isNew()) {
+                $this->collQuestionTags = array();
+            } else {
+
+                $criteria->add(QuestionTagPeer::USER_ID, $this->getId());
+
+                $this->collQuestionTags = QuestionTagPeer::doSelectJoinQuestion($criteria, $con);
+            }
+        } else {
+            // the following code is to determine if a new query is
+            // called for.  If the criteria is the same as the last
+            // one, just return the collection.
+
+            $criteria->add(QuestionTagPeer::USER_ID, $this->getId());
+
+            if (!isset($this->lastQuestionTagCriteria) || !$this->lastQuestionTagCriteria->equals($criteria)) {
+                $this->collQuestionTags = QuestionTagPeer::doSelectJoinQuestion($criteria, $con);
+            }
+        }
+        $this->lastQuestionTagCriteria = $criteria;
+
+        return $this->collQuestionTags;
+    }
+
-} // BaseUser