cvs: phd /include PhDBuildOptions.class.php
| From: | Christian Weiske | Date: | Fri, 17 Oct 2008 08:46:03 +0000 |
| Subject: | cvs: phd /include PhDBuildOptions.class.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-2250@lists.php.net to get a copy of this message | ||
cweiske Fri Oct 17 08:46:03 2008 UTC
Modified files:
/phd/include PhDBuildOptions.class.php
Log:
Rename "--index <bool>" and "-i <bool>" to "--noindex"
resp "-I"
http://cvs.php.net/viewvc.cgi/phd/include/PhDBuildOptions.class.php?r1=1.7&r2=1.8&diff_format=u
Index: phd/include/PhDBuildOptions.class.php
diff -u phd/include/PhDBuildOptions.class.php:1.7 phd/include/PhDBuildOptions.class.php:1.8
--- phd/include/PhDBuildOptions.class.php:1.7 Sun Oct 5 16:11:47 2008
+++ phd/include/PhDBuildOptions.class.php Fri Oct 17 08:46:03 2008
@@ -1,5 +1,5 @@
<?php
-/* $Id: PhDBuildOptions.class.php,v 1.7 2008/10/05 16:11:47 cweiske Exp $ */
+/* $Id: PhDBuildOptions.class.php,v 1.8 2008/10/17 08:46:03 cweiske Exp $ */
class PhDBuildOptionsParser extends PhDOptionParser
{
@@ -11,7 +11,7 @@
return array(
"format:" => "f:", // The format to render (xhtml,
pdf...)
"theme:" => "t:", // The theme to render (phpweb,
bightml..)
- "index:" => "i:", // Re-index or load from cache
+ "noindex" => "I", // Re-index or load from cache
"docbook:" => "d:", // The Docbook XML file to render
from (.manual.xml)
"output:" => "o:", // The output directory
"partial:" => "p:", // The ID to render (optionally
ignoring its children)
@@ -106,19 +106,11 @@
public function option_i($k, $v)
{
- $this->option_index($k, $v);
+ $this->option_noindex($k, 'true');
}
- public function option_index($k, $v)
+ public function option_noindex($k, $v)
{
- if (is_array($v)) {
- trigger_error(sprintf("You cannot pass %s more than once", $k),
E_USER_ERROR);
- }
- $val = phd_bool($v);
- if (is_bool($val)) {
- PhDConfig::set_index($val);
- } else {
- trigger_error("yes/no || on/off || true/false || 1/0 expected",
E_USER_ERROR);
- }
+ PhDConfig::set_index(false);
}
public function option_d($k, $v)
@@ -339,8 +331,8 @@
--format <formatname> The build format to use
-t <themename>
--theme <themename> The theme to use
- -i <bool>
- --index <bool> Index before rendering (default) or load from cache (false)
+ -I
+ --noindex Do not index before rendering but load from cache (false)
-d <filename>
--docbook <filename> The Docbook file to render from
-p <id[=bool]>