Index: modules/aggregator.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator.views.inc,v
retrieving revision 1.2
diff -u -p -r1.2 aggregator.views.inc
--- modules/aggregator.views.inc	7 Apr 2009 23:07:31 -0000	1.2
+++ modules/aggregator.views.inc	22 May 2009 04:20:24 -0000
@@ -261,6 +261,66 @@ function aggregator_views_data() {
     ),
   );
 
+  // ----------------------------------------------------------------------
+  // Aggregator category feed table
+
+  $data['aggregator_category_feed']['table']['join'] = array(
+    'aggregator_item' => array(
+      'left_field' => 'fid',
+      'field' => 'fid',
+    ),
+  );
+
+  // ----------------------------------------------------------------------
+  // Aggregator category table
+
+  $data['aggregator_category']['table']['group'] = t('Aggregator category');
+
+  $data['aggregator_category']['table']['join'] = array(
+    'aggregator_item' => array(
+      'left_table' => 'aggregator_category_feed',
+      'left_field' => 'cid',
+      'field' => 'cid',
+    ),
+  );
+
+  // cid
+  $data['aggregator_category']['cid'] = array(
+    'title' => t('Category ID'),
+    'help' => t('The unique ID of the aggregator category.'),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_aggregator_category_cid',
+      'name field' => 'title',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_aggregator_category_cid',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
+  // title
+  $data['aggregator_category']['title'] = array(
+    'title' => t('Category'),
+    'help' => t('The title of the aggregator category.'),
+    'field' => array(
+      'handler' => 'views_handler_field_xss',
+      'click sortable' => TRUE,
+     ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+    ),
+  );
+
   return $data;
 }
 
@@ -274,7 +334,7 @@ function aggregator_views_handlers() {
       'path' => drupal_get_path('module', 'views') . '/modules/aggregator',
     ),
     'handlers' => array(
-      // field handler
+      // field handlers
       'views_handler_field_aggregator_title_link' => array(
         'parent' => 'views_handler_field',
       ),
@@ -283,6 +343,14 @@ function aggregator_views_handlers() {
       'views_handler_argument_aggregator_fid' => array(
         'parent' => 'views_handler_argument_numeric',
       ),
+      'views_handler_argument_aggregator_category_cid' => array(
+        'parent' => 'views_handler_argument_numeric',
+      ),
+
+      // filter handlers
+      'views_handler_filter_aggregator_category_cid' => array(
+        'parent' => 'views_handler_filter_in_operator',
+      ),
     ),
   );
 }
Index: modules/aggregator/views_handler_argument_aggregator_category_cid.inc
===================================================================
RCS file: modules/aggregator/views_handler_argument_aggregator_category_cid.inc
diff -N modules/aggregator/views_handler_argument_aggregator_category_cid.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/aggregator/views_handler_argument_aggregator_category_cid.inc	22 May 2009 04:08:38 -0000
@@ -0,0 +1,21 @@
+<?php
+// $Id$
+
+/**
+ * Argument handler to accept an aggregator category id.
+ */
+class views_handler_argument_aggregator_category_cid extends views_handler_argument_numeric {
+  /**
+   * Override the behavior of title(). Get the title of the category.
+   */
+  function title_query() {
+    $titles = array();
+    $placeholders = implode(', ', array_fill(0, sizeof($this->value), '%d'));
+
+    $result = db_query("SELECT c.title FROM {aggregator_category} c WHERE c.cid IN ($placeholders)", $this->value);
+    while ($term = db_fetch_object($result)) {
+      $titles[] = check_plain($term->title);
+    }
+    return $titles;
+  }
+}
Index: modules/aggregator/views_handler_filter_aggregator_category_cid.inc
===================================================================
RCS file: modules/aggregator/views_handler_filter_aggregator_category_cid.inc
diff -N modules/aggregator/views_handler_filter_aggregator_category_cid.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/aggregator/views_handler_filter_aggregator_category_cid.inc	22 May 2009 03:58:52 -0000
@@ -0,0 +1,20 @@
+<?php
+// $Id$
+
+/**
+ * Filter by aggregator category cid
+ */
+class views_handler_filter_aggregator_category_cid extends views_handler_filter_in_operator {
+  function get_value_options() {
+    if (isset($this->value_options)) {
+      return;
+    }
+
+    $this->value_options = array();
+
+    $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title');
+    while ($category = db_fetch_object($result)) {
+      $this->value_options[$category->cid] = check_plain($category->title);
+    }
+  }
+}