cvs: livedocs / mk_peardoc.php mk_phpdoc.php mk_smarty.php

nlopess Wed Apr 28 12:23:02 2004 EDT Modified files: /livedocs mk_peardoc.php mk_phpdoc.php mk_smarty.php Log: WS fixes

http://cvs.php.net/diff.php/livedocs/mk_peardoc.php?r1=1.5&r2=1.6&ty=u Index: livedocs/mk_peardoc.php diff -u livedocs/mk_peardoc.php:1.5 livedocs/mk_peardoc.php:1.6 --- livedocs/mk_peardoc.php:1.5 Tue Apr 27 10:43:28 2004 +++ livedocs/mk_peardoc.php Wed Apr 28 12:23:02 2004 @@ -18,7 +18,7 @@ // | Configuration file for peardoc build | // +----------------------------------------------------------------------+ // -// $Id: mk_peardoc.php,v 1.5 2004/04/27 14:43:28 nlopess Exp $ +// $Id: mk_peardoc.php,v 1.6 2004/04/28 16:23:02 nlopess Exp $ define('MK_VERSION', false); define('MANUAL_TITLE', 'PEAR Manual'); @@ -31,58 +31,59 @@ function search_parse_dir($path, $section) { - global $idx, $toca, $tocd; + global $idx, $toca, $tocd; - $d = opendir($path); - readdir($d); readdir($d); + $d = opendir($path); + readdir($d); readdir($d); - while (($f = readdir($d))) { - if ($f == 'CVS' || $f == '.cvsignore') { - continue; - } - switch (filetype($path . '/' . $f)) { - case 'file': - switch ($section) { - case 'reference' : - if ($f == 'configure.xml' || $f == 'constants.xml' || $f == 'ini.xml' || $f == 'reference.xml') { - $docbook_id = 'ref.' . basename($path); - } else { - $docbook_id = 'function.' . substr($f, 0, -4); - } - break; - case 'faq': - case 'security' : - $docbook_id = $section . '.' . substr($f, 0, -4); - break; - case 'chapters' : - case 'appendices' : - $docbook_id = substr($f, 0, -4); - break; - } - - if (isset($toca[$docbook_id])) { - $id = $toca[$docbook_id]; - $wl = search_parse_file($path . '/' . $f, $descr); - if ($descr && !isset($tocd[$id])) { - $tocd[$id] = trim($descr); - } - $qry = ''; - foreach ($wl as $w) { - if (strlen($w) > MIN_WORD_LEN) { - $qry .= "INSERT INTO full_search VALUES('{$w}', {$id});"; - } - } - if($qry) { - sqlite_query($idx, $qry); - } - } else { - echo "BAD ID: $docbook_id ($path, $f, $section)\n"; - } - break; - case 'dir' : - search_parse_dir($path . '/' . $f, $section); - break; - } - } - closedir($d); + while (($f = readdir($d))) { + if ($f == 'CVS' || $f == '.cvsignore') { + continue; + } + switch (filetype($path . '/' . $f)) { + case 'file': + switch ($section) { + case 'reference' : + if ($f == 'configure.xml' || $f == 'constants.xml' || $f == 'ini.xml' || $f == 'reference.xml') { + $docbook_id = 'ref.' . basename($path); + } else { + $docbook_id = 'function.' . substr($f, 0, -4); + } + break; + case 'faq': + case 'security' : + $docbook_id = $section . '.' . substr($f, 0, -4); + break; + case 'chapters' : + case 'appendices' : + $docbook_id = substr($f, 0, -4); + break; + } + + if (isset($toca[$docbook_id])) { + $id = $toca[$docbook_id]; + $wl = search_parse_file($path . '/' . $f, $descr); + if ($descr && !isset($tocd[$id])) { + $tocd[$id] = trim($descr); + } + $qry = ''; + foreach ($wl as $w) { + if (strlen($w) > MIN_WORD_LEN) { + $qry .= "INSERT INTO full_search VALUES('{$w}', {$id});"; + } + } + if($qry) { + sqlite_query($idx, $qry); + } + } else { + echo "BAD ID: $docbook_id ($path, $f, $section)\n"; + } + break; + + case 'dir' : + search_parse_dir($path . '/' . $f, $section); + break; + } + } + closedir($d); } http://cvs.php.net/diff.php/livedocs/mk_phpdoc.php?r1=1.5&r2=1.6&ty=u Index: livedocs/mk_phpdoc.php diff -u livedocs/mk_phpdoc.php:1.5 livedocs/mk_phpdoc.php:1.6 --- livedocs/mk_phpdoc.php:1.5 Tue Apr 27 10:43:28 2004 +++ livedocs/mk_phpdoc.php Wed Apr 28 12:23:02 2004 @@ -18,7 +18,7 @@ // | Configuration file for phpdoc build | // +----------------------------------------------------------------------+ // -// $Id: mk_phpdoc.php,v 1.5 2004/04/27 14:43:28 nlopess Exp $ +// $Id: mk_phpdoc.php,v 1.6 2004/04/28 16:23:02 nlopess Exp $ define('MK_VERSION', true); define('MANUAL_TITLE', 'PHP Manual'); @@ -29,62 +29,64 @@ $entities_dir = 'entities'; -function search_parse_dir($path, $section) -{ - global $idx, $toca, $tocd; - - $d = opendir($path); - readdir($d); readdir($d); - - while (($f = readdir($d))) { - if (($f == 'functions.xml' && $section != 'language') || $f == 'CVS' || $f == '.cvsignore') { - continue; - } - switch (filetype($path . '/' . $f)) { - case 'file': - switch ($section) { - case 'reference' : - if ($f == 'configure.xml' || $f == 'constants.xml' || $f == 'ini.xml' || $f == 'reference.xml') { - $docbook_id = 'ref.' . basename($path); - } else { - $docbook_id = 'function.' . substr($f, 0, -4); - } - break; - case 'language' : - case 'faq': - case 'security' : - $docbook_id = $section . '.' . substr($f, 0, -4); - break; - case 'chapters' : - case 'appendices' : - $docbook_id = substr($f, 0, -4); - break; - } - - if (isset($toca[$docbook_id])) { - $id = $toca[$docbook_id]; - $wl = search_parse_file($path . '/' . $f, $descr); - if ($descr && !isset($tocd[$id])) { - $tocd[$id] = trim($descr); - } - $qry = ''; - foreach ($wl as $w) { - if (strlen($w) > MIN_WORD_LEN) { - $qry .= "INSERT INTO full_search VALUES('{$w}', {$id});"; - } - } - if($qry) { - sqlite_query($idx, $qry); - } - } else { - echo "BAD ID: $docbook_id ($path, $f, $section)\n"; - } - break; - case 'dir' : - search_parse_dir($path . '/' . $f, $section); - break; - } - } +function search_parse_dir($path, $section) { + global $idx, $toca, $tocd; + + $d = opendir($path); + readdir($d); readdir($d); + + while (($f = readdir($d))) { + if (($f == 'functions.xml' && $section != 'language') || $f == 'CVS' || $f == '.cvsignore') { + continue; + } + switch (filetype($path . '/' . $f)) { + case 'file': + switch ($section) { + case 'reference' : + if ($f == 'configure.xml' || $f == 'constants.xml' || $f == 'ini.xml' || $f == 'reference.xml') { + $docbook_id = 'ref.' . basename($path); + } else { + $docbook_id = 'function.' . substr($f, 0, -4); + } + break; + case 'language' : + case 'faq': + case 'security' : + $docbook_id = $section . '.' . substr($f, 0, -4); + break; + case 'chapters' : + case 'appendices' : + $docbook_id = substr($f, 0, -4); + break; + } + + if (isset($toca[$docbook_id])) { + $id = $toca[$docbook_id]; + $wl = search_parse_file($path . '/' . $f, $descr); + if ($descr && !isset($tocd[$id])) { + $tocd[$id] = trim($descr); + } + $qry = ''; + foreach ($wl as $w) { + if (strlen($w) > MIN_WORD_LEN) { + $qry .= "INSERT INTO full_search VALUES('{$w}', {$id});"; + } + } + if($qry) { + sqlite_query($idx, $qry); + } + } else { + echo "BAD ID: $docbook_id ($path, $f, $section)\n"; + } + break; + + + case 'dir' : + search_parse_dir($path . '/' . $f, $section); + break; + } + } closedir($d); } +?> http://cvs.php.net/diff.php/livedocs/mk_smarty.php?r1=1.5&r2=1.6&ty=u Index: livedocs/mk_smarty.php diff -u livedocs/mk_smarty.php:1.5 livedocs/mk_smarty.php:1.6 --- livedocs/mk_smarty.php:1.5 Tue Apr 27 10:43:28 2004 +++ livedocs/mk_smarty.php Wed Apr 28 12:23:02 2004 @@ -18,7 +18,7 @@ // | Configuration file for peardoc build | // +----------------------------------------------------------------------+ // -// $Id: mk_smarty.php,v 1.5 2004/04/27 14:43:28 nlopess Exp $ +// $Id: mk_smarty.php,v 1.6 2004/04/28 16:23:02 nlopess Exp $ define('MK_VERSION', false); define('MANUAL_TITLE', 'Smarty Manual'); @@ -29,46 +29,47 @@ $entities_dir = 'entities'; -function search_parse_dir($path, $section) -{ - global $idx, $toca, $tocd; - - $d = opendir($path); - readdir($d); readdir($d); - - while (($f = readdir($d))) { - if ($f == 'CVS' || $f == '.cvsignore') { - continue; - } - switch (filetype($path . '/' . $f)) { - case 'file': - $docbook_id = str_replace('-', '.', substr($f, 0, -4)); - - if (isset($toca[$docbook_id])) { - $id = $toca[$docbook_id]; - $wl = search_parse_file($path . '/' . $f, $descr); - if ($descr && !isset($tocd[$id])) { - $tocd[$id] = trim($descr); - } - $qry = ''; - foreach ($wl as $w) { - if (strlen($w) > MIN_WORD_LEN) { - $qry .= "INSERT INTO full_search VALUES('{$w}', {$id});"; - } - } +function search_parse_dir($path, $section) { + global $idx, $toca, $tocd; - if($qry) { - sqlite_query($idx, $qry); - } + $d = opendir($path); + readdir($d); readdir($d); - } else { - echo "BAD ID: $docbook_id ($path, $f, $section)\n"; - } - break; - case 'dir' : - search_parse_dir($path . '/' . $f, $section); - break; - } - } - closedir($d); + while (($f = readdir($d))) { + if ($f == 'CVS' || $f == '.cvsignore') { + continue; + } + switch (filetype($path . '/' . $f)) { + case 'file': + $docbook_id = str_replace('-', '.', substr($f, 0, -4)); + + if (isset($toca[$docbook_id])) { + $id = $toca[$docbook_id]; + $wl = search_parse_file($path . '/' . $f, $descr); + if ($descr && !isset($tocd[$id])) { + $tocd[$id] = trim($descr); + } + $qry = ''; + foreach ($wl as $w) { + if (strlen($w) > MIN_WORD_LEN) { + $qry .= "INSERT INTO full_search VALUES('{$w}', {$id});"; + } + } + + if($qry) { + sqlite_query($idx, $qry); + } + + } else { + echo "BAD ID: $docbook_id ($path, $f, $section)\n"; + } + break; + + + case 'dir' : + search_parse_dir($path . '/' . $f, $section); + break; + } + } + closedir($d); }