Remove all traces of keywords in code.

Migration script for keywords and categories -> tags still to come.

diff --git a/kronolith/data.php b/kronolith/data.php
index 2cdb82d..9163c9f 100644 (file)
--- a/kronolith/data.php
+++ b/kronolith/data.php
@@ -61,7 +61,6 @@ $app_fields    = array('title' => _("Title"),
                        'description' => _("Description"),
                        'category' => _("Category"),
                        'location' => _("Location"),
-                       'keywords' => _("Keywords"),
                        'recur_type' => _("Recurrence Type"),
                        'recur_end_date' => _("Recurrence End Date"),
                        'recur_interval' => _("Recurrence Interval"),
@@ -128,7 +127,6 @@ case 'export':
                 $row['category'] = $event->category;
                 $row['location'] = $event->location;
                 $row['description'] = $event->description;
-                $row['keywords'] = implode(',', $event->keywords);
                 $row['start_date'] = sprintf('%d-%02d-%02d', $event->start->year, $event->start->month, $event->start->mday);
                 $row['start_time'] = sprintf('%02d:%02d:%02d', $event->start->hour, $event->start->min, $event->start->sec);
                 $row['end_date'] = sprintf('%d-%02d-%02d', $event->end->year, $event->end->month, $event->end->mday);

diff --git a/kronolith/lib/Driver.php b/kronolith/lib/Driver.php
index 1634b77..5e05acf 100644 (file)
--- a/kronolith/lib/Driver.php
+++ b/kronolith/lib/Driver.php
@@ -386,13 +386,6 @@ class Kronolith_Event {
     var $attendees = array();
 
     /**
-     * All the key words associtated with this event.
-     *
-     * @var array
-     */
-    var $keywords = array();
-
-    /**
      * The start time of the event.
      *
      * @var Horde_Date
@@ -1101,9 +1094,6 @@ class Kronolith_Event {
         if (!empty($hash['location'])) {
             $this->setLocation($hash['location']);
         }
-        if (!empty($hash['keywords'])) {
-            $this->setKeywords(explode(',', $hash['keywords']));
-        }
         if (!empty($hash['start_date'])) {
             $date = explode('-', $hash['start_date']);
             if (empty($hash['start_time'])) {
@@ -1750,21 +1740,6 @@ class Kronolith_Event {
         }
     }
 
-    function getKeywords()
-    {
-        return $this->keywords;
-    }
-
-    function hasKeyword($keyword)
-    {
-        return in_array($keyword, $this->keywords);
-    }
-
-    function setKeywords($keywords)
-    {
-        $this->keywords = $keywords;
-    }
-
     function isAllDay()
     {
         return $this->allday ||
@@ -1804,7 +1779,6 @@ class Kronolith_Event {
         $this->setDescription(Util::getFormData('description', $this->description));
         $this->setLocation(Util::getFormData('location', $this->location));
         $this->setPrivate(Util::getFormData('private'));
-        $this->setKeywords(Util::getFormData('keywords', $this->keywords));
 
         // Category.
         if ($new_category = Util::getFormData('new_category')) {

diff --git a/kronolith/lib/Driver/sql.php b/kronolith/lib/Driver/sql.php
index a87b8ab..56cd702 100644 (file)
--- a/kronolith/lib/Driver/sql.php
+++ b/kronolith/lib/Driver/sql.php
@@ -278,7 +278,7 @@ class Kronolith_Driver_sql extends Kronolith_Driver {
     {
         $q = 'SELECT event_id, event_uid, event_description, event_location,' .
             ' event_private, event_status, event_attendees,' .
-            ' event_keywords, event_title, event_category, event_recurcount,' .
+            ' event_title, event_category, event_recurcount,' .
             ' event_recurtype, event_recurenddate, event_recurinterval,' .
             ' event_recurdays, event_start, event_end, event_allday,' .
             ' event_alarm, event_alarm_methods, event_modified,' .
@@ -375,7 +375,7 @@ class Kronolith_Driver_sql extends Kronolith_Driver {
 
         $query = 'SELECT event_id, event_uid, event_description,' .
             ' event_location, event_private, event_status, event_attendees,' .
-            ' event_keywords, event_title, event_category, event_recurcount,' .
+            ' event_title, event_category, event_recurcount,' .
             ' event_recurtype, event_recurenddate, event_recurinterval,' .
             ' event_recurdays, event_start, event_end, event_allday,' .
             ' event_alarm, event_alarm_methods, event_modified,' .
@@ -416,7 +416,7 @@ class Kronolith_Driver_sql extends Kronolith_Driver {
     {
         $query = 'SELECT event_id, event_uid, calendar_id, event_description,' .
             ' event_location, event_private, event_status, event_attendees,' .
-            ' event_keywords, event_title, event_category, event_recurcount,' .
+            ' event_title, event_category, event_recurcount,' .
             ' event_recurtype, event_recurenddate, event_recurinterval,' .
             ' event_recurdays, event_start, event_end, event_allday,' .
             ' event_alarm, event_alarm_methods, event_modified,' .
@@ -941,9 +941,6 @@ class Kronolith_Event_sql extends Kronolith_Event {
         if (isset($SQLEvent['event_attendees'])) {
             $this->attendees = array_change_key_case($driver->convertFromDriver(unserialize($SQLEvent['event_attendees'])));
         }
-        if (isset($SQLEvent['event_keywords'])) {
-            $this->keywords = explode(',', $driver->convertFromDriver($SQLEvent['event_keywords']));
-        }
         if (isset($SQLEvent['event_description'])) {
             $this->description = $driver->convertFromDriver($SQLEvent['event_description']);
         }
@@ -970,7 +967,6 @@ class Kronolith_Event_sql extends Kronolith_Event {
         $this->_properties['event_private'] = (int)$this->isPrivate();
         $this->_properties['event_status'] = $this->getStatus();
         $this->_properties['event_attendees'] = serialize($driver->convertToDriver($this->getAttendees()));
-        $this->_properties['event_keywords'] = $driver->convertToDriver(implode(',', $this->getKeywords()));
         $this->_properties['event_modified'] = $_SERVER['REQUEST_TIME'];
 
         if ($this->isAllDay()) {

diff --git a/kronolith/scripts/sql/kronolith.mssql.sql b/kronolith/scripts/sql/kronolith.mssql.sql
index 6bb5844..6f29291 100644 (file)
--- a/kronolith/scripts/sql/kronolith.mssql.sql
+++ b/kronolith/scripts/sql/kronolith.mssql.sql
@@ -7,7 +7,6 @@ CREATE TABLE kronolith_events (
     event_location VARCHAR(MAX),
     event_status INT DEFAULT 0,
     event_attendees VARCHAR(MAX),
-    event_keywords VARCHAR(MAX),
     event_exceptions VARCHAR(MAX),
     event_title VARCHAR(255),
     event_category VARCHAR(80),

diff --git a/kronolith/scripts/sql/kronolith.mysql.sql b/kronolith/scripts/sql/kronolith.mysql.sql
index 0fd4a0c..bd29d70 100644 (file)
--- a/kronolith/scripts/sql/kronolith.mysql.sql
+++ b/kronolith/scripts/sql/kronolith.mysql.sql
@@ -7,7 +7,6 @@ CREATE TABLE kronolith_events (
     event_location TEXT,
     event_status INT DEFAULT 0,
     event_attendees TEXT,
-    event_keywords TEXT,
     event_exceptions TEXT,
     event_title VARCHAR(255),
     event_category VARCHAR(80),

diff --git a/kronolith/scripts/sql/kronolith.oci8.sql b/kronolith/scripts/sql/kronolith.oci8.sql
index 61e09f4..9453141 100644 (file)
--- a/kronolith/scripts/sql/kronolith.oci8.sql
+++ b/kronolith/scripts/sql/kronolith.oci8.sql
@@ -7,7 +7,6 @@ CREATE TABLE kronolith_events (
     event_location VARCHAR2(4000),
     event_status INT DEFAULT 0,
     event_attendees VARCHAR2(4000),
-    event_keywords VARCHAR2(4000),
     event_exceptions VARCHAR2(4000),
     event_title VARCHAR2(255),
     event_category VARCHAR2(80),

diff --git a/kronolith/scripts/sql/kronolith.pgsql.sql b/kronolith/scripts/sql/kronolith.pgsql.sql
index 0fb5f18..a96a1ef 100644 (file)
--- a/kronolith/scripts/sql/kronolith.pgsql.sql
+++ b/kronolith/scripts/sql/kronolith.pgsql.sql
@@ -7,7 +7,6 @@ CREATE TABLE kronolith_events (
     event_location TEXT,
     event_status INT DEFAULT 0,
     event_attendees TEXT,
-    event_keywords TEXT,
     event_exceptions TEXT,
     event_title VARCHAR(255),
     event_category VARCHAR(80),

diff --git a/kronolith/scripts/sql/kronolith.sql b/kronolith/scripts/sql/kronolith.sql
index d3b1bc4..a95fa0c 100644 (file)
--- a/kronolith/scripts/sql/kronolith.sql
+++ b/kronolith/scripts/sql/kronolith.sql
@@ -7,7 +7,6 @@ CREATE TABLE kronolith_events (
     event_location TEXT,
     event_status INT DEFAULT 0,
     event_attendees TEXT,
-    event_keywords TEXT,
     event_exceptions TEXT,
     event_title VARCHAR(255),
     event_category VARCHAR(80),

diff --git a/kronolith/scripts/sql/kronolith.xml b/kronolith/scripts/sql/kronolith.xml
index 874fa19..3dc02ec 100644 (file)
--- a/kronolith/scripts/sql/kronolith.xml
+++ b/kronolith/scripts/sql/kronolith.xml
@@ -61,11 +61,6 @@
    </field>
 
    <field>
-    <name>event_keywords</name>
-    <type>clob</type>
-   </field>
-
-   <field>
     <name>event_exceptions</name>
     <type>clob</type>
    </field>

diff --git a/kronolith/templates/edit/javascript.inc b/kronolith/templates/edit/javascript.inc
index 32a8c39..4fb0044 100644 (file)
--- a/kronolith/templates/edit/javascript.inc
+++ b/kronolith/templates/edit/javascript.inc
@@ -280,9 +280,6 @@ Event.observe(window, 'load', function() {
     toggleSection('attendees');
     toggleSection('recurrence');
     toggleSection('tags');
-<?php if ($GLOBALS['conf']['metadata']['keywords']): ?>
-    toggleSection('keywords');
-<?php endif; ?>
 });
 
 </script>

diff --git a/kronolith/templates/view/view.inc b/kronolith/templates/view/view.inc
index 2aa6b55..5a65c57 100644 (file)
--- a/kronolith/templates/view/view.inc
+++ b/kronolith/templates/view/view.inc
@@ -134,23 +134,6 @@ if ($this->event->isInitialized() && $this->event->alarm > 0):
 </tr>
 <?php endif; endif; ?>
 
-<?php if ($conf['metadata']['keywords'] && count($keyword_list)): ?>
-<!-- keywords -->
-<tr>
- <td colspan="2" class="control"><strong><?php echo _("Keywords") ?></strong></td>
-</tr>
-<?php foreach ($keyword_list as $cat => $list): ?>
-<tr>
- <td class="rightAlign" valign="top"><?php echo htmlspecialchars($cat) ?></td>
- <td>
-<?php foreach ($list as $entry): ?>
-  <?php echo htmlspecialchars($entry) ?><br />
-<?php endforeach; ?>
- </td>
-</tr>
-<?php endforeach; ?>
-<?php endif; ?>
-
 <!-- tags  -->
 <?php if (!empty($tags)):?>
     <tr>