Changeset 2107 for plugins/apostrophePlugin/trunk

Timestamp:

09/01/10 11:59:43 (21 months ago)

Author:

wjohnald

Message:

this commit resolves tickets: #144 and #347

Location:

plugins/apostrophePlugin/trunk

Files:

• . (modified) (1 prop)
• config/doctrine/schema.yml (modified) (1 diff)
• lib/action/BaseaActions.class.php (modified) (1 diff)
• lib/action/BaseaFeedSlotComponents.class.php (modified) (1 diff)
• lib/form/BaseaPageSettingsForm.class.php (modified) (2 diffs)
• lib/model/doctrine/PluginaFeedSlot.class.php (modified) (2 diffs)
• lib/model/doctrine/PluginaPage.class.php (modified) (4 diffs)
• lib/toolkit/aHtml.class.php (modified) (1 diff)
• lib/toolkit/aZendSearch.class.php (modified) (4 diffs)
• modules/a/templates/settingsSuccess.php (modified) (1 diff)
• modules/aFeedSlot/templates/_aFeedItem.php (modified) (2 diffs)
• web/css/a.css (modified) (1 prop)
• web/images (modified) (1 prop)

plugins/apostrophePlugin/trunk/config/doctrine/schema.yml

@@ -10 +10 @@
     - Timestampable
     - NestedSet
+    - Taggable
   columns:
     id:

plugins/apostrophePlugin/trunk/lib/action/BaseaActions.class.php

@@ -41 +41 @@
     $this->page = $page;
     $this->setTemplate($page->template);
+
+        $tagstring = implode(',', $page->getTags());
+        if (strlen($tagstring))
+        {
+        $this->getResponse()->addMeta('keywords', htmlspecialchars($tagstring));
+    }
+    if (strlen($page->getMetaDescription()))
+    {
+          $this->getResponse()->addMeta('description', $page->getMetaDescription());
+        }
 
     return 'Template';

plugins/apostrophePlugin/trunk/lib/action/BaseaFeedSlotComponents.class.php

@@ -34 +34 @@
       $this->posts = $this->getOption('posts', 5);
       $this->links = $this->getOption('links', true);
-      $this->markup = $this->getOption('markup', '<strong><em><p><br><ul><li>');
+      $this->markup = $this->getOption('markup', '<strong><em><p><br><ul><li><a>');
                         $this->attributes = $this->getOption('attributes', false);
                         $this->styles = $this->getOption('styles',false);

plugins/apostrophePlugin/trunk/lib/form/BaseaPageSettingsForm.class.php

@@ -93 +93 @@
     )));
 
+        // Tags
+        $tagstring = implode(', ', $this->getObject()->getTags());  // added a space after the comma for readability
+        // class tag-input enabled for typeahead support
+        $this->setWidget('tags', new sfWidgetFormInput(array('default' => $tagstring), array('class' => 'tags-input')));
+        $this->setValidator('tags', new sfValidatorString(array('required' => false)));
+
+
+        // Meta Description
+        $metaDescription = $this->getObject()->getMetaDescription();
+        $this->setWidget('meta_description', new sfWidgetFormTextArea(array('default' => html_entity_decode($metaDescription, ENT_COMPAT, 'UTF-8'))));
+        $this->setValidator('meta_description', new sfValidatorString(array('required' => false)));
+
+
+
     $this->addPrivilegeWidget('edit', 'editors');
     $this->addPrivilegeWidget('manage', 'managers');
@@ -236 +250 @@
     $object = parent::updateObject($values);
     
+    // Update tags on Page
+    if ($this->getValue('tags') != '')
+    {
+            $this->getObject()->addTag($this->getValue('tags'));
+        }
+
+    // Update meta-description on Page
+    if ($this->getValue('meta_description') != '')
+    {
+            $this->getObject()->setMetaDescription(htmlentities($this->getValue('meta_description')));
+        }    
+    
     // Check for cascading operations
     if($this->getValue('cascade_archived') || $this->getValue('cascade_view_is_secure'))

plugins/apostrophePlugin/trunk/lib/model/doctrine/PluginaFeedSlot.class.php

@@ +1 @@
+
 <?php
 
@@ -13 +14 @@
 abstract class PluginaFeedSlot extends BaseaFeedSlot
 {
-
 }

plugins/apostrophePlugin/trunk/lib/model/doctrine/PluginaPage.class.php

@@ -246 +246 @@
     return $title;
   }
+  
+  public function getMetaDescription()
+  {
+        $metaDescriptionSlot = $this->getSlot('metaDescription');
+        
+        $result = '';
+        if ($metaDescriptionSlot)
+        {
+                $result = $metaDescriptionSlot->value;
+        }
+        return trim($result);
+  }
+  
+  
   
   // Changed in 1.5: returns a flat array, not an associative array indexed by version.
@@ -866 +880 @@
   }
 
+  public function setMetaDescription($description)
+  {
+        $slot = $this->createSlot('aText');
+        $slot->value = $description;
+        $slot->save();
+        
+        $this->newAreaVersion('metaDescription', 'update',
+                array(
+                        'permid' => 1,
+                        'slot' => $slot));
+        
+  }
+
+
   // SAVE ANY CHANGES to the actual page object FIRST before you call this method.
   
@@ -1271 +1299 @@
     $summary = $this->getSearchSummary();
     $text = $this->getSearchText();
+    $tags = implode(',', $this->getTags());
+    $metaDescription = $this->getMetaDescription();
     $slug = $this->getSlug();
     $info = $this->getInfo();
@@ -1277 +1307 @@
     // it lets us check explicit privileges
     unset($info['title']);
-    // These are indexed but not stored. Use for fat fields that
-    // would otherwise turn Lucene into a database (it's a terrible database)
     aZendSearch::updateLuceneIndex($this, 
-      array('text' => $text),
+      array('text' => $text, 'tags' => $tags, 'metadescription' => $metaDescription),
       $this->getCulture(),
-      // These are stored, not indexed. They are used to present and filter summaries
-      array(
-        'summary' => $summary,
-        'info' => serialize($info)),
-      // These are stored AND indexed
       array(
         'title' => $title,
-        'slug' => $slug
-      ));
+        'summary' => $summary,
+        'slug' => $slug,
+        'info' => serialize($info)),
+      array('tags' => 2.0, 'metadescription' => 1.2));
   }
 

plugins/apostrophePlugin/trunk/lib/toolkit/aHtml.class.php

@@ -579 +579 @@
   {
     sfContext::getInstance()->getConfiguration()->loadHelpers(array('Tag', 'Text'));
-    return auto_link_text(simple_format_text(htmlentities($text, ENT_COMPAT, 'UTF-8')));
+        return auto_link_text(simple_format_text(htmlentities($text, ENT_COMPAT, 'UTF-8')));
   }
 

plugins/apostrophePlugin/trunk/lib/toolkit/aZendSearch.class.php

@@ -252 +252 @@
   // use unStoredFields. For things that need not be indexed at all, like summaries, use unIndexedFields
 
-  static public function updateLuceneIndex(Doctrine_Record $object, $unStoredFields = array(), $culture = null, $unIndexedFields = array(), $storedAndIndexedFields = array())
+  static public function updateLuceneIndex(Doctrine_Record $object, $fields = array(), $culture = null, $storedFields = array(), $boostsByField = array())
   {
     self::deleteFromLuceneIndex($object, $culture);
@@ -264 +264 @@
       $doc->addField(Zend_Search_Lucene_Field::Keyword('culture', $culture, 'UTF-8'));
     }
-    // index the UnStored fields
-    foreach ($unStoredFields as $key => $value)
+    // index the search fields
+    foreach ($fields as $key => $value)
     {
       // Ugh: UTF8 Lucene is case sensitive work around this
@@ -276 +276 @@
         $value = strtolower($value);
       }
-      $doc->addField(Zend_Search_Lucene_Field::UnStored($key, $value, 'UTF-8'));
+      
+      $field = Zend_Search_Lucene_Field::UnStored($key, $value, 'UTF-8');
+      if (isset($boostsByField[$key]))
+      {
+        $field->boost = $boostsByField[$key];
+      }
+      $doc->addField($field);
     }
 
     // store the data fields (a big performance win over hydrating things with Doctrine)
-    foreach ($unIndexedFields as $key => $value)
+    foreach ($storedFields as $key => $value)
     {
       $doc->addField(Zend_Search_Lucene_Field::UnIndexed($key, $value, 'UTF-8'));
-    }
-
-    // index and store the storedAndIndexed fields
-    foreach ($storedAndIndexedFields as $key => $value)
-    {
-      // Ugh: UTF8 Lucene is case sensitive work around this
-      if (function_exists('mb_strtolower'))
-      {
-        $value = mb_strtolower($value);
-      }
-      else
-      {
-        $value = strtolower($value);
-      }
-      $doc->addField(Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
     }
    
@@ -304 +295 @@
     $index->commit();
   }
-
+  
   // This does a clean job of saving the object in both doctrine and zend
   // without a lot of duplicated code, reducing the potential for

plugins/apostrophePlugin/trunk/modules/a/templates/settingsSuccess.php

@@ -55 +55 @@
                   <?php echo $form['template'] ?>
                   <?php echo $form['template']->renderError() ?>
+                </div>
+
+                <div class="a-form-row keywords">
+                        <?php echo $form['tags']->renderLabel(__('Page Tags', array(), 'apostrophe')) ?>
+                        <?php echo $form['tags'] ?>
+                        <?php echo $form['tags']->renderError() ?>
+                </div>
+
+                <div class="a-form-row meta-description">
+                        <?php echo $form['meta_description']->renderLabel(__('Meta Description', array(), 'apostrophe')) ?>
+                        <?php echo $form['meta_description'] ?>
+                        <?php echo $form['meta_description']->renderError() ?>
                 </div>
 

plugins/apostrophePlugin/trunk/modules/aFeedSlot/templates/_aFeedItem.php

@@ -1 +1 @@
 <?php
+  // Pull in the Symfony Text Helper
+  sfContext::getInstance()->getConfiguration()->loadHelpers(array('Text'));
+
   // Compatible with sf_escaping_strategy: true
   $attributes = isset($attributes) ? $sf_data->getRaw('attributes') : null;
@@ -19 +22 @@
     <?php $date = $feedItem->getPubDate() ?>
     <li class="date"><?php echo $dateFormat ? date($dateFormat, $date) : aDate::pretty($date) . ' ' . aDate::time($date) ?></li>
-    <li class="description"><?php echo aHtml::simplify($feedItem->getDescription(), $markup, false, (isset($attributes)? $attributes:false), (isset($styles)? $styles:false)) ?></li>
+    <li class="description"><?php echo auto_link_text(aHtml::simplify($feedItem->getDescription(), $markup, false, (isset($attributes)? $attributes:false), (isset($styles)? $styles:false))) ?></li>
   </ul>
 </li>