=== modified file '.bzrignore'
--- .bzrignore 2009-10-17 18:33:18 +0000
+++ .bzrignore 2009-10-17 19:17:01 +0000
@@ -1,1 +1,4 @@
CVS
+._*
+*.patch
+*.diff
=== modified file 'CHANGELOG.txt'
--- CHANGELOG.txt 2009-10-17 18:33:18 +0000
+++ CHANGELOG.txt 2009-10-18 07:37:31 +0000
@@ -95,7 +95,7 @@
o #478312 by yhahn: Provide specific node access filter.
o #479878 by dereine: User language field.
o #468824 by eaton: Pluggable caching mechanism which can cache both the query result and rendered result.
- o #399534 by clemens.tolboom and drewish: Add fragment and query string as options when making fields into links.
+ o #399534 by clemens.tolboom and drewish: Add fragment and query string as options when making fields into links.
o #315915 by dixon_: Add another base row class to rows.
o #271833 by grugnog, agentrickard and others: Taxonomy depth in filter.
o #353403 by agentrickard: Field to provide "more" text.
@@ -162,7 +162,7 @@
o #364082 by hass: Unique key missing on views_view table.
o #366250 by sirkitree: Fix deprecated jquery selectors so we can work with jquery 1.2.6 as well as 1.3.2.
o #386986: 2 or more relationships could block a normal table from being added.
- o #371219 by aclight: Incorrect logic in views_many_to_one_helper::ensure_my_table()
+ o #371219 by aclight: Incorrect logic in views_many_to_one_helper::ensure_my_table()
o #376570 by yhahn: Better AJAX scrolling.
o #412576 by yhahn: Restore missing views_handler_filter_float class.
o #378710: Add strip_tags() to path when displaying a field as a link as a path can never have HTML in it.
@@ -241,7 +241,7 @@
o #353002 by neclimdul: Provide a filter for user posted or commented on to complement the argument with the same functionality.
2.3 API Notes:
- A minor change in the API now requires that styles that render fields MUST
+ A minor change in the API now requires that styles that render fields MUST
render them in order, first by row and then by field ID. Not doing so will
cause the token expansion to fail.
=== modified file 'README.txt'
--- README.txt 2009-10-17 18:33:18 +0000
+++ README.txt 2009-10-18 07:37:31 +0000
@@ -2,7 +2,7 @@
Welcome to Views 2. Please see the advanced help for more information.
-If you're having trouble installing this module, please ensure that your
+If you're having trouble installing this module, please ensure that your
tar program is not flattening the directory tree, truncating filenames
or losing files.
=== modified file 'css/views-admin.css'
--- css/views-admin.css 2009-10-17 18:33:18 +0000
+++ css/views-admin.css 2009-10-19 05:17:54 +0000
@@ -95,6 +95,7 @@
.views-tabset .extra input {
margin-top: 0;
margin-right: 0;
+ font-size: 10px;
white-space: normal;
}
@@ -209,6 +210,10 @@
margin-top: 0px;
}
+#views-ajax-pad > div.ajax-progress {
+ display: none;
+}
+
#views-ajax-title {
background: #f6f6f6;
border-left: #D6DBDE 1px solid;
@@ -234,6 +239,7 @@
border: #D6DBDE 1px solid;
padding-top: 3px;
border-top: 0;
+ float: none;
}
#views-ajax-pad .views-messages {
@@ -256,8 +262,7 @@
}
#views-ajax-pad .form-buttons .form-submit {
- margin: 0 .5em 0 0;
- padding: 0;
+ font-size: 10px;
}
#views-ajax-pad .form-item {
@@ -556,8 +561,9 @@
}
#views-ui-edit-view-form {
- margin: 0;
+ margin: 10px 0 0;
padding: 0;
+ clear: both;
}
#views-live-preview {
@@ -654,3 +660,8 @@
margin: 0 1em;
border: 1px solid;
}
+
+div.views-category #page-title {
+ background: none;
+ padding-top: 0px;
+}
=== modified file 'css/views-list.css'
--- css/views-list.css 2009-10-17 18:33:18 +0000
+++ css/views-list.css 2009-10-18 07:37:31 +0000
@@ -80,5 +80,5 @@
}
table.view-enabled td.view-name,
table.view-enabled td.view-ops {
- background: #E4F0F8;
+ background: #E4F0F8;
}
=== modified file 'css/views-tabs.css'
--- css/views-tabs.css 2009-10-17 18:33:18 +0000
+++ css/views-tabs.css 2009-10-18 07:37:31 +0000
@@ -1,5 +1,5 @@
/* $Id */
-.ui-tabs-hide {
- display: none;
+.ui-tabs-hide {
+ display: none;
}
=== modified file 'docs/docs.php'
--- docs/docs.php 2009-10-17 18:33:18 +0000
+++ docs/docs.php 2009-10-18 07:37:31 +0000
@@ -244,7 +244,7 @@
function hook_views_api() {
return array(
'api' => 2,
- 'path' => drupal_get_path('module', 'example') . '/includes/views',
+ 'path' => drupal_get_path('module', 'example') . '/includes/views',
);
}
=== modified file 'handlers/views_handler_argument.inc'
--- handlers/views_handler_argument.inc 2009-10-17 18:33:18 +0000
+++ handlers/views_handler_argument.inc 2009-10-18 19:13:47 +0000
@@ -114,16 +114,16 @@
$defaults = $this->default_actions();
$form['title'] = array(
- '#prefix' => '
',
+ '#prefix' => '
',
'#suffix' => '
',
'#type' => 'textfield',
'#title' => t('Title'),
'#default_value' => $this->options['title'],
'#description' => t('The title to use when this argument is present. It will override the title of the view and titles from previous arguments. You can use percent substitution here to replace with argument titles. Use "%1" for the first argument, "%2" for the second, etc.'),
);
-
+
$form['breadcrumb'] = array(
- '#prefix' => '
',
);
asort($options);
@@ -512,7 +512,7 @@
if ($this->table_alias != $this->table) {
$j = views_get_table_join($this->name_table, $this->table);
if ($j) {
- $join = drupal_clone($j);
+ $join = clone $j;
$join->left_table = $this->table_alias;
$this->name_table_alias = $this->query->add_table($this->name_table, $this->relationship, $join);
}
@@ -598,8 +598,7 @@
*/
function query() {
$this->ensure_my_table();
- $placeholder = empty($this->definition['numeric']) ? "'%s'" : '%d';
- $this->query->add_where(0, "$this->table_alias.$this->real_field = $placeholder", $this->argument);
+ $this->query->add_where(0, "$this->table_alias.$this->real_field", $this->argument);
}
/**
@@ -714,7 +713,7 @@
if (isset($this->argument)) {
return $this->argument;
}
-
+
// Otherwise, we have to pretend to process ourself to find the value.
$value = NULL;
// Find the position of this argument within the view.
@@ -731,7 +730,7 @@
// Clone ourselves so that we don't break things when we're really
// processing the arguments.
- $argument = drupal_clone($this);
+ $argument = clone $this;
if (!isset($arg) && $argument->has_default_argument()) {
$arg = $argument->get_default_argument();
}
@@ -758,8 +757,7 @@
function query() { /* No query to run */ }
function options_form(&$form, &$form_state) {
$form['markup'] = array(
- '#prefix' => '
',
- '#value' => t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.'),
+ '#markup' => '
' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '
',
- '#value' => t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.'),
+ '#markup' => '
' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '
',
);
}
=== modified file 'handlers/views_handler_field_date.inc'
--- handlers/views_handler_field_date.inc 2009-10-17 18:33:18 +0000
+++ handlers/views_handler_field_date.inc 2009-10-18 07:37:31 +0000
@@ -17,15 +17,14 @@
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $time = time();
$form['date_format'] = array(
'#type' => 'select',
'#title' => t('Date format'),
'#options' => array(
- 'small' => format_date($time, 'small'),
- 'medium' => format_date($time, 'medium'),
- 'large' => format_date($time, 'large'),
+ 'small' => format_date(REQUEST_TIME, 'small'),
+ 'medium' => format_date(REQUEST_TIME, 'medium'),
+ 'large' => format_date(REQUEST_TIME, 'large'),
'custom' => t('Custom'),
'raw time ago' => t('Time ago'),
'time ago' => t('Time ago (with "ago" appended)'),
@@ -50,12 +49,12 @@
if (in_array($format, array('custom', 'raw time ago', 'time ago', 'raw time span', 'time span'))) {
$custom_format = $this->options['custom_date_format'];
}
-
+
if (!$value) {
return theme('views_nodate');
}
else {
- $time_diff = time() - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence)
+ $time_diff = REQUEST_TIME - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence)
switch ($format) {
case 'raw time ago':
return format_interval($time_diff, is_numeric($custom_format) ? $custom_format : 2);
=== modified file 'handlers/views_handler_field_markup.inc'
--- handlers/views_handler_field_markup.inc 2009-10-17 18:33:18 +0000
+++ handlers/views_handler_field_markup.inc 2009-10-18 08:27:41 +0000
@@ -29,7 +29,7 @@
function render($values) {
$value = $values->{$this->field_alias};
$format = is_numeric($this->format) ? $this->format : $values->{$this->aliases['format']};
- return check_markup($value, $format, FALSE);
+ return check_markup($value, $format, '');
}
function element_type() {
=== modified file 'handlers/views_handler_field_prerender_list.inc'
--- handlers/views_handler_field_prerender_list.inc 2009-10-17 18:33:18 +0000
+++ handlers/views_handler_field_prerender_list.inc 2009-10-18 19:50:53 +0000
@@ -57,7 +57,12 @@
return implode(check_plain($this->options['separator']), $this->items[$field]);
}
else {
- return theme('item_list', $this->items[$field], NULL, $this->options['type']);
+ return theme('item_list',
+ array(
+ 'items' => $this->items[$field],
+ 'title' => NULL,
+ 'type' => $this->options['type']
+ ));
}
}
}
@@ -74,7 +79,12 @@
return implode(check_plain($this->options['separator']), $items);
}
else {
- return theme('item_list', $items, NULL, $this->options['type']);
+ return theme('item_list',
+ array(
+ 'items' => $this->items[$field],
+ 'title' => NULL,
+ 'type' => $this->options['type']
+ ));
}
}
}
@@ -82,7 +92,7 @@
/**
* Return an array of items for the field.
*
- * Items should be stored in the result array, if possible, as an array
+ * Items should be stored in the result array, if possible, as an array
* with 'value' as the actual displayable value of the item, plus
* any items that might be found in the 'alter' options array for
* creating links, such as 'path', 'fragment', 'query' etc, such a thing
@@ -94,7 +104,7 @@
if (!empty($this->items[$field])) {
return $this->items[$field];
}
-
+
return array();
}
=== modified file 'handlers/views_handler_filter.inc'
--- handlers/views_handler_filter.inc 2009-10-17 18:33:18 +0000
+++ handlers/views_handler_filter.inc 2009-10-18 19:13:47 +0000
@@ -80,10 +80,10 @@
if ($this->can_expose()) {
$this->show_expose_button($form, $form_state);
}
- $form['op_val_start'] = array('#value' => '
');
if ($this->can_expose()) {
$this->show_expose_form($form, $form_state);
}
@@ -488,7 +488,7 @@
*/
function query() {
$this->ensure_my_table();
- $this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field " . $this->operator . " '%s'", $this->value);
+ $this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field", $this->value, $this->operator);
}
}
@@ -505,8 +505,7 @@
function query() { /* No query to run */ }
function options_form(&$form, &$form_state) {
$form['markup'] = array(
- '#prefix' => '
',
- '#value' => t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.'),
+ '#markup' => '
' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '
',
- '#value' => t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.'),
+ '#markup' => '
' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '
',
);
}
=== modified file 'handlers/views_handler_sort.inc'
--- handlers/views_handler_sort.inc 2009-10-17 18:33:18 +0000
+++ handlers/views_handler_sort.inc 2009-10-17 19:26:01 +0000
@@ -70,8 +70,7 @@
function query() { /* No query to run */ }
function options_form(&$form, &$form_state) {
$form['markup'] = array(
- '#prefix' => '
',
- '#value' => t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.'),
+ '#markup' => '
' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '
',
);
}
=== modified file 'handlers/views_handler_sort_random.inc'
--- handlers/views_handler_sort_random.inc 2009-10-17 18:33:18 +0000
+++ handlers/views_handler_sort_random.inc 2009-10-18 22:07:56 +0000
@@ -6,8 +6,7 @@
*/
class views_handler_sort_random extends views_handler_sort {
function query() {
- global $db_type;
- switch ($db_type) {
+ switch (db_driver()) {
case 'mysql':
case 'mysqli':
$formula = 'RAND()';
=== modified file 'help/about.html'
--- help/about.html 2009-10-17 18:33:18 +0000
+++ help/about.html 2009-10-18 20:51:34 +0000
@@ -1,5 +1,5 @@
-The views module allows administrators and site designers to create, manage, and display lists of content. Each list managed by the views module is known as a "view", and the output of a view is known as a "display". Displays are provided in either block or page form, and a single view may have multiple displays. Optional navigation aids, including a system path and menu item, can be set for each page-based display of a view. By default, views may be created that list content (a Node view type), content revisions (a Node revisions view type) or users (a User view type). A view may be restricted to members of specific user roles, and may be added, edited or deleted at the views administration page
+The views module allows administrators and site designers to create, manage, and display lists of content. Each list managed by the views module is known as a "view", and the output of a view is known as a "display". Displays are provided in either block or page form, and a single view may have multiple displays. Optional navigation aids, including a system path and menu item, can be set for each page-based display of a view. By default, views may be created that list content (a Node view type), content revisions (a Node revisions view type) or users (a User view type). A view may be restricted to members of specific user roles, and may be added, edited or deleted at the views administration page
The "building block" design of the views system provides power and flexibility, allowing parameters to be specified only when needed. While an advanced view may use all of available parameters to create complex and highly interactive applications, a simple content listing may specify only a few options. All views rely on a conceptual framework that includes:
=== modified file 'help/analyze-theme.html'
--- help/analyze-theme.html 2009-10-17 18:33:18 +0000
+++ help/analyze-theme.html 2009-10-18 07:37:31 +0000
@@ -4,9 +4,9 @@
The display theme is usually views-view.tpl.php and it largely controls the decorations around a view; where the header, footer, pager, more link, feed icon, etc, will be placed.
The style will control how all of the results of the display are put together. It may be as simple as just displaying all of the rows, or it may be a complex table generator or something in between.
-
-
The row style controls each individual row; not all styles utilize the row style (notably the table), but most others do.
-
+
+
The row style controls each individual row; not all styles utilize the row style (notably the table), but most others do.
+
Finally, field themes allow you to override the look and even the data of each individual field, if the style uses fields. The actual template the system will use should be hilighted in bold.
=== modified file 'help/api-default-views.html'
--- help/api-default-views.html 2009-10-17 18:33:18 +0000
+++ help/api-default-views.html 2009-10-18 07:37:31 +0000
@@ -90,8 +90,8 @@
),
- The first one is the global 'template_preprocess' function which all templates utilize. It does some basic things such as setting up $zebra and a few other items. See api.drupal.org for specifics.
-
+ The first one is the global 'template_preprocess' function which all templates utilize. It does some basic things such as setting up $zebra and a few other items. See api.drupal.org for specifics.
+
The second one is the plugin specific preprocess. Like 'original hook' it should conform to the name used by the original template. i.e, if the original template was views-view-list.tpl.php then that preprocess function would be named template_preprocess_views_view_list.
The third one is your module's preprocess function, if it needs one. In general, you probably will not need one, and you should only attempt to use one if you are reasonably familiar with the concept of preprocess functions and Drupal's theme system in general. See Drupal's theme documentation for more information.
=== modified file 'help/api-example.html'
--- help/api-example.html 2009-10-17 18:33:18 +0000
+++ help/api-example.html 2009-10-18 07:37:31 +0000
@@ -5,13 +5,13 @@
<?php
/**
- * Implementation of hook_views_api().
+ * Implements hook_views_api().
*
- * This tells drupal that there is Views integration file named
- * module-name.views.inc
+ * This tells drupal that there is Views integration file named
+ * module-name.views.inc
*/
function node_example_views_api() {
- // Note that you can include 'path' in this array so that your views.inc
+ // Note that you can include 'path' in this array so that your views.inc
// file can be stored in a different location.
return array(
'api' => 2.0
@@ -24,7 +24,7 @@
<?php
-// $Id: api-example.html,v 1.1.2.1 2009/09/15 15:42:42 merlinofchaos Exp $
+// $Id: api-example.html,v 1.1.2.1 2009/09/15 15:42:42 merlinofchaos Exp $
/**
* This file is used to tell the views module about the new node_example table.
@@ -120,7 +120,7 @@
Type/relationship extension
-When your tables have first class data, you will often need to have own View types and View relationships defined. With the current node_example table this isn't required although I try to justify it below on an efficiency basis. See [[http://groups.drupal.org/node/17236#comment-58980|this discussion]] as to why it isn't justified.
+When your tables have first class data, you will often need to have own View types and View relationships defined. With the current node_example table this isn't required although I try to justify it below on an efficiency basis. See [[http://groups.drupal.org/node/17236#comment-58980|this discussion]] as to why it isn't justified.
Pulling data out of the database for every node when you only want data for the new Example node type is inefficient. To reduce the initial data extraction to just that relating to the new Example nodes requires that you make the node_example table the base table. This can be done by adding the following code into the node_example.views.inc file just before the 'return $data;'
@@ -132,7 +132,7 @@
// Use node_example as a new base table
// by creating a new views type called 'Node example'
// This allows it to be selected as the 'view type'
- // when you initially add a new view.
+ // when you initially add a new view.
$data['node_example']['table']['base'] = array(
'field' => 'vid',
'title' => t('Node example'),
=== modified file 'help/api-handlers.html'
--- help/api-handlers.html 2009-10-17 18:33:18 +0000
+++ help/api-handlers.html 2009-10-18 07:37:31 +0000
@@ -1,5 +1,5 @@
-In Views, a handler is an object that is part of the view and is part of the query building flow.
+In Views, a handler is an object that is part of the view and is part of the query building flow.
Handlers are objects; much of the time, the base handlers will work, but often you'll need to override the handler for something. One typical handler override will be views_handler_filter_operator_in which allows you to have a filter select from a list of options; you'll need to override this to provide your list.
@@ -52,15 +52,7 @@
Handlers are stored in their own files; for these files to be loaded by Views on demand, they must first be registered. Since Views core handlers are also loaded this way, it's imperative that your module also implement this pattern in order to prevent code crashes when your handler's parent class is not yet available.
-To register handlers, you must implement hook_views_handlers(). This hook returns an array with two keys; the first key is info which contains the modulename (which is only necessary if you're registering handlers on behalf of another module, such as what Views does) and path, which is the search path to find the files. This path is only necessary if your files will not be stored in the same directory as the .module file.
-
-The other key is handlers which contains a full array of handlers and the information for each handler. The key to each handler array is the name of the handler class. It can contain:
-
-
parent
-
The class that this handler extends. This is important to make sure that the parent class is included before your handler class. Without this, you may cause people's sites to crash in a difficult to recover state. Be sure you get this right!
-
file
-
The filename the handler is in. By default, this will be classname.inc -- however, you can have multiple similar handlers together in one file. However, because there is only one parent, please be sure that the parentage on these handlers matches! Otherwise you will run into whitescreens as not all parents will be loaded.
-
+To register handlers, you must implement hook_views_handlers(). This hook returns an array of handlers. Each element of the array is the name of a handler class.
You can see examples of this function in any of the various module.views.inc files in the views modules directory.
@@ -68,4 +60,4 @@
Please note that while all handler names in views are prefixed with views_, you should use your own module's name to prefix your handler names in order to ensure namespace safety. Note that the basic pattern for handler naming goes like this:
-[module]_handler_[type]_[tablename]_[fieldname]. Sometimes table and fieldname are not appropriate, but something that resembles what the table/field would be can be used.
\ No newline at end of file
+[module]_handler_[type]_[tablename]_[fieldname]. Sometimes table and fieldname are not appropriate, but something that resembles what the table/field would be can be used.
=== modified file 'help/api-plugins.html'
--- help/api-plugins.html 2009-10-17 18:33:18 +0000
+++ help/api-plugins.html 2009-10-17 19:26:01 +0000
@@ -58,14 +58,13 @@
),
-Of particular interest is the path directive, which works a little differently from handler registration; each plugin must define its own path, rather than relying on a global info for the paths. Also, there is an optional parent directive which is automatically filled in to be the base parent for the plugin type. Usually this is enough, but if your plugin derives from something other than the base, it must be filled in. For example:
+Of particular interest is the path directive, which works a little differently from handler registration; each plugin must define its own path, rather than relying on a global info for the paths. For example:
'feed' => array(
'title' => t('Feed'),
'help' => t('Display the view as a feed, such as an RSS feed.'),
'handler' => 'views_plugin_display_feed',
- 'parent' => 'page', // so it knows to load the page plugin .inc file
'uses hook menu' => TRUE,
'use ajax' => FALSE,
'use pager' => FALSE,
@@ -75,6 +74,6 @@
),
-Note that unlike handler registration, where parentage is referred to by object name, with plugins it is referred to by the unique plugin identifier. Please be sure to prefix your plugin identifiers with your module name to ensure namespace safety; after all, two different modules could try to implement the 'grid2' plugin, and that would cause one plugin to completely fail.
+Please be sure to prefix your plugin identifiers with your module name to ensure namespace safety; after all, two different modules could try to implement the 'grid2' plugin, and that would cause one plugin to completely fail.
...TODO: Finish this document....
=== modified file 'help/api-tables.html'
--- help/api-tables.html 2009-10-17 18:33:18 +0000
+++ help/api-tables.html 2009-10-18 07:37:31 +0000
@@ -52,7 +52,7 @@
Base table
-If your table is a base table -- meaning it can be the primary, central table for a View to use, you can declare it to be a base table. This primarily provides UI information so that it can be selected.
+If your table is a base table -- meaning it can be the primary, central table for a View to use, you can declare it to be a base table. This primarily provides UI information so that it can be selected.
For example:
// Advertise this table as a possible base table
@@ -64,7 +64,7 @@
);
-The following tags are available in the
+The following tags are available in the
field
The primary key field for this table. For Views to treat any table as a base table, it must have a primary field. For node this is the 'nid', for users this is the 'uid', etc. Without a single primary key field (i.e. not a composite key), Views will not be able to utilize the table as a base table. If your table does not have a primary key field, it is not too difficult to just add a serial field to it, usually.
This must appear; it should be the oldest API version that your module can work with. If Views is currently running an older version of the API, it will ignore your module's views integration. This is a good thing, as it will prevent code crashes, at the expense of your module's functionality disappearing.
-You may find the current Views API version by calling views_api_version() which is implemented at the top of views.module. This version numbering starts at 2.0. Every time changes are made to the Views handlers and plugins or other aspects of the Views API, the number will tick up (by either .001, .01 .1 or 1 depending upon how major the changes are). Note that views_api_version() was introduced in Views 2.0-rc2 and may not exist prior to that version. You may use function_exists() to test to see if this function is there.
+You may find the current Views API version by calling views_api_version() which is implemented at the top of views.module. This version numbering starts at 2.0. Every time changes are made to the Views handlers and plugins or other aspects of the Views API, the number will tick up (by either .001, .01 .1 or 1 depending upon how major the changes are). Note that views_api_version() was introduced in Views 2.0-rc2 and may not exist prior to that version. You may use drupal_function_exists() to test to see if this function is there.
Often these versions are basically compatible with each other and Views won't care if your module implements 2.000, 2.001, 2.002, etc. Your module can request that it won't work with any version older than a given version, however. Views will determine, itself, if a newer version will work.
Before working through this example, enable the Blog module and populate some entries from a few different users.
Creating the View
-
The first step is creating a view for our recent blog entries block. Because the block will show the titles of blog entries, this view is considered a "Node" type. Go to add new view, enter the following properties, and click Next:
+
The first step is creating a view for our recent blog entries block. Because the block will show the titles of blog entries, this view is considered a "Node" type. Go to add new view, enter the following properties, and click Next:
View name
@@ -60,14 +60,14 @@
There's not much else to do here as far as Views is concerned. Under Block settings, click the None link next to Admin and fill in a description for the block in the administrative interface, such as: 'Recent blog entries by author.' and click Update.
Save your work by clicking the Save button at the bottom of the Views interface. You should receive a message that the view has been saved.
Next, navigate to the blocks interface and drag the 'Recent blog entries by author' block to the right sidebar region (or similar) and click Save blocks.
-
You'll notice this appeared to do nothing. No block shows in the sidebar. But remember, we are looking at an adminitrative page; we are not looking at a page that would provide a user ID context. Navigate to the main blog listing and click on an entry there. You should now see a sidebar block, titled something like "Recent entries by admin," with a list of blog entries beneath it.
+
You'll notice this appeared to do nothing. No block shows in the sidebar. But remember, we are looking at an adminitrative page; we are not looking at a page that would provide a user ID context. Navigate to the main blog listing and click on an entry there. You should now see a sidebar block, titled something like "Recent entries by admin," with a list of blog entries beneath it.
Finishing touches
There are still a few remaining things to do before our view is complete. For example, we said that the block was to show recent blog entries, but instead it's showing them in the order they were entered, with oldest on top. Additionally, even unpublished entries are showing in the list currently.
Go to add new view. Give your new view the name 'recent_stories', description 'Recent Stories', tag 'story', type 'Node' and click Next.
+
Go to add new view. Give your new view the name 'recent_stories', description 'Recent Stories', tag 'story', type 'Node' and click Next.
About the interface
You have been brought to Views User Interface. As you start, you are editing the "Default" options for the view. In the 1st column on the left you can see the drop-down menu offers 'block', for example, to select settings specific only to block views. In the remaining columns, you will be able to add or change options by clicking on links or icons. These options will then appear below this main area. Most likely, you will need to scroll a bit to see the options appear.
Go to add new view. Give it the name 'user_feed', description 'A feed of user nodes.', tag 'users', type 'Node' and click Next.
+
Go to add new view. Give it the name 'user_feed', description 'A feed of user nodes.', tag 'users', type 'Node' and click Next.
About the Interface. You have been brought to the Views User Interface. As you start, you are editing the "Default" options for the view. In the 1st column on the left- you can see the pull-down menu offers 'Feed', for example, to select settings specific only to RSS views. In the remaining columns, you will be able to add or change options by clicking on links or icons. These options appear below this main area. Most likely, you will need to scroll to see the options appear. As you make changes, these options will appear in bold until you save your view.
Go to add new view. Give your new view the name 'user_list', description 'A simple user listing.', tag 'users', type 'User' and click Next.
+
Go to add new view. Give your new view the name 'user_list', description 'A simple user listing.', tag 'users', type 'User' and click Next.
About the Interface
You have been brought to the Views User Interface. As you start, you are editing the "Default" options for the view. In the 1st column on the left you can see the drop-down menu offers 'block', for example, to select settings specific only to block views. In the remaining columns, you will be able to add or change options by clicking on links or icons. These options will then appear below this main area. Most likely, you will need to scroll to see the options appear. As you make changes, these options will appear in bold until you save your view.
Creating a page display; choosing a URL and creating a menu link
In the 1st column, ensure that 'Page' is selected in the drop-down menu, and click Add Display.
-
Next we'll define the path for this page. A page must have a path, and we define it early so that Views doesn't warn us "Display Page uses path but path is undefined." Locate the Page settings in the 2nd column, and click the None link next to the Path setting. In the options editing area that appears below, set the path to 'user_list' (or something else if you prefer) and click Update.
+
Next we'll define the path for this page. A page must have a path, and we define it early so that Views doesn't warn us "Display Page uses path but path is undefined." Locate the Page settings in the 2nd column, and click the None link next to the Path setting. In the options editing area that appears below, set the path to 'user_list' (or something Implement you prefer) and click Update.
Next to Menu setting, Click the No menu link. In the options which appear below, select Normal menu entry, and set the title to 'User list' and click Update.
Scroll up to Basic settings, in that same 2nd column, and click the No link next to Use pager. Below, in the options, select Full pager and click Update default display.
=== modified file 'help/menu.html'
--- help/menu.html 2009-10-17 18:33:18 +0000
+++ help/menu.html 2009-10-18 07:37:31 +0000
@@ -14,7 +14,7 @@
For example, if you have two views that you want to be tabs, you could set it up like this:
-
In the first view, set the path to 'tabs/tab1'. Set it to be the 'default tab', set the title to 'Tab 1' and the weight to 0.
+
In the first view, set the path to 'tabs/tab1'. Set it to be the 'default tab', set the title to 'Tab 1' and the weight to 0.
Click update and you will be taken to a form that lets you define the parent. Since 'tabs' doesn't already exist in the system, select 'Normal menu item', and set the title to 'Tabs'.
On the second view, set the path to 'tabs/tab2'; set it to be a 'Menu tab', and set the title to 'Tab 2'.
-The above uses the 'horizontal' alignment, where rows are added into the grid from left to right.
+The above uses the 'horizontal' alignment, where rows are added into the grid from left to right.
With a vertical alignment, rows will be placed from top to bottom, like this:
-The list style also uses a row style which means that it doesn't care what the actual output for each row of the view is.
+The list style also uses a row style which means that it doesn't care what the actual output for each row of the view is.
If you need information about using CSS to style list views, you may find this A list apart guide to styling lists useful.
\ No newline at end of file
=== modified file 'help/theme-css.html'
--- help/theme-css.html 2009-10-17 18:33:18 +0000
+++ help/theme-css.html 2009-10-18 07:37:31 +0000
@@ -1,5 +1,5 @@
-Views uses a wide array of CSS classes on all of its content to ensure that you can easily and accurately select exactly the content you need in order to manipulate it with CSS.
+Views uses a wide array of CSS classes on all of its content to ensure that you can easily and accurately select exactly the content you need in order to manipulate it with CSS.
Typically, every view is wrapped in a div with the name of the view as part of its class (for all these examples, we will assume the name of the view is myview), as well as the generic class 'view':
=== modified file 'help/using-theme.html'
--- help/using-theme.html 2009-10-17 18:33:18 +0000
+++ help/using-theme.html 2009-10-18 07:37:31 +0000
@@ -28,7 +28,7 @@
User: Name
-The contents of the $row variable included these fields, in precisely the order that I had arranged them to using the Views rearrange link. Also worth noting, though, is that each field also has an identifier so it can easily be pulled out of the row should I want to display it differently. Using
+The contents of the $row variable included these fields, in precisely the order that I had arranged them to using the Views rearrange link. Also worth noting, though, is that each field also has an identifier so it can easily be pulled out of the row should I want to display it differently. Using
<?php print $row['title']; ?>
=== modified file 'help/views.help.ini'
--- help/views.help.ini 2009-10-17 18:33:18 +0000
+++ help/views.help.ini 2009-10-18 07:37:31 +0000
@@ -82,7 +82,7 @@
[style]
title = "Output styles (View styles)"
-weight = -20
+weight = -20
[style-row]
title = "View row styles"
=== modified file 'includes/admin.inc'
--- includes/admin.inc 2009-10-17 18:33:18 +0000
+++ includes/admin.inc 2009-10-19 05:51:59 +0000
@@ -31,12 +31,13 @@
}
if (!module_exists('advanced_help')) {
- $filename = db_result(db_query("SELECT filename FROM {system} WHERE type = 'module' AND name = 'advanced_help'"));
+ $filename = db_query_range("SELECT filename FROM {system} WHERE type = 'module' AND name = 'advanced_help'", 0, 1)
+ ->fetchField();
if ($filename && file_exists($filename)) {
- drupal_set_message(t('If you enable the advanced help module, Views will provide more and better help. Hide this message.', array('@modules' => url('admin/build/modules'),'@hide' => url('admin/build/views/tools'))));
+ drupal_set_message(t('If you enable the advanced help module, Views will provide more and better help. Hide this message.', array('@modules' => url('admin/build/modules'),'@hide' => url('admin/structure/views/tools'))));
}
else {
- drupal_set_message(t('If you install the advanced help module from !href, Views will provide more and better help. Hide this message.', array('!href' => l('http://drupal.org/project/advanced_help', 'http://drupal.org/project/advanced_help'), '@hide' => url('admin/build/views/tools'))));
+ drupal_set_message(t('If you install the advanced help module from !href, Views will provide more and better help. Hide this message.', array('!href' => l('http://drupal.org/project/advanced_help', 'http://drupal.org/project/advanced_help'), '@hide' => url('admin/structure/views/tools'))));
}
}
}
@@ -54,7 +55,7 @@
// back to the base URL.
if (isset($_GET['op']) && $_GET['op'] == t('Reset')) {
unset($_SESSION['views']['#admin']);
- drupal_goto('admin/build/views');
+ drupal_goto('admin/structure/views');
}
if (count($_GET) <= 1) {
if (isset($_SESSION['views']['#admin']) && is_array($_SESSION['views']['#admin'])) {
@@ -75,8 +76,15 @@
);
$vars['widgets'] = drupal_build_form('views_ui_list_views_form', $form_state);
+ unset($vars['widgets']['form_id']);
+ unset($vars['widgets']['form_build_id']);
+ unset($vars['widgets']['form_token']);
+ $vars['widgets'] = drupal_render($vars['widgets']);
- $vars['help_type_icon'] = theme('advanced_help_topic', 'views', 'view-type');
+ $vars['help_type_icon'] = '';
+ if (module_exists('advanced_help')) {
+ $vars['help_type_icon'] = theme('advanced_help_topic', array('topic' => 'views', 'type' => 'view-type'));
+ }
$base_tables = views_fetch_base_tables();
@@ -87,7 +95,7 @@
continue;
}
}
- else if ($form_state['values']['tag'] != $view->tag) {
+ elseif ($form_state['values']['tag'] != $view->tag) {
continue;
}
}
@@ -106,20 +114,20 @@
$item = new stdClass();
$item->ops = array();
if (empty($view->disabled)) {
- $item->ops[] = l(t('Edit'), "admin/build/views/edit/$view->name");
- $item->ops[] = l(t('Export'), "admin/build/views/export/$view->name");
- $item->ops[] = l(t('Clone'), "admin/build/views/clone/$view->name");
+ $item->ops[] = l(t('Edit'), "admin/structure/views/edit/$view->name");
+ $item->ops[] = l(t('Export'), "admin/structure/views/export/$view->name");
+ $item->ops[] = l(t('Clone'), "admin/structure/views/clone/$view->name");
}
if ($view->type != t('Default')) {
$text = $view->type == t('Overridden') ? t('Revert') : t('Delete');
- $item->ops[] = l($text, "admin/build/views/delete/$view->name");
+ $item->ops[] = l($text, "admin/structure/views/delete/$view->name");
}
else {
if (empty($view->disabled)) {
- $item->ops[] = l(t('Disable'), "admin/build/views/disable/$view->name", array('query' => drupal_get_destination()));
+ $item->ops[] = l(t('Disable'), "admin/structure/views/disable/$view->name", array('query' => drupal_get_destination()));
}
else {
- $item->ops[] = l(t('Enable'), "admin/build/views/enable/$view->name", array('query' => drupal_get_destination()));
+ $item->ops[] = l(t('Enable'), "admin/structure/views/enable/$view->name", array('query' => drupal_get_destination()));
}
}
@@ -200,7 +208,10 @@
views_add_css('views-list');
$vars['views'] = $i;
- $getting_started = theme('advanced_help_topic', 'views', 'getting-started', 'title');
+ $getting_started = '';
+ if (module_exists('advanced_help')) {
+ $getting_started = theme('advanced_help_topic', array('topic' => 'views', 'type' => 'getting-started', 'extra' => 'title'));
+ }
if (!$getting_started) {
$getting_started = t('Install the advanced help module for the getting started');
}
@@ -211,7 +222,7 @@
/**
* Provide a form for sorting and filtering the list of views.
*/
-function views_ui_list_views_form(&$form_state) {
+function views_ui_list_views_form($form, &$form_state) {
if (!variable_get('clean_url', FALSE)) {
$form['q'] = array(
'#type' => 'hidden',
@@ -249,9 +260,11 @@
$tags = array();
$extras = array();
- foreach ($form_state['views'] as $name => $view) {
- if (!empty($view->tag)) {
- $tags[$view->tag] = $view->tag;
+ if (isset($form_state['views'])) {
+ foreach ($form_state['views'] as $name => $view) {
+ if (!empty($view->tag)) {
+ $tags[$view->tag] = $view->tag;
+ }
}
}
@@ -319,18 +332,9 @@
);
}
- $form['#theme'] = array('views_ui_list_views_form');
return $form;
}
-function theme_views_ui_list_views_form($form) {
- // Don't render these:
- unset($form['form_id']);
- unset($form['form_build_id']);
- unset($form['form_token']);
- return drupal_render($form);
-}
-
/**
* Page callback for the live preview.
*
@@ -353,7 +357,7 @@
'ajax' => $js
);
- $output = drupal_build_form('views_ui_preview_form', $form_state);
+ $output = drupal_render(drupal_build_form('views_ui_preview_form', $form_state));
$args = array();
if (isset($form_state['view_args']) && $form_state['view_args'] !== '') {
$args = explode('/', $form_state['view_args']);
@@ -373,7 +377,7 @@
}
// Make view links come back to preview.
- $view->override_path = 'admin/build/views/nojs/preview/' . $view->name . '/' . $form_state['display_id'];
+ $view->override_path = 'admin/structure/views/nojs/preview/' . $view->name . '/' . $form_state['display_id'];
// also override $_GET['q'] so we get the pager
$_GET['q'] = $view->override_path;
@@ -386,12 +390,8 @@
// Get information from the preview for display.
if (!empty($view->build_info['query'])) {
$rows = array();
- $query = db_prefix_tables($view->build_info['query']);
- if ($view->build_info['query_args']) {
- _db_query_callback($view->build_info['query_args'], TRUE);
- $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
- }
- $rows[] = array('' . t('Query') . '', '
',
- '#value' => t('If set, this view will use an AJAX mechanism for paging, table sorting and exposed filters. This means the entire page will not refresh. It is not recommended that you use this if this view is the main content of the page as it will prevent deep linking to specific pages, but it is very useful for side content.'),
+ '#markup' => '
' . t('If set, this view will use an AJAX mechanism for paging, table sorting and exposed filters. This means the entire page will not refresh. It is not recommended that you use this if this view is the main content of the page as it will prevent deep linking to specific pages, but it is very useful for side content.') . '
',
+ '#markup' => t('You may also adjust the !settings for the currently selected access restriction by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'access_options'))),
'#suffix' => '
',
- '#value' => t('You may also adjust the !settings for the currently selected access restriction by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'access_options'))),
);
}
@@ -960,7 +958,7 @@
case 'cache':
$form['#title'] .= t('Caching');
$form['cache'] = array(
- '#prefix' => '
',
- '#value' => t('You may also adjust the !settings for the currently selected cache mechanism by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'cache_options'))),
+ '#markup' => t('You may also adjust the !settings for the currently selected cache mechanism by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'cache_options'))),
);
}
break;
@@ -1054,9 +1052,7 @@
$style_plugin = views_fetch_plugin_data('style', $this->get_option('style_plugin'));
if (!empty($style_plugin['uses options'])) {
$form['markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'style_options'))),
+ '#markup' => '
' . t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'style_options'))) . '
',
- '#value' => t('You may also adjust the !settings for the currently selected row style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'row_options'))),
+ '#markup' => '
' . t('You may also adjust the !settings for the currently selected row style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'row_options'))) . '
',
);
}
@@ -1127,13 +1121,13 @@
if (isset($_POST['theme'])) {
$this->view->theme = $_POST['theme'];
}
- else if (empty($this->view->theme)) {
+ elseif (empty($this->view->theme)) {
$this->view->theme = variable_get('theme_default', 'garland');
}
global $custom_theme;
$custom_theme = $this->view->theme;
- init_theme();
+ drupal_theme_initialize();
$funcs = array();
// Get theme functions for the display. Note that some displays may
@@ -1180,9 +1174,7 @@
}
$form['important'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => '
' . t('This section lists all possible templates for the display plugin and for the style plugins, ordered roughly from the least specific to the most specific. The active template for each plugin -- which is the most specific template found on the system -- is highlighted in bold.') . '
',
+ '#markup' => '
' . t('This section lists all possible templates for the display plugin and for the style plugins, ordered roughly from the least specific to the most specific. The active template for each plugin -- which is the most specific template found on the system -- is highlighted in bold.') . '
',
- '#value' => t("Important! When adding, removing, or renaming template files, it is necessary to make Drupal aware of the changes by making it rescan the files on your system. By clicking this button you clear Drupal's theme registry and thereby trigger this rescanning process. The highlighted templates above will then reflect the new state of your system."),
+ '#markup' => '
' . t("Important! When adding, removing, or renaming template files, it is necessary to make Drupal aware of the changes by making it rescan the files on your system. By clicking this button you clear Drupal's theme registry and thereby trigger this rescanning process. The highlighted templates above will then reflect the new state of your system.") . '
',
);
$form_state['ok_button'] = TRUE;
break;
@@ -1334,9 +1314,7 @@
case 'exposed_block':
$form['#title'] .= t('Put the exposed form in a block');
$form['description'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('If set, any exposed widgets will not appear with this view. Instead, a block will be made available to the Drupal block administration system, and the exposed form will appear there. Note that this block must be enabled manually, Views will not enable it for you.'),
+ '#markup' => '
' . t('If set, any exposed widgets will not appear with this view. Instead, a block will be made available to the Drupal block administration system, and the exposed form will appear there. Note that this block must be enabled manually, Views will not enable it for you.') . '
',
- '#value' => t("Warning: Changing this item's menu will not work reliably in Drupal 6.4 or earlier. Please upgrade your copy of Drupal at !url.", array('!url' => l('drupal.org', 'http://drupal.org/project/Drupal+project'))),
- '#suffix' => '
',
- '#process' => array('views_process_dependency'),
- '#dependency' => array('radio:menu[type]' => array('normal')),
- '#access' => version_compare(VERSION, '6.5', '<'),
- );
// Only display the menu selector if menu module is enabled.
if (module_exists('menu')) {
@@ -333,7 +324,7 @@
'#value' => $menu['name'],
);
$form['menu']['markup'] = array(
- '#value' => t('Menu selection requires the activation of menu module.'),
+ '#markup' => t('Menu selection requires the activation of menu module.'),
);
}
$form['menu']['weight'] = array(
@@ -354,13 +345,11 @@
}
$form['tab_markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.'),
+ '#markup' => '
' . t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.') . '
',
'#tree' => TRUE,
);
=== modified file 'plugins/views_plugin_query.inc'
--- plugins/views_plugin_query.inc 2009-10-17 18:33:18 +0000
+++ plugins/views_plugin_query.inc 2009-10-18 07:37:32 +0000
@@ -23,12 +23,12 @@
* Provide a countquery if this is true, otherwise provide a normal query.
*/
function query($get_count = FALSE) { }
-
+
/**
* Let modules modify the query just prior to finalizing it.
*/
function alter(&$view) { }
-
+
/**
* Builds the necessary info to execute the query.
*/
@@ -37,7 +37,7 @@
/**
* Executes the query and fills the associated view object with according
* values.
- *
+ *
* Values to set: $view->result, $view->total_rows, $view->execute_time,
* $view->pager['current_page'].
*/
=== modified file 'plugins/views_plugin_query_default.inc'
--- plugins/views_plugin_query_default.inc 2009-10-17 18:33:18 +0000
+++ plugins/views_plugin_query_default.inc 2009-10-19 05:17:54 +0000
@@ -9,7 +9,7 @@
/**
* Object used to create a SELECT query.
*/
-class views_plugin_query_default extends views_plugin_query{
+class views_plugin_query_default extends views_plugin_query {
/**
* A list of tables in the order they should be added, keyed by alias.
@@ -66,6 +66,8 @@
*/
var $distinct = FALSE;
+ var $placeholder_counter = 0;
+
/**
* Constructor; Create the basic query object and fill with default values.
*/
@@ -191,7 +193,7 @@
if (empty($link_point)) {
$link_point = $this->base_table;
}
- else if (!array_key_exists($link_point, $this->relationships)) {
+ elseif (!array_key_exists($link_point, $this->relationships)) {
return FALSE;
}
@@ -541,7 +543,7 @@
// be the prior relationship. Unless it's a direct link.
// Safety! Don't modify an original here.
- $join = drupal_clone($join);
+ $join = clone $join;
// Do we need to try to ensure a path?
if ($join->left_table != $this->relationships[$relationship]['table'] &&
@@ -555,11 +557,11 @@
$join->left_table = $relationship;
}
// then, try the base alias.
- else if (isset($this->tables[$relationship][$join->left_table]['alias'])) {
+ elseif (isset($this->tables[$relationship][$join->left_table]['alias'])) {
$join->left_table = $this->tables[$relationship][$join->left_table]['alias'];
}
// But if we're already looking at an alias, use that instead.
- else if (isset($this->table_queue[$relationship]['alias'])) {
+ elseif (isset($this->table_queue[$relationship]['alias'])) {
$join->left_table = $this->table_queue[$relationship]['alias'];
}
}
@@ -700,16 +702,6 @@
}
/**
- * Control how all WHERE and HAVING groups are put together.
- *
- * @param $type
- * Either 'AND' or 'OR'
- */
- function set_group_operator($type = 'AND') {
- $this->group_operator = strtoupper($type);
- }
-
- /**
* Add a simple WHERE clause to the query. The caller is responsible for
* ensuring that all fields are fully qualified (TABLE.FIELD) and that
* the table already exists in the query.
@@ -718,25 +710,18 @@
* The WHERE group to add these to; groups are used to create AND/OR
* sections. Groups cannot be nested. Use 0 as the default group.
* If the group does not yet exist it will be created as an AND group.
- * @param $clause
- * The actual clause to add. When adding a where clause it is important
- * that all tables are addressed by the alias provided by add_table or
- * ensure_table and that all fields are addressed by their alias wehn
- * possible. Please use %d and %s for arguments.
- * @param ...
- * A number of arguments as used in db_query(). May be many args or one
- * array full of args.
+ * @param $field
+ * The name of the field to check.
+ * @param $value
+ * The value to test the field against. In most cases, this is a scalar. For more
+ * complex options, it is an array. The meaning of each element in the array is
+ * dependent on the $operator.
+ * @param $operator
+ * The comparison operator, such as =, <, or >=. It also accepts more complex
+ * options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
+ * = otherwise.
*/
- function add_where($group, $clause) {
- $args = func_get_args();
- array_shift($args); // ditch $group
- array_shift($args); // ditch $clause
-
- // Expand an array of args if it came in.
- if (count($args) == 1 && is_array(reset($args))) {
- $args = current($args);
- }
-
+ function add_where($group, $field, $value = NULL, $operator = NULL) {
// Ensure all variants of 0 are actually 0. Thus '', 0 and NULL are all
// the default group.
if (empty($group)) {
@@ -748,13 +733,11 @@
$this->set_where_group('AND', $group);
}
- // Add the clause and the args.
- if (is_array($args)) {
- $this->where[$group]['clauses'][] = $clause;
- // we use array_values() here to prevent array_merge errors as keys from multiple
- // sources occasionally collide.
- $this->where[$group]['args'] = array_merge($this->where[$group]['args'], array_values($args));
- }
+ $this->where[$group]['conditions'][] = array(
+ 'field' => $field,
+ 'value' => $value,
+ 'operator' => $operator,
+ );
}
/**
@@ -766,25 +749,18 @@
* The HAVING group to add these to; groups are used to create AND/OR
* sections. Groups cannot be nested. Use 0 as the default group.
* If the group does not yet exist it will be created as an AND group.
- * @param $clause
- * The actual clause to add. When adding a having clause it is important
- * that all tables are addressed by the alias provided by add_table or
- * ensure_table and that all fields are addressed by their alias wehn
- * possible. Please use %d and %s for arguments.
- * @param ...
- * A number of arguments as used in db_query(). May be many args or one
- * array full of args.
+ * @param $field
+ * The name of the field to check.
+ * @param $value
+ * The value to test the field against. In most cases, this is a scalar. For more
+ * complex options, it is an array. The meaning of each element in the array is
+ * dependent on the $operator.
+ * @param $operator
+ * The comparison operator, such as =, <, or >=. It also accepts more complex
+ * options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
+ * = otherwise.
*/
- function add_having($group, $clause) {
- $args = func_get_args();
- array_shift($args); // ditch $group
- array_shift($args); // ditch $clause
-
- // Expand an array of args if it came in.
- if (count($args) == 1 && is_array(reset($args))) {
- $args = current($args);
- }
-
+ function add_having($group, $field, $value = NULL, $operator = NULL) {
// Ensure all variants of 0 are actually 0. Thus '', 0 and NULL are all
// the default group.
if (empty($group)) {
@@ -797,10 +773,11 @@
}
// Add the clause and the args.
- if (is_array($args)) {
- $this->having[$group]['clauses'][] = $clause;
- $this->having[$group]['args'] = array_merge($this->having[$group]['args'], array_values($args));
- }
+ $this->having[$group]['conditions'][] = array(
+ 'field' => $field,
+ 'value' => $value,
+ 'operator' => $operator,
+ );
}
/**
@@ -837,7 +814,10 @@
$this->add_field($table, $field, $as);
}
- $this->orderby[] = "$as " . strtoupper($order);
+ $this->orderby[] = array(
+ 'field' => $as,
+ 'direction' => strtoupper($order)
+ );
// If grouping, all items in the order by must also be in the
// group by clause. Check $table to ensure that this is not a
@@ -865,26 +845,17 @@
* @param $where
* 'where' or 'having'.
*/
- function condition_sql($where = 'where') {
- $clauses = array();
+ function build_condition($where = 'where') {
+ $main_group = $this->group_operator == 'OR' ? db_or() : db_and();
foreach ($this->$where as $group => $info) {
- $clause = implode(") " . $info['type'] . " (", $info['clauses']);
- if (count($info['clauses']) > 1) {
- $clause = '(' . $clause . ')';
- }
- $clauses[] = $clause;
- }
+ $sub_group = $info['type'] == 'OR' ? db_or() : db_and();
+ foreach ($info['conditions'] as $key => $clause) {
- if ($clauses) {
- $keyword = drupal_strtoupper($where);
- if (count($clauses) > 1) {
- return "$keyword (" . implode(")\n " . $this->group_operator . ' (', $clauses) . ")\n";
- }
- else {
- return "$keyword " . array_shift($clauses) . "\n";
- }
+ $sub_group->condition($clause['field'], $clause['value'], $clause['operator']);
+ }
+ $main_group->condition($sub_group);
}
- return "";
+ return $main_group;
}
/**
@@ -923,11 +894,16 @@
$get_count_optimized = TRUE;
}
+ // Go ahead and build the query.
+ $query = db_select($this->base_table, $this->base_table);
+
$joins = $fields = $where = $having = $orderby = $groupby = '';
+
// Add all the tables to the query via joins. We assume all LEFT joins.
foreach ($this->table_queue as $table) {
if (is_object($table['join'])) {
- $joins .= $table['join']->join($table, $this) . "\n";
+ $join_data = $table['join']->join_data($table, $this);
+ $query->leftJoin($join_data['table'], $join_data['alias'], $join_data['condition']);
}
}
@@ -935,34 +911,29 @@
$non_aggregates = array();
foreach ($fields_array as $field) {
- if ($fields) {
- $fields .= ",\n ";
- }
- $string = '';
- if (!empty($field['table'])) {
- $string .= $field['table'] . '.';
- }
- $string .= $field['field'];
- // store for use with non-aggregates below
$fieldname = (!empty($field['alias']) ? $field['alias'] : $string);
if (!empty($field['distinct'])) {
- $string = "DISTINCT($string)";
+ throw new Exception("d7cx: Column-level distinct is not supported yet.");
}
+
if (!empty($field['count'])) {
- $string = "COUNT($string)";
- $has_aggregate = TRUE;
+ // It seems there's no way to abstract the table+column reference
+ // without adding a field, aliasing, and then using the alias.
+ $table = !empty($field['table']) ? $field['table'] : $this->base_table;
+ $alias = $table . '_' . $field . '_viewscount';
+ $query->addField($table, $field['field'], $alias);
+ $query->addExpression('COUNT(' . $alias . ')', $fieldname);
}
elseif ($this->distinct && !in_array($fieldname, $this->groupby)) {
- $string = $GLOBALS['db_type'] == 'pgsql' ? "FIRST($string)" : $string;
+ // d7cx: This code was there, apparently needed for PostgreSQL
+ // $string = db_driver() == 'pgsql' ? "FIRST($string)" : $string;
+ $query->addField(!empty($field['table']) ? $field['table'] : $this->base_table, $field['field'], $fieldname);
}
else {
$non_aggregates[] = $fieldname;
- }
- if ($field['alias']) {
- $string .= " AS $field[alias]";
- }
- $fields .= $string;
+ $query->addField(!empty($field['table']) ? $field['table'] : $this->base_table, $field['field'], $fieldname);
+ }
if ($get_count_optimized) {
// We only want the first field in this case.
@@ -971,25 +942,27 @@
}
if ($has_aggregate || $this->groupby) {
- $groupby = "GROUP BY " . implode(', ', array_unique(array_merge($this->groupby, $non_aggregates))) . "\n";
- if ($this->having) {
- $having = $this->condition_sql('having');
+ $groupby = array_unique(array_merge($this->groupby, $non_aggregates));
+ foreach ($groupby as $field) {
+ $query->groupBy($field);
+ }
+ if (!empty($this->having)) {
+ $query->having($this->build_condition('having'));
}
}
if (!$get_count_optimized) {
// we only add the groupby if we're not counting.
if ($this->orderby) {
- $orderby = "ORDER BY " . implode(', ', $this->orderby) . "\n";
+ foreach ($this->orderby as $order) {
+ $query->orderBy($order['field'], $order['direction']);
+ }
}
}
- $where = $this->condition_sql();
-
- $query = "SELECT $fields\n FROM {" . $this->base_table . "} $this->base_table \n$joins $where $groupby $having $orderby";
-
- $replace = array('>' => '>', '<' => '<');
- $query = strtr($query, $replace);
+ if (!empty($this->where)) {
+ $query->condition($this->build_condition('where'));
+ }
return $query;
}
@@ -1017,41 +990,38 @@
$function($view, $this);
}
}
-
+
/**
* Builds the necessary info to execute the query.
*/
function build(&$view) {
$view->build_info['query'] = $this->query();
$view->build_info['count_query'] = $this->query(TRUE);
- $view->build_info['query_args'] = $this->get_where_args();
}
/**
* Executes the query and fills the associated view object with according
* values.
- *
+ *
* Values to set: $view->result, $view->total_rows, $view->execute_time,
* $view->pager['current_page'].
*/
function execute(&$view) {
$external = FALSE; // Whether this query will run against an external database.
- $query = db_rewrite_sql($view->build_info['query'], $view->base_table, $view->base_field, array('view' => &$view));
- $count_query = db_rewrite_sql($view->build_info['count_query'], $view->base_table, $view->base_field, array('view' => &$view));
- $args = $view->build_info['query_args'];
-
- vpr($query);
+ $query = $view->build_info['query'];
+ $count_query = $view->build_info['count_query'];
$items = array();
if ($query) {
- $replacements = module_invoke_all('views_query_substitutions', $view);
- $query = str_replace(array_keys($replacements), $replacements, $query);
- $count_query = 'SELECT COUNT(*) FROM (' . str_replace(array_keys($replacements), $replacements, $count_query) . ') count_alias';
+ $additional_arguments = module_invoke_all('views_query_substitutions', $view);
+ $count_query = $count_query->countQuery();
- if (is_array($args)) {
- foreach ($args as $id => $arg) {
- $args[$id] = str_replace(array_keys($replacements), $replacements, $arg);
- }
+ // Add additional arguments as a fake condition.
+ // XXX: this doesn't work... because PDO mandates that all bound arguments
+ // are used on the query. TODO: Find a better way to do this.
+ if (!empty($additional_arguments)) {
+ // $query->where('1 = 1', $additional_arguments);
+ // $count_query->where('1 = 1', $additional_arguments);
}
// Detect an external database.
@@ -1060,14 +1030,14 @@
$external = TRUE;
}
- $start = views_microtime();
+ $start = microtime(TRUE);
if (!empty($view->pager['items_per_page'])) {
// We no longer use pager_query() here because pager_query() does not
// support an offset. This is fine as we don't actually need pager
// query; we've already been doing most of what it does, and we
// just need to do a little more playing with globals.
if (!empty($view->pager['use_pager']) || !empty($view->get_total_rows)) {
- $view->total_rows = db_result(db_query($count_query, $args)) - $view->pager['offset'];
+ $view->total_rows = $count_query->execute()->fetchField() - $view->pager['offset'];
}
if (!empty($view->pager['use_pager'])) {
@@ -1093,22 +1063,29 @@
}
$offset = $view->pager['current_page'] * $view->pager['items_per_page'] + $view->pager['offset'];
- $result = db_query_range($query, $args, $offset, $view->pager['items_per_page']);
- }
- else {
- $result = db_query($query, $args);
- }
-
- $view->result = array();
- while ($item = db_fetch_object($result)) {
- $view->result[] = $item;
+ $query->range($offset, $view->pager['items_per_page']);
+ }
+
+ try {
+ $result = $query->execute();
+
+ $view->result = array();
+ foreach ($result as $item) {
+ $view->result[] = $item;
+ }
+ }
+ catch (Exception $e) {
+ $view->result = array();
+ debug('Exception: ' . $e->getMessage());
}
if ($external) {
db_set_active();
}
+
+ debug((string) $query);
}
- $view->execute_time = views_microtime() - $start;
+ $view->execute_time = microtime(TRUE) - $start;
}
function add_signature(&$view) {
=== modified file 'plugins/views_plugin_row.inc'
--- plugins/views_plugin_row.inc 2009-10-17 18:33:18 +0000
+++ plugins/views_plugin_row.inc 2009-10-18 12:07:40 +0000
@@ -130,7 +130,13 @@
* of some form, but not always.
*/
function render($row) {
- return theme($this->theme_functions(), $this->view, $this->options, $row, $this->field_alias);
+ return theme($this->theme_functions(),
+ array(
+ 'view' => $this->view,
+ 'options' => $this->options,
+ 'row' => $row,
+ 'field_alias' => $this->field_alias
+ ));
}
}
=== modified file 'plugins/views_plugin_style.inc'
--- plugins/views_plugin_style.inc 2009-10-17 18:33:18 +0000
+++ plugins/views_plugin_style.inc 2009-10-18 12:09:56 +0000
@@ -142,7 +142,7 @@
*/
function render() {
if ($this->uses_row_plugin() && empty($this->row_plugin)) {
- vpr('views_plugin_style_default: Missing row plugin');
+ debug('views_plugin_style_default: Missing row plugin');
return;
}
@@ -165,7 +165,13 @@
$rows = $records;
}
- $output .= theme($this->theme_functions(), $this->view, $this->options, $rows, $title);
+ $output .= theme($this->theme_functions(),
+ array(
+ 'view' => $this->view,
+ 'options' => $this->options,
+ 'rows' => $rows,
+ 'title' => $title)
+ );
}
unset($this->view->row_index);
return $output;
=== modified file 'plugins/views_plugin_style_rss.inc'
--- plugins/views_plugin_style_rss.inc 2009-10-17 18:33:18 +0000
+++ plugins/views_plugin_style_rss.inc 2009-10-19 05:17:54 +0000
@@ -30,7 +30,7 @@
$this->view->feed_icon = '';
}
- $this->view->feed_icon .= theme('feed_icon', $url, $title);
+ $this->view->feed_icon .= theme('feed_icon', array('url' => $url, 'title' => $title));
drupal_add_link(array(
'rel' => 'alternate',
'type' => 'application/rss+xml',
@@ -77,7 +77,7 @@
function render() {
if (empty($this->row_plugin)) {
- vpr('views_plugin_style_default: Missing row plugin');
+ debug('views_plugin_style_default: Missing row plugin');
return;
}
$rows = '';
@@ -99,6 +99,11 @@
$rows .= $this->row_plugin->render($row);
}
- return theme($this->theme_functions(), $this->view, $this->options, $rows);
+ return theme($this->theme_functions(),
+ array(
+ 'view' => $this->view,
+ 'options' => $this->options,
+ 'rows' => $rows
+ ));
}
}
=== modified file 'plugins/views_plugin_style_summary.inc'
--- plugins/views_plugin_style_summary.inc 2009-10-17 18:33:18 +0000
+++ plugins/views_plugin_style_summary.inc 2009-10-19 05:17:54 +0000
@@ -53,6 +53,10 @@
// @todo: Include separator as an option.
$rows[] = $row;
}
+
+ // TODO: Verify that this works. $this->theme_functions() seems
+ // like it should return an array!
+ // TODO: Convert to D7 theme signature.
return theme($this->theme_functions(), $this->view, $this->options, $rows);
}
}
=== modified file 'plugins/views_plugin_style_table.inc'
--- plugins/views_plugin_style_table.inc 2009-10-17 18:33:18 +0000
+++ plugins/views_plugin_style_table.inc 2009-10-18 20:45:39 +0000
@@ -137,9 +137,7 @@
$handlers = $this->display->handler->get_handlers('field');
if (empty($handlers)) {
$form['error_markup'] = array(
- '#value' => t('You need at least one field before you can configure your table settings'),
- '#prefix' => '
',
- '#suffix' => '
',
+ '#markup' => '
' . t('You need at least one field before you can configure your table settings') . '
',
);
return;
}
@@ -232,7 +230,7 @@
// markup for the field name
$form['info'][$field]['name'] = array(
- '#value' => $field_names[$field],
+ '#markup' => $field_names[$field],
);
}
@@ -246,9 +244,7 @@
);
$form['description_markup'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#value' => t('Place fields into columns; you may combine multiple fields into the same column. If you do, the separator in the column specified will be used to separate the fields. Check the sortable box to make that column click sortable, and check the default sort radio to determine which column will be sorted by default, if any. You may control column order and field labels in the fields section.'),
+ '#markup' => '
' . t('Place fields into columns; you may combine multiple fields into the same column. If you do, the separator in the column specified will be used to separate the fields. Check the sortable box to make that column click sortable, and check the default sort radio to determine which column will be sorted by default, if any. You may control column order and field labels in the fields section.') . '
">
vid)): ?>
=== modified file 'translations/eo.po'
--- translations/eo.po 2009-10-17 18:33:18 +0000
+++ translations/eo.po 2009-10-18 07:37:32 +0000
@@ -1,5 +1,5 @@
# $Id: views.pot,v 1.5 2008/07/06 11:14:01 hass Exp $
-#
+#
# Esperanto translation of Drupal (general)
# Copyright 2008 Chuck Smith
# Generated from files:
@@ -44,7 +44,7 @@
# views-ui-edit-tab.tpl.php,v 1.10 2008/05/14 00:30:25 merlinofchaos
# views-ui-edit-view.tpl.php,v 1.8 2008/05/14 00:52:10 merlinofchaos
# views-ui-list-views.tpl.php,v 1.5 2008/05/08 05:29:30 merlinofchaos
-#
+#
#, fuzzy
msgid ""
""
=== modified file 'views.info'
--- views.info 2009-10-17 18:33:18 +0000
+++ views.info 2009-10-17 23:59:13 +0000
@@ -2,4 +2,227 @@
name = Views
description = Create customized lists and queries from your database.
package = Views
-core = 6.x
+core = 7.x
+php = 5.2
+files[] = views.module
+; Handlers
+files[] = handlers/views_handler_argument.inc
+files[] = handlers/views_handler_argument_date.inc
+files[] = handlers/views_handler_argument_formula.inc
+files[] = handlers/views_handler_argument_many_to_one.inc
+files[] = handlers/views_handler_argument_null.inc
+files[] = handlers/views_handler_argument_numeric.inc
+files[] = handlers/views_handler_argument_string.inc
+files[] = handlers/views_handler_field.inc
+files[] = handlers/views_handler_field_boolean.inc
+files[] = handlers/views_handler_field_custom.inc
+files[] = handlers/views_handler_field_date.inc
+files[] = handlers/views_handler_field_markup.inc
+files[] = handlers/views_handler_field_numeric.inc
+files[] = handlers/views_handler_field_prerender_list.inc
+files[] = handlers/views_handler_field_url.inc
+files[] = handlers/views_handler_filter.inc
+files[] = handlers/views_handler_filter_boolean_operator.inc
+files[] = handlers/views_handler_filter_boolean_operator_string.inc
+files[] = handlers/views_handler_filter_date.inc
+files[] = handlers/views_handler_filter_equality.inc
+files[] = handlers/views_handler_filter_in_operator.inc
+files[] = handlers/views_handler_filter_many_to_one.inc
+files[] = handlers/views_handler_filter_numeric.inc
+files[] = handlers/views_handler_filter_string.inc
+files[] = handlers/views_handler_relationship.inc
+files[] = handlers/views_handler_sort.inc
+files[] = handlers/views_handler_sort_date.inc
+files[] = handlers/views_handler_sort_formula.inc
+files[] = handlers/views_handler_sort_menu_hierarchy.inc
+files[] = handlers/views_handler_sort_random.inc
+; Includes
+files[] = includes/admin.inc
+files[] = includes/ajax.inc
+files[] = includes/analyze.inc
+files[] = includes/base.inc
+files[] = includes/cache.inc
+files[] = includes/convert.inc
+files[] = includes/handlers.inc
+files[] = includes/plugins.inc
+files[] = includes/tabs.inc
+files[] = includes/view.inc
+; Modules
+files[] = modules/aggregator.views.inc
+files[] = modules/aggregator/views_handler_argument_aggregator_fid.inc
+files[] = modules/aggregator/views_handler_field_aggregator_title_link.inc
+files[] = modules/aggregator/views_plugin_row_aggregator_rss.inc
+files[] = modules/book.views.inc
+files[] = modules/comment.views.inc
+files[] = modules/comment.views_convert.inc
+files[] = modules/comment.views_default.inc
+files[] = modules/comment/views_handler_argument_comment_user_uid.inc
+files[] = modules/comment/views_handler_field_comment.inc
+files[] = modules/comment/views_handler_field_comment_depth.inc
+files[] = modules/comment/views_handler_field_comment_link.inc
+files[] = modules/comment/views_handler_field_comment_link_delete.inc
+files[] = modules/comment/views_handler_field_comment_link_edit.inc
+files[] = modules/comment/views_handler_field_comment_link_reply.inc
+files[] = modules/comment/views_handler_field_comment_username.inc
+files[] = modules/comment/views_handler_field_ncs_last_comment_name.inc
+files[] = modules/comment/views_handler_field_ncs_last_updated.inc
+files[] = modules/comment/views_handler_field_node_comment.inc
+files[] = modules/comment/views_handler_field_node_new_comments.inc
+files[] = modules/comment/views_handler_filter_comment_user_uid.inc
+files[] = modules/comment/views_handler_filter_ncs_last_updated.inc
+files[] = modules/comment/views_handler_filter_node_comment.inc
+files[] = modules/comment/views_handler_sort_comment_thread.inc
+files[] = modules/comment/views_handler_sort_ncs_last_comment_name.inc
+files[] = modules/comment/views_handler_sort_ncs_last_updated.inc
+files[] = modules/comment/views_plugin_row_comment_rss.inc
+files[] = modules/comment/views_plugin_row_comment_view.inc
+files[] = modules/locale.views.inc
+files[] = modules/locale/views_handler_argument_locale_group.inc
+files[] = modules/locale/views_handler_argument_locale_language.inc
+files[] = modules/locale/views_handler_field_locale_group.inc
+files[] = modules/locale/views_handler_field_locale_language.inc
+files[] = modules/locale/views_handler_field_locale_link_edit.inc
+files[] = modules/locale/views_handler_filter_locale_group.inc
+files[] = modules/locale/views_handler_filter_locale_language.inc
+files[] = modules/locale/views_handler_filter_locale_version.inc
+files[] = modules/node.views.inc
+files[] = modules/node.views_convert.inc
+files[] = modules/node.views_default.inc
+files[] = modules/node/views_handler_argument_dates_various.inc
+files[] = modules/node/views_handler_argument_node_language.inc
+files[] = modules/node/views_handler_argument_node_nid.inc
+files[] = modules/node/views_handler_argument_node_type.inc
+files[] = modules/node/views_handler_argument_node_vid.inc
+files[] = modules/node/views_handler_field_history_user_timestamp.inc
+files[] = modules/node/views_handler_field_node.inc
+files[] = modules/node/views_handler_field_node_link.inc
+files[] = modules/node/views_handler_field_node_link_delete.inc
+files[] = modules/node/views_handler_field_node_link_edit.inc
+files[] = modules/node/views_handler_field_node_revision_link_delete.inc
+files[] = modules/node/views_handler_field_node_revision_link_revert.inc
+files[] = modules/node/views_handler_field_node_type.inc
+files[] = modules/node/views_handler_filter_history_user_timestamp.inc
+files[] = modules/node/views_handler_filter_node_status.inc
+files[] = modules/node/views_handler_filter_node_type.inc
+files[] = modules/node/views_plugin_argument_default_node.inc
+files[] = modules/node/views_plugin_argument_validate_node.inc
+files[] = modules/node/views_plugin_row_node_rss.inc
+files[] = modules/node/views_plugin_row_node_view.inc
+files[] = modules/poll.views.inc
+files[] = modules/profile.views.inc
+files[] = modules/profile/views_handler_field_profile_date.inc
+files[] = modules/profile/views_handler_field_profile_list.inc
+files[] = modules/profile/views_handler_filter_profile_selection.inc
+files[] = modules/search.views.inc
+files[] = modules/search.views_default.inc
+files[] = modules/search/views_handler_field_search_score.inc
+files[] = modules/search/views_handler_filter_search.inc
+files[] = modules/search/views_handler_sort_search_score.inc
+files[] = modules/search/views_plugin_row_search_view.inc
+files[] = modules/statistics.views.inc
+files[] = modules/statistics.views_default.inc
+files[] = modules/statistics/views_handler_field_accesslog_path.inc
+files[] = modules/system.views.inc
+files[] = modules/system/views_handler_argument_file_fid.inc
+files[] = modules/system/views_handler_field_file.inc
+files[] = modules/system/views_handler_field_file_status.inc
+files[] = modules/system/views_handler_filter_file_status.inc
+files[] = modules/taxonomy.views.inc
+files[] = modules/taxonomy.views_convert.inc
+files[] = modules/taxonomy.views_default.inc
+files[] = modules/taxonomy/views_handler_argument_taxonomy.inc
+files[] = modules/taxonomy/views_handler_argument_term_node_tid.inc
+files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
+files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
+files[] = modules/taxonomy/views_handler_argument_vocabulary_vid.inc
+files[] = modules/taxonomy/views_handler_field_taxonomy.inc
+files[] = modules/taxonomy/views_handler_field_term_node_tid.inc
+files[] = modules/taxonomy/views_handler_filter_term_node_tid.inc
+files[] = modules/taxonomy/views_handler_filter_vocabulary_vid.inc
+files[] = modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
+files[] = modules/translation.views.inc
+;files[] = modules/translation/views_handler_argument_node_language.inc
+files[] = modules/translation/views_handler_argument_node_tnid.inc
+files[] = modules/translation/views_handler_field_node_language.inc
+files[] = modules/translation/views_handler_field_node_translation_link.inc
+files[] = modules/translation/views_handler_filter_node_language.inc
+files[] = modules/translation/views_handler_filter_node_tnid.inc
+files[] = modules/translation/views_handler_filter_node_tnid_child.inc
+files[] = modules/translation/views_handler_relationship_translation.inc
+files[] = modules/upload.views.inc
+files[] = modules/upload.views_convert.inc
+files[] = modules/upload/views_handler_field_upload_description.inc
+files[] = modules/upload/views_handler_field_upload_fid.inc
+files[] = modules/upload/views_handler_filter_upload_fid.inc
+files[] = modules/user.views.inc
+files[] = modules/user/views_handler_argument_user_uid.inc
+files[] = modules/user/views_handler_argument_users_roles_rid.inc
+files[] = modules/user/views_handler_field_user.inc
+files[] = modules/user/views_handler_field_user_link.inc
+files[] = modules/user/views_handler_field_user_link_delete.inc
+files[] = modules/user/views_handler_field_user_link_edit.inc
+files[] = modules/user/views_handler_field_user_mail.inc
+files[] = modules/user/views_handler_field_user_name.inc
+files[] = modules/user/views_handler_field_user_picture.inc
+files[] = modules/user/views_handler_field_user_roles.inc
+files[] = modules/user/views_handler_filter_user_current.inc
+files[] = modules/user/views_handler_filter_user_name.inc
+files[] = modules/user/views_handler_filter_user_roles.inc
+files[] = modules/user/views_plugin_argument_default_current_user.inc
+files[] = modules/user/views_plugin_argument_default_user.inc
+files[] = modules/user/views_plugin_argument_validate_user.inc
+files[] = modules/views.views.inc
+; Plugins
+files[] = plugins/views_plugin_access.inc
+files[] = plugins/views_plugin_access_none.inc
+files[] = plugins/views_plugin_access_perm.inc
+files[] = plugins/views_plugin_access_role.inc
+files[] = plugins/views_plugin_argument_default.inc
+files[] = plugins/views_plugin_argument_default_php.inc
+files[] = plugins/views_plugin_argument_validate.inc
+files[] = plugins/views_plugin_argument_validate_numeric.inc
+files[] = plugins/views_plugin_argument_validate_php.inc
+files[] = plugins/views_plugin_cache.inc
+files[] = plugins/views_plugin_cache_none.inc
+files[] = plugins/views_plugin_cache_time.inc
+files[] = plugins/views_plugin_display.inc
+files[] = plugins/views_plugin_display_attachment.inc
+files[] = plugins/views_plugin_display_block.inc
+files[] = plugins/views_plugin_display_default.inc
+files[] = plugins/views_plugin_display_feed.inc
+files[] = plugins/views_plugin_display_page.inc
+files[] = plugins/views_plugin_query.inc
+files[] = plugins/views_plugin_query_default.inc
+files[] = plugins/views_plugin_row.inc
+files[] = plugins/views_plugin_row_fields.inc
+files[] = plugins/views_plugin_style.inc
+files[] = plugins/views_plugin_style_default.inc
+files[] = plugins/views_plugin_style_grid.inc
+files[] = plugins/views_plugin_style_list.inc
+files[] = plugins/views_plugin_style_rss.inc
+files[] = plugins/views_plugin_style_summary.inc
+files[] = plugins/views_plugin_style_summary_unformatted.inc
+files[] = plugins/views_plugin_style_table.inc
+; Theme
+files[] = theme/theme.inc
+files[] = theme/views-exposed-form.tpl.php
+files[] = theme/views-more.tpl.php
+files[] = theme/views-ui-edit-item.tpl.php
+files[] = theme/views-ui-edit-tab.tpl.php
+files[] = theme/views-ui-edit-view.tpl.php
+files[] = theme/views-ui-list-views.tpl.php
+files[] = theme/views-view-field.tpl.php
+files[] = theme/views-view-fields.tpl.php
+files[] = theme/views-view-grid.tpl.php
+files[] = theme/views-view-list.tpl.php
+files[] = theme/views-view-row-comment.tpl.php
+files[] = theme/views-view-row-node.tpl.php
+files[] = theme/views-view-row-rss.tpl.php
+files[] = theme/views-view-rss.tpl.php
+files[] = theme/views-view-summary-unformatted.tpl.php
+files[] = theme/views-view-summary.tpl.php
+files[] = theme/views-view-table.tpl.php
+files[] = theme/views-view-unformatted.tpl.php
+files[] = theme/views-view.tpl.php
+; Tests
+files[] = tests/views_query.test
=== modified file 'views.install'
--- views.install 2009-10-17 18:33:18 +0000
+++ views.install 2009-10-18 07:50:33 +0000
@@ -6,7 +6,7 @@
*/
function views_install() {
- if ($GLOBALS['db_type'] == 'pgsql') {
+ if (db_driver() == 'pgsql') {
db_query('CREATE OR REPLACE FUNCTION first(anyelement, anyelement) RETURNS anyelement AS \'SELECT COALESCE($1, $2);\' LANGUAGE \'sql\';');
db_query("DROP AGGREGATE IF EXISTS first(anyelement)");
db_query("CREATE AGGREGATE first(sfunc = first, basetype = anyelement, stype = anyelement);");
@@ -20,7 +20,7 @@
}
/**
- * Implementation of hook_schemea
+ * Implements hook_schemea
*/
function views_schema() {
// Currently, schema 1 is the only schema we have. As we make updates,
@@ -131,7 +131,7 @@
);
$schema['cache_views'] = drupal_get_schema_unprocessed('system', 'cache');
-
+
$schema['cache_views_data'] = drupal_get_schema_unprocessed('system', 'cache');
$schema['cache_views_data']['description'] = 'Cache table for views to store pre-rendered queries, results, and display output.';
$schema['cache_views_data']['fields']['serialized']['default'] = 1;
@@ -208,7 +208,7 @@
function views_update_6001() {
$ret = array();
$result = db_query("SELECT * FROM {blocks} WHERE module = 'views' AND delta LIKE '\$exp%'");
- while ($block = db_fetch_object($result)) {
+ foreach ($result as $block) {
$new = strtr($block->delta, '$', '-');
$ret[] = update_sql("UPDATE {blocks} SET delta = '" . db_escape_string($new) . "' WHERE module = 'views' AND delta = '" . db_escape_string($block->delta) . "'");
}
@@ -256,7 +256,7 @@
*/
function views_update_6005() {
$ret = array();
-
+
$new_field = array(
'type' => 'varchar',
'length' => '64',
@@ -273,7 +273,7 @@
*/
function views_update_6006() {
$ret = array();
-
+
$table = drupal_get_schema_unprocessed('system', 'cache');
$table['description'] = 'Cache table for views to store pre-rendered queries, results, and display output.';
$table['fields']['serialized']['default'] = 1;
@@ -289,7 +289,7 @@
*/
function views_update_6007() {
$ret = array();
- if ($GLOBALS['db_type'] == 'pgsql') {
+ if (db_driver() == 'pgsql') {
$ret[] = update_sql('CREATE OR REPLACE FUNCTION first(anyelement, anyelement) RETURNS anyelement AS \'SELECT COALESCE($1, $2);\' LANGUAGE \'sql\';');
$ret[] = update_sql("DROP AGGREGATE IF EXISTS first(anyelement)");
$ret[] = update_sql("CREATE AGGREGATE first(sfunc = first, basetype = anyelement, stype = anyelement);");
=== modified file 'views.module'
--- views.module 2009-10-17 18:33:18 +0000
+++ views.module 2009-10-19 05:17:54 +0000
@@ -17,16 +17,16 @@
}
/**
- * Implementation of hook_theme(). Register views theming functions.
+ * Implement hook_theme(). Register views theming functions.
*/
function views_theme() {
$path = drupal_get_path('module', 'views');
- require_once "./$path/theme/theme.inc";
+ include_once $path . '/theme/theme.inc';
// Some quasi clever array merging here.
$base = array(
'file' => 'theme.inc',
- 'path' => "$path/theme",
+ 'path' => $path . '/theme',
);
// Our extra version of pager from pager.inc
@@ -60,7 +60,7 @@
'arguments' => $arguments[$type],
);
- $include = './' . $def['theme path'] . '/' . $def['theme file'];
+ $include = DRUPAL_ROOT . '/' . $def['theme path'] . '/' . $def['theme file'];
if (file_exists($include)) {
require_once $include;
}
@@ -118,7 +118,7 @@
if (!empty($vars['node']->view) && !empty($vars['node']->view->name)) {
$vars['view'] = &$vars['node']->view;
$vars['template_files'][] = 'node-view-' . $vars['node']->view->name;
- if(!empty($vars['node']->view->current_display)) {
+ if (!empty($vars['node']->view->current_display)) {
$vars['template_files'][] = 'node-view-' . $vars['node']->view->name . '-' . $vars['node']->view->current_display;
}
}
@@ -133,21 +133,30 @@
if (!empty($vars['node']->view) && !empty($vars['node']->view->name)) {
$vars['view'] = &$vars['node']->view;
$vars['template_files'][] = 'comment-view-' . $vars['node']->view->name;
- if(!empty($vars['node']->view->current_display)) {
+ if (!empty($vars['node']->view->current_display)) {
$vars['template_files'][] = 'comment-view-' . $vars['node']->view->name . '-' . $vars['node']->view->current_display;
}
}
}
/*
- * Implementation of hook_perm()
+ * Implement hook_permission().
*/
-function views_perm() {
- return array('access all views', 'administer views');
+function views_permission() {
+ return array(
+ 'administer views' => array(
+ 'title' => t('Administer views'),
+ 'description' => t('Access the views administration pages.'),
+ ),
+ 'access all views' => array(
+ 'title' => t('Access all views'),
+ 'description' => t('Bypass access control when accessing views.'),
+ ),
+ );
}
/**
- * Implementation of hook_menu().
+ * Implement hook_menu().
*/
function views_menu() {
// Any event which causes a menu_rebuild could potentially mean that the
@@ -159,23 +168,22 @@
'page callback' => 'views_ajax',
'access callback' => TRUE,
'description' => 'Ajax callback for view loading.',
- 'file' => 'includes/ajax.inc',
'type' => MENU_CALLBACK,
);
- // Path is not admin/build/views due to menu complications with the wildcards from
+ // Path is not admin/structure/views due to menu complications with the wildcards from
// the generic ajax callback.
$items['admin/views/ajax/autocomplete/user'] = array(
'page callback' => 'views_ajax_autocomplete_user',
'access callback' => 'user_access',
'access arguments' => array('access content'),
+ 'type' => MENU_CALLBACK,
'file' => 'includes/ajax.inc',
- 'type' => MENU_CALLBACK,
);
return $items;
}
/**
- * Implementation of hook_menu_alter().
+ * Implement hook_menu_alter().
*/
function views_menu_alter(&$callbacks) {
$our_paths = array();
@@ -293,107 +301,108 @@
}
/**
- * Implementation of hook_block
- */
-function views_block($op = 'list', $delta = 0, $edit = array()) {
- switch ($op) {
- case 'list':
- $items = array();
- $views = views_get_all_views();
- foreach ($views as $view) {
- // disabled views get nothing.
- if (!empty($view->disabled)) {
- continue;
- }
-
- $view->init_display();
- foreach ($view->display as $display_id => $display) {
-
- if (isset($display->handler) && !empty($display->handler->definition['uses hook block'])) {
- $result = $display->handler->execute_hook_block();
- if (is_array($result)) {
- $items = array_merge($items, $result);
- }
- }
-
- if (isset($display->handler) && $display->handler->get_option('exposed_block')) {
- $result = $display->handler->get_special_blocks();
- if (is_array($result)) {
- $items = array_merge($items, $result);
- }
- }
- }
- }
-
- // block.module has a delta length limit of 32, but our deltas can
- // unfortunately be longer because view names can be 32 and display IDs
- // can also be 32. So for very long deltas, change to md5 hashes.
- $hashes = array();
-
- // get the keys because we're modifying the array and we don't want to
- // confuse PHP too much.
- $keys = array_keys($items);
- foreach ($keys as $delta) {
- if (strlen($delta) >= 32) {
- $hash = md5($delta);
- $hashes[$hash] = $delta;
- $items[$hash] = $items[$delta];
- unset($items[$delta]);
- }
- }
-
- variable_set('views_block_hashes', $hashes);
- // Save memory: Destroy those views.
- foreach ($views as $view) {
- $view->destroy();
- }
-
- return $items;
- case 'view':
- $start = views_microtime();
- // if this is 32, this should be an md5 hash.
- if (strlen($delta) == 32) {
- $hashes = variable_get('views_block_hashes', array());
- if (!empty($hashes[$delta])) {
- $delta = $hashes[$delta];
- }
- }
-
- // This indicates it's a special one.
- if (substr($delta, 0, 1) == '-') {
- list($nothing, $type, $name, $display_id) = explode('-', $delta);
- // Put the - back on.
- $type = '-' . $type;
- if ($view = views_get_view($name)) {
- if ($view->access($display_id)) {
- $view->set_display($display_id);
- if (isset($view->display_handler)) {
- $output = $view->display_handler->view_special_blocks($type);
- $view->destroy();
- return $output;
- }
- }
- $view->destroy();
- }
- }
-
- list($name, $display_id) = explode('-', $delta);
- // Load the view
- if ($view = views_get_view($name)) {
- if ($view->access($display_id)) {
- $output = $view->execute_display($display_id);
- vpr("Block $view->name execute time: " . (views_microtime() - $start) * 1000 . "ms");
+ * Implement hook_block_list().
+ */
+function views_block_list() {
+ $items = array();
+ $views = views_get_all_views();
+ foreach ($views as $view) {
+ // disabled views get nothing.
+ if (!empty($view->disabled)) {
+ continue;
+ }
+
+ $view->init_display();
+ foreach ($view->display as $display_id => $display) {
+
+ if (isset($display->handler) && !empty($display->handler->definition['uses hook block'])) {
+ $result = $display->handler->execute_hook_block_list();
+ if (is_array($result)) {
+ $items = array_merge($items, $result);
+ }
+ }
+
+ if (isset($display->handler) && $display->handler->get_option('exposed_block')) {
+ $result = $display->handler->get_special_blocks();
+ if (is_array($result)) {
+ $items = array_merge($items, $result);
+ }
+ }
+ }
+ }
+
+ // block.module has a delta length limit of 32, but our deltas can
+ // unfortunately be longer because view names can be 32 and display IDs
+ // can also be 32. So for very long deltas, change to md5 hashes.
+ $hashes = array();
+
+ // get the keys because we're modifying the array and we don't want to
+ // confuse PHP too much.
+ $keys = array_keys($items);
+ foreach ($keys as $delta) {
+ if (strlen($delta) >= 32) {
+ $hash = md5($delta);
+ $hashes[$hash] = $delta;
+ $items[$hash] = $items[$delta];
+ unset($items[$delta]);
+ }
+ }
+
+ variable_set('views_block_hashes', $hashes);
+ // Save memory: Destroy those views.
+ foreach ($views as $view) {
+ $view->destroy();
+ }
+
+ return $items;
+}
+
+/**
+ * Implement hook_block_view().
+ */
+function views_block_view($delta) {
+ $start = microtime(TRUE);
+ // if this is 32, this should be an md5 hash.
+ if (strlen($delta) == 32) {
+ $hashes = variable_get('views_block_hashes', array());
+ if (!empty($hashes[$delta])) {
+ $delta = $hashes[$delta];
+ }
+ }
+
+ // This indicates it's a special one.
+ if (substr($delta, 0, 1) == '-') {
+ list($nothing, $type, $name, $display_id) = explode('-', $delta);
+ // Put the - back on.
+ $type = '-' . $type;
+ if ($view = views_get_view($name)) {
+ if ($view->access($display_id)) {
+ $view->set_display($display_id);
+ if (isset($view->display_handler)) {
+ $output = $view->display_handler->view_special_blocks($type);
$view->destroy();
return $output;
}
- $view->destroy();
}
- break;
+ $view->destroy();
+ }
+ }
+
+ list($name, $display_id) = explode('-', $delta);
+ // Load the view
+ if ($view = views_get_view($name)) {
+ if ($view->access($display_id)) {
+ $output = $view->execute_display($display_id);
+ debug("Block $view->name execute time: " . (microtime(TRUE) - $start) * 1000 . "ms");
+ $view->destroy();
+ return $output;
+ }
+ $view->destroy();
}
}
/**
- * Implementation of hook_flush_caches().
+ * Implement hook_flush_caches().
*/
function views_flush_caches() {
return array('cache_views', 'cache_views_data');
@@ -403,7 +412,7 @@
* Invalidate the views cache, forcing a rebuild on the next grab of table data.
*/
function views_invalidate_cache() {
- cache_clear_all('*', 'cache_views', true);
+ cache_clear_all('*', 'cache_views', TRUE);
}
/**
@@ -506,12 +515,7 @@
* Include views .inc files as necessary.
*/
function views_include($file) {
- static $used = array();
- if (!isset($used[$file])) {
- require_once './' . drupal_get_path('module', 'views') . "/includes/$file.inc";
- }
-
- $used[$file] = TRUE;
+ module_load_include('inc', 'views', "includes/$file");
}
/**
@@ -519,8 +523,8 @@
*/
function views_module_include($file) {
foreach (views_get_module_apis() as $module => $info) {
- if (file_exists("./$info[path]/$module.$file")) {
- require_once "./$info[path]/$module.$file";
+ if (file_exists(DRUPAL_ROOT . "/$info[path]/$module.$file")) {
+ require_once DRUPAL_ROOT . "/$info[path]/$module.$file";
}
}
}
@@ -533,12 +537,8 @@
if (!isset($cache)) {
$cache = array();
foreach (module_implements('views_api') as $module) {
- $function = $module . '_views_api';
- $info = $function();
+ $info = module_invoke($module, 'views_api');
if (isset($info['api']) && $info['api'] == 2.000) {
- if (!isset($info['path'])) {
- $info['path'] = drupal_get_path('module', $module);
- }
$cache[$module] = $info;
}
}
@@ -555,7 +555,7 @@
// and we don't want to generate duplicate cache files.
// TODO: at some point investigate adding some files unconditionally and
// allowing preprocess.
- drupal_add_css(drupal_get_path('module', 'views') . "/css/$file.css", 'module', 'all', FALSE);
+ drupal_add_css(drupal_get_path('module', 'views') . "/css/$file.css", array('preprocess' => FALSE));
}
/**
@@ -567,11 +567,15 @@
return;
}
- static $base = TRUE;
+ static $base = TRUE, $ajax = TRUE;
if ($base) {
drupal_add_js(drupal_get_path('module', 'views') . "/js/base.js");
$base = FALSE;
}
+ if ($ajax && $file == 'ajax') {
+ drupal_add_js('misc/ajax.js', array('weight' => -1));
+ $ajax = TRUE;
+ }
drupal_add_js(drupal_get_path('module', 'views') . "/js/$file.js");
}
@@ -638,7 +642,7 @@
return _views_prepare_handler($data[$field][$key], $data, $field);
}
// DEBUG -- identify missing handlers
- vpr("Missing handler: $table $field $key");
+ debug("Missing handler: $table $field $key");
$broken = array(
'title' => t('Broken handler @table.@field', array('@table' => $table, '@field' => $field)),
'handler' => 'views_handler_' . $key . '_broken',
@@ -671,6 +675,7 @@
* Get a handler for a plugin
*/
function views_get_plugin($type, $plugin) {
+ views_include('handlers');
$definition = views_fetch_plugin_data($type, $plugin);
if (!empty($definition)) {
return _views_create_handler($definition, $type);
@@ -861,33 +866,6 @@
// Views debug helper functions
/**
- * Provide debug output for Views. This relies on devel.module
- */
-function views_debug($message) {
- if (module_exists('devel') && variable_get('views_devel_output', FALSE) && user_access('access devel information')) {
- if (is_string($message)) {
- $output = $message;
- }
- else {
- $output = var_export($message, TRUE);
- }
- if (variable_get('views_devel_region', 'footer') != 'watchdog') {
- drupal_set_content(variable_get('views_devel_region', 'footer'), '
' . $output . '
');
- }
- else {
- watchdog('views_logging', '
' . $output . '
');
- }
- }
-}
-
-/**
- * Shortcut to views_debug()
- */
-function vpr($message) {
- views_debug($message);
-}
-
-/**
* Debug messages
*/
function vsm($message) {
@@ -922,7 +900,7 @@
*
* Be sure that $view and $display are references.
*/
-function views_exposed_form(&$form_state) {
+function views_exposed_form($form, &$form_state) {
// Don't show the form when batch operations are in progress.
$batch =& batch_get();
if (!empty($batch)) {
@@ -967,12 +945,12 @@
}
}
}
-
+
$form['submit'] = array(
'#name' => '', // prevent from showing up in $_GET.
'#type' => 'submit',
'#value' => t('Apply'),
- '#id' => form_clean_id('edit-submit-' . $view->name),
+ '#id' => drupal_html_id('edit-submit-' . $view->name),
);
$form['#action'] = url($view->get_url());
@@ -1056,38 +1034,21 @@
* Build a list of theme function names for use most everywhere.
*/
function views_theme_functions($hook, $view, $display = NULL) {
- require_once './' . drupal_get_path('module', 'views') . "/theme/theme.inc";
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'views') . "/theme/theme.inc";
return _views_theme_functions($hook, $view, $display);
}
/**
- * Views' replacement for drupal_get_form so that we can do more with
- * less.
- *
- * Items that can be set on the form_state include:
- * - input: The source of input. If unset this will be $_POST.
- * - no_redirect: Absolutely do not redirect the form even if instructed
- * to do so.
- * - rerender: If no_redirect is set and the form was successfully submitted,
- * rerender the form. Otherwise it will just return.
- *
- */
-function drupal_build_form($form_id, &$form_state) {
- views_include('form');
- return _drupal_build_form($form_id, $form_state);
-}
-
-/**
* Substitute current time; this works with cached queries.
*/
function views_views_query_substitutions($view) {
global $language;
return array(
- '***CURRENT_VERSION***' => VERSION,
- '***CURRENT_TIME***' => time(),
- '***CURRENT_LANGUAGE***' => $language->language,
- '***DEFAULT_LANGUAGE***' => language_default('language'),
- '***NO_LANGUAGE***' => '',
+ ':views-current-version' => VERSION,
+ ':views-current-time' => REQUEST_TIME,
+ ':views-current-language' => $language->language,
+ ':views-default-language' => language_default('language'),
+ ':views-no-language' => '',
);
}
@@ -1142,10 +1103,10 @@
$output .= ')';
}
}
- else if (is_bool($var)) {
+ elseif (is_bool($var)) {
$output = $var ? 'TRUE' : 'FALSE';
}
- else if (is_string($var) && strpos($var, "\n") !== FALSE) {
+ elseif (is_string($var) && strpos($var, "\n") !== FALSE) {
// Replace line breaks in strings with a token for replacement
// at the very end. This protects multi-line strings from
// unintentional indentation.
@@ -1175,7 +1136,7 @@
}
/**
- * Implementation of hook_views_exportables().
+ * Implement hook_views_exportables().
*/
function views_views_exportables($op = 'list', $views = NULL, $name = 'foo') {
$all_views = views_get_all_views();
@@ -1196,12 +1157,12 @@
if ($op == 'export') {
$code = "/**\n";
- $code .= " * Implementation of hook_views_default_views().\n";
+ $code .= " * Implement hook_views_default_views().\n";
$code .= " */\n";
$code .= "function " . $name . "_views_default_views() {\n";
foreach ($views as $view => $truth) {
$code .= " /*\n";
- $code .= " * View ". var_export($all_views[$view]->name, TRUE) ."\n";
+ $code .= " * View " . var_export($all_views[$view]->name, TRUE) . "\n";
$code .= " */\n";
$code .= $all_views[$view]->export(' ');
$code .= ' $views[$view->name] = $view;' . "\n\n";
@@ -1214,9 +1175,24 @@
}
/**
- * Microtime helper function to return a float time value (php4 & php5 safe).
+ * Process callback to add dependency to form items.
+ *
+ * Usage:
+ *
+ * On any form item, add
+ * - @code '#process' => 'views_process_dependency' @endcode
+ * - @code '#dependency' => array('id-of-form-without-the-#' => array(list, of, values, that, make, this, gadget, visible)); @endcode
*/
-function views_microtime() {
- list($usec, $sec) = explode(' ', microtime());
- return (float)$sec + (float)$usec;
+function views_process_dependency($element) {
+ if (isset($element['#dependency'])) {
+ if (!isset($element['#dependency_count'])) {
+ $element['#dependency_count'] = 1;
+ }
+ views_add_js('dependent');
+ $options['viewsAjax']['formRelationships'][$element['#id']] = array('num' => $element['#dependency_count'], 'values' => $element['#dependency']);
+ drupal_add_js($options, 'setting');
+ }
+
+ return $element;
}
+
=== renamed file 'views2.doxy' => 'views3.doxy'
--- views2.doxy 2009-10-17 18:33:18 +0000
+++ views3.doxy 2009-10-18 07:37:31 +0000
@@ -14,207 +14,207 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = Views
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = 2.0
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = doc
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
# otherwise cause performance problems for the file system.
CREATE_SUBDIRS = NO
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
# Swedish, and Ukrainian.
OUTPUT_LANGUAGE = English
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
# all platforms other than Windows).
USE_WINDOWS_ENCODING = NO
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
BRIEF_MEMBER_DESC = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
# description.
ALWAYS_DETAILED_SEC = YES
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
# operators of the base classes will not be shown.
INLINE_INHERITED_MEMB = YES
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
FULL_PATH_NAMES = YES
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH =
+STRIP_FROM_PATH =
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
-STRIP_FROM_INC_PATH =
+STRIP_FROM_INC_PATH =
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
# explicit @brief command for a brief description.
JAVADOC_AUTOBRIEF = YES
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
MULTILINE_CPP_IS_BRIEF = NO
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
+# If set to NO, the detailed description appears after the member
# documentation.
DETAILS_AT_TOP = YES
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
# re-implements.
INHERIT_DOCS = YES
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
# be part of the file/class/namespace that contains it.
SEPARATE_MEMBER_PAGES = NO
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
TAB_SIZE = 2
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
-ALIASES =
+ALIASES =
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
# of all members will be omitted, etc.
OPTIMIZE_OUTPUT_FOR_C = NO
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
# will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
+# include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = NO
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
# all members of a group must be documented explicitly.
DISTRIBUTE_GROUP_DOC = NO
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
# the \nosubgrouping command.
SUBGROUPING = YES
@@ -223,326 +223,326 @@
# Build related configuration options
#---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = NO
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
EXTRACT_PRIVATE = NO
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
EXTRACT_STATIC = NO
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = NO
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
# This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_MEMBERS = NO
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
# overviews. This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_CLASSES = NO
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
# documentation.
HIDE_FRIEND_COMPOUNDS = NO
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
# function's detailed documentation block.
HIDE_IN_BODY_DOCS = NO
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
# Set it to YES to include the internal documentation.
INTERNAL_DOCS = NO
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
# and Mac users are advised to set this option to NO.
CASE_SENSE_NAMES = YES
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
# documentation. If set to YES the scope will be hidden.
HIDE_SCOPE_NAMES = NO
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
# of that file.
SHOW_INCLUDE_FILES = YES
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
INLINE_INFO = YES
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
# declaration order.
SORT_MEMBER_DOCS = YES
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
# declaration order.
SORT_BRIEF_DOCS = NO
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
+# Note: This option applies only to the class list, not to the
# alphabetical list.
SORT_BY_SCOPE_NAME = NO
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
GENERATE_TODOLIST = YES
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
# commands in the documentation.
GENERATE_TESTLIST = YES
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
# commands in the documentation.
GENERATE_BUGLIST = YES
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
# \deprecated commands in the documentation.
GENERATE_DEPRECATEDLIST= YES
-# The ENABLED_SECTIONS tag can be used to enable conditional
+# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
MAX_INITIALIZER_LINES = 30
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
# list will mention the files that were used to generate the documentation.
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation. The default is NO.
SHOW_DIRECTORIES = NO
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from the
-# version control system). Doxygen will invoke the program by executing (via
-# popen()) the command , where is the value of
-# the FILE_VERSION_FILTER tag, and is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from the
+# version control system). Doxygen will invoke the program by executing (via
+# popen()) the command , where is the value of
+# the FILE_VERSION_FILTER tag, and is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
# is used as the file version. See the manual for examples.
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-# The QUIET tag can be used to turn on/off the messages that are generated
+# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
QUIET = YES
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
# NO is used.
WARNINGS = YES
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = NO
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
# don't exist or using markup commands wrongly.
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
# documentation.
WARN_NO_PARAMDOC = NO
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
# be obtained via FILE_VERSION_FILTER)
WARN_FORMAT = "$file:$line: $text"
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
# to stderr.
-WARN_LOGFILE =
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT =
+INPUT =
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
FILE_PATTERNS = *.module *.inc *.php
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+# should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used.
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
-EXCLUDE =
+EXCLUDE =
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS =
+EXCLUDE_PATTERNS =
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH =
+EXAMPLE_PATH =
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
-EXAMPLE_PATTERNS =
+EXAMPLE_PATTERNS =
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
# Possible values are YES and NO. If left blank NO is used.
EXAMPLE_RECURSIVE = NO
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
# the \image command).
-IMAGE_PATH =
+IMAGE_PATH =
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command , where
-# is the value of the INPUT_FILTER tag, and is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command , where
+# is the value of the INPUT_FILTER tag, and is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output. If FILTER_PATTERNS is specified, this tag will be
# ignored.
-INPUT_FILTER =
+INPUT_FILTER =
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
-FILTER_PATTERNS =
+FILTER_PATTERNS =
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
# files to browse (i.e. when SOURCE_BROWSER is set to YES).
FILTER_SOURCE_FILES = NO
@@ -551,32 +551,32 @@
# configuration options related to source browsing
#---------------------------------------------------------------------------
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
# VERBATIM_HEADERS is set to NO.
SOURCE_BROWSER = YES
-# Setting the INLINE_SOURCES tag to YES will include the body
+# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
INLINE_SOURCES = YES
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
# fragments. Normal C and C++ comments will always remain visible.
STRIP_CODE_COMMENTS = YES
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
# functions referencing it will be listed.
REFERENCED_BY_RELATION = YES
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
# called/used by that function will be listed.
REFERENCES_RELATION = YES
@@ -588,16 +588,16 @@
REFERENCES_LINK_SOURCE = YES
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
# will need version 4.8.6 or higher.
USE_HTAGS = NO
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
# which an include is specified. Set to NO to disable this.
VERBATIM_HEADERS = YES
@@ -606,133 +606,133 @@
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
# contains a lot of classes, structs, unions or interfaces.
ALPHABETICAL_INDEX = NO
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
# in which this list will be split (can be a number in the range [1..20])
COLS_IN_ALPHA_INDEX = 5
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
GENERATE_HTML = YES
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
HTML_OUTPUT = html
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
# doxygen will generate files with .html extension.
HTML_FILE_EXTENSION = .html
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard header.
-HTML_HEADER =
+HTML_HEADER =
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
+HTML_FOOTER =
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
# stylesheet in the HTML output directory as well, or it will be erased!
-HTML_STYLESHEET =
+HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
HTML_ALIGN_MEMBERS = YES
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
# of the generated HTML documentation.
GENERATE_HTMLHELP = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
# written to the html output directory.
-CHM_FILE =
+CHM_FILE =
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
# the HTML help compiler on the generated index.hhp.
-HHC_LOCATION =
+HHC_LOCATION =
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
# it should be included in the master .chm file (NO).
GENERATE_CHI = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
# normal table of contents (NO) in the .chm file.
BINARY_TOC = NO
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
# to the contents of the HTML help documentation and to the tree view.
TOC_EXPAND = NO
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
# the value YES disables it.
DISABLE_INDEX = NO
-# This tag can be used to set the number of enum values (range [1..20])
+# This tag can be used to set the number of enum values (range [1..20])
# that doxygen will group on one line in the generated HTML documentation.
ENUM_VALUES_PER_LINE = 4
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
# probably better off using the HTML help feature.
GENERATE_TREEVIEW = YES
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
TREEVIEW_WIDTH = 250
@@ -741,74 +741,74 @@
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
GENERATE_LATEX = NO
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `latex' will be used as the default path.
LATEX_OUTPUT = latex
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
LATEX_CMD_NAME = latex
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
# default command name.
MAKEINDEX_CMD_NAME = makeindex
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
# save some trees in general.
COMPACT_LATEX = NO
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
# executive. If left blank a4wide will be used.
PAPER_TYPE = a4wide
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
-EXTRA_PACKAGES =
+EXTRA_PACKAGES =
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
# standard header. Notice: only use this tag if you know what you are doing!
-LATEX_HEADER =
+LATEX_HEADER =
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
PDF_HYPERLINKS = NO
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
# higher quality PDF documentation.
USE_PDFLATEX = NO
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
# This option is also used when generating formulas in HTML.
LATEX_BATCHMODE = NO
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
# in the output.
LATEX_HIDE_INDICES = NO
@@ -817,68 +817,68 @@
# configuration options related to the RTF output
#---------------------------------------------------------------------------
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
# other RTF readers or editors.
GENERATE_RTF = NO
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `rtf' will be used as the default path.
RTF_OUTPUT = rtf
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
# save some trees in general.
COMPACT_RTF = NO
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
# Note: wordpad (write) and others do not support links.
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
-RTF_STYLESHEET_FILE =
+RTF_STYLESHEET_FILE =
-# Set optional variables used in the generation of an rtf document.
+# Set optional variables used in the generation of an rtf document.
# Syntax is similar to doxygen's config file.
-RTF_EXTENSIONS_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
# generate man pages
GENERATE_MAN = NO
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `man' will be used as the default path.
MAN_OUTPUT = man
-# The MAN_EXTENSION tag determines the extension that is added to
+# The MAN_EXTENSION tag determines the extension that is added to
# the generated man pages (default is the subroutine's section .3)
MAN_EXTENSION = .3
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
# would be unable to find the correct page. The default is NO.
MAN_LINKS = NO
@@ -887,33 +887,33 @@
# configuration options related to the XML output
#---------------------------------------------------------------------------
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
# the code including all documentation.
GENERATE_XML = NO
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
XML_OUTPUT = xml
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
# enabling this will significantly increase the size of the XML output.
XML_PROGRAMLISTING = YES
@@ -922,10 +922,10 @@
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
# and incomplete at the moment.
GENERATE_AUTOGEN_DEF = NO
@@ -934,319 +934,319 @@
# configuration options related to the Perl module output
#---------------------------------------------------------------------------
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
# moment.
GENERATE_PERLMOD = NO
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
# to generate PDF and DVI output from the Perl module output.
PERLMOD_LATEX = NO
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader. This is useful
+# if you want to understand what is going on. On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
# and Perl will parse it just the same.
PERLMOD_PRETTY = YES
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
# Makefile don't overwrite each other's variables.
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
# files.
ENABLE_PREPROCESSING = NO
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.
MACRO_EXPANSION = NO
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
# PREDEFINED and EXPAND_AS_DEFINED tags.
EXPAND_ONLY_PREDEF = NO
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# in the INCLUDE_PATH (see below) will be search if a #include is found.
SEARCH_INCLUDES = YES
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
# the preprocessor.
-INCLUDE_PATH =
+INCLUDE_PATH =
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used.
-INCLUDE_FILE_PATTERNS =
+INCLUDE_FILE_PATTERNS =
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
-PREDEFINED =
+PREDEFINED =
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.
-EXPAND_AS_DEFINED =
+EXPAND_AS_DEFINED =
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
# the parser if not removed.
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
# does not have to be run to correct the links.
# Note that each tag file must have a unique name
# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
+# If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here.
-TAGFILES =
+TAGFILES =
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
-GENERATE_TAGFILE =
+GENERATE_TAGFILE =
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
# will be listed.
ALLEXTERNALS = NO
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
# be listed.
EXTERNAL_GROUPS = YES
-# The PERL_PATH should be the absolute path and name of the perl script
+# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
# powerful graphs.
CLASS_DIAGRAMS = YES
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
# or is not a class.
HIDE_UNDOC_RELATIONS = YES
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
HAVE_DOT = NO
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
# the CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
# class references variables) of the class with other documented classes.
COLLABORATION_GRAPH = YES
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for groups, showing the direct groups dependencies
GROUP_GRAPHS = YES
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
# Language.
UML_LOOK = NO
-# If set to YES, the inheritance and collaboration graphs will show the
+# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
TEMPLATE_RELATIONS = NO
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
# other documented files.
INCLUDE_GRAPH = YES
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
# indirectly include this file.
INCLUDED_BY_GRAPH = YES
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
# functions only using the \callgraph command.
CALL_GRAPH = NO
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a caller dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a caller dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
# functions only using the \callergraph command.
CALLER_GRAPH = NO
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
# will graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
DIRECTORY_GRAPH = YES
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
# generated by dot. Possible values are png, jpg, or gif
# If left blank png will be used.
DOT_IMAGE_FORMAT = png
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
-DOT_PATH =
+DOT_PATH =
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
# \dotfile command).
-DOTFILE_DIRS =
+DOTFILE_DIRS =
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
# large images.
MAX_DOT_GRAPH_WIDTH = 1024
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
# large images.
MAX_DOT_GRAPH_HEIGHT = 1024
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that a graph may be further truncated if the graph's
-# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH
-# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default),
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that a graph may be further truncated if the graph's
+# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH
+# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default),
# the graph is not depth-constrained.
MAX_DOT_GRAPH_DEPTH = 0
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, which results in a white background.
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, which results in a white background.
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
# read).
DOT_TRANSPARENT = NO
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
# support this, this feature is disabled by default.
DOT_MULTI_TARGETS = NO
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
# arrows in the dot generated graphs.
GENERATE_LEGEND = YES
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
# the various graphs.
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
-# The SEARCHENGINE tag specifies whether or not a search engine should be
+# The SEARCHENGINE tag specifies whether or not a search engine should be
# used. If set to NO the values of all tags below this one will be ignored.
SEARCHENGINE = NO
=== modified file 'views_export/views_export.info'
--- views_export/views_export.info 2009-10-17 18:33:18 +0000
+++ views_export/views_export.info 2009-10-17 19:26:01 +0000
@@ -4,4 +4,5 @@
description = Allows exporting multiple views at once.
package = "Views"
dependencies[] = views
-core = 6.x
+core = 7.x
+files[] = views_export.module
=== modified file 'views_export/views_export.module'
--- views_export/views_export.module 2009-10-17 18:33:18 +0000
+++ views_export/views_export.module 2009-10-18 20:51:34 +0000
@@ -9,18 +9,18 @@
*/
/**
- * Implementation of hook_menu().
+ * Implements hook_menu().
*/
function views_export_menu() {
$items = array();
- $items['admin/build/views/tools/export'] = array(
+ $items['admin/structure/views/tools/export'] = array(
'title' => 'Bulk export',
'access arguments' => array('use views exporter'),
'page callback' => 'views_export_export',
'type' => MENU_LOCAL_TASK,
);
- $items['admin/build/views/tools/export/results'] = array(
+ $items['admin/structure/views/tools/export/results'] = array(
'access arguments' => array('use views exporter'),
'page callback' => 'views_export_export',
'type' => MENU_CALLBACK,
@@ -28,20 +28,27 @@
return $items;
}
-
+/**
+ * Implements hook_theme().
+ */
function views_export_theme() {
return array(
'views_export_export_form' => array(
- 'args' => array('form' => NULL),
+ 'arguments' => array('form' => NULL),
),
);
}
/**
- * Implementation of hook_perm().
+ * Implements hook_perm().
*/
-function views_export_perm() {
- return array('use views exporter');
+function views_export_permission() {
+ return array(
+ 'use views exporter' => array(
+ 'title' => t('Use Views exporter'),
+ 'description' => t('Use the Views exporter.'),
+ ),
+ );
}
/**
@@ -67,7 +74,7 @@
'tags' => $tags,
);
- $output = drupal_build_form('views_export_export_form', $form_state);
+ $output = drupal_render(drupal_build_form('views_export_export_form', $form_state));
if (!$output) {
$output = $form_state['output'];
}
@@ -81,7 +88,7 @@
/**
* Form to choose a group of views to export.
*/
-function views_export_export_form(&$form_state) {
+function views_export_export_form($form, &$form_state) {
foreach ($form_state['exportables'] as $module => $views) {
foreach ($views as $name => $data) {
$options[$name] = $data['name'];
@@ -129,19 +136,24 @@
'#value' => t('Export'),
);
- $form['#action'] = url('admin/build/views/tools/export/results');
+ $form['#action'] = url('admin/structure/views/tools/export/results');
$form['#redirect'] = FALSE;
- $form['#exportables'] = $form_state['exportables'];
+ if (isset($form_state['exportables'])) {
+ $form['#exportables'] = $form_state['exportables'];
+ }
return $form;
}
-function theme_views_export_export_form($form) {
+function theme_views_export_export_form(&$vars) {
+ $form = $vars['form'];
$output = '';
- $files = module_rebuild_cache();
+ // Get current list of modules.
+ $files = system_rebuild_module_data();
+
$exportables = $form['#exportables'];
$output .= drupal_render($form['tags']);
$output .= drupal_render($form['apply']);
- $output .= '
' . t('The converter will make a best-effort attempt to convert a Views 1 view to Views 2. This conversion is not reliable; you will very likely have to make adjustments to your view to get it to match. You can import Views 1 views through the normal Import tab.') . '
';
}
}
/*
- * Implementation of hook_theme()
+ * Implements hook_theme().
*/
function views_ui_theme() {
$path = drupal_get_path('module', 'views');
- require_once "./$path/includes/admin.inc";
+ require_once DRUPAL_ROOT . "/$path/includes/admin.inc";
return array(
// edit a view
@@ -186,33 +177,31 @@
),
'views_ui_rearrange_form' => array(
'arguments' => array('form' => NULL),
- 'file' => 'includes/admin.inc',
),
// list views
'views_ui_list_views' => array(
+ 'arguments' => array(
+ 'views' => array(),
+ 'help' => '',
+ 'widgets' => '',
+ 'help_type_icon' => '',
+ ),
'template' => 'views-ui-list-views',
'path' => "$path/theme",
),
- 'views_ui_list_views_form' => array(
- 'file' => 'includes/admin.inc',
- 'arguments' => array('form' => NULL),
- ),
// tab themes
'views_tabset' => array(
'arguments' => array('tabs' => NULL),
- 'file' => 'includes/tabs.inc',
),
'views_tab' => array(
'arguments' => array('body' => NULL),
- 'file' => 'includes/tabs.inc',
),
// On behalf of a plugin
'views_ui_style_plugin_table' => array(
'arguments' => array('form' => NULL),
- 'file' => 'includes/admin.inc',
),
);
}
@@ -232,7 +221,14 @@
if (!empty($view)) {
// Check to see if someone else is already editing this view.
global $user;
- $view->locked = db_fetch_object(db_query("SELECT s.uid, v.updated FROM {views_object_cache} v INNER JOIN {sessions} s ON v.sid = s.sid WHERE s.sid != '%s' and v.name = '%s' and v.obj = 'view' ORDER BY v.updated ASC", session_id(), $view->name));
+ $result = db_query("SELECT s.uid, v.updated FROM {views_object_cache} v INNER JOIN {sessions} s ON v.sid = s.sid WHERE s.sid <> :sid and v.name = :name and v.obj = 'view' ORDER BY v.updated ASC",
+ array(
+ ':sid' => session_id(),
+ ':name' => $view->name,
+ ));
+ foreach ($result as $item) {
+ $view->locked = $item;
+ }
}
}
@@ -287,11 +283,56 @@
}
/**
- * Check to see if the incoming menu item is js capable or not.
+ * Package and send the result of a page callback to the browser as an AJAX
+ * response, and add the HTML.
+ *
+ * @param $page_callback_result
+ * The result of a page callback. Can be one of:
+ * - NULL: to indicate no content.
+ * - An integer menu status constant: to indicate an error condition.
+ * - A string of HTML content.
+ * - A renderable array of content.
*/
-function views_ui_js_load($js) {
- if ($js == 'ajax') {
- return TRUE;
- }
- return 0;
+function views_ui_ajax_deliver($page_callback_result) {
+ $commands = array();
+ if (!isset($page_callback_result)) {
+ // Simply delivering an empty commands array is sufficient. This results
+ // in the AJAX request being completed, but nothing being done to the page.
+ }
+ elseif (is_int($page_callback_result)) {
+ switch ($page_callback_result) {
+ case MENU_NOT_FOUND:
+ $commands[] = ajax_command_alert(t('The requested page could not be found.'));
+ break;
+
+ case MENU_ACCESS_DENIED:
+ $commands[] = ajax_command_alert(t('You are not authorized to access this page.'));
+ break;
+
+ case MENU_SITE_OFFLINE:
+ $commands[] = ajax_command_alert(filter_xss_admin(variable_get('maintenance_mode_message',
+ t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))));
+ break;
+ }
+ }
+ elseif (is_array($page_callback_result) && isset($page_callback_result['#type']) && ($page_callback_result['#type'] == 'ajax_commands')) {
+ // Complex AJAX callbacks can return a result that contains a specific
+ // set of commands to send to the browser.
+ if (isset($page_callback_result['#ajax_commands'])) {
+ $commands = $page_callback_result['#ajax_commands'];
+ }
+ }
+ else {
+ // Like normal page callbacks, simple AJAX callbacks can return html
+ // content, as a string or renderable array, to replace what was previously
+ // there in the wrapper. In this case, in addition to the content, we want
+ // to add the status messages, but inside the new wrapper, so that they get
+ // replaced on subsequent AJAX calls for the same wrapper.
+ $html = is_string($page_callback_result) ? $page_callback_result : drupal_render($page_callback_result);
+ $commands[] = ajax_command_replace(NULL, $html);
+ $commands[] = ajax_command_prepend(NULL, theme('status_messages'));
+ }
+ $js = drupal_add_js();
+ $commands[] = ajax_command_settings($js['settings']['data']);
+ ajax_render($commands);
}