From:             edwardzyang at thewritingpot dot com
Operating system: 
PHP version:      Irrelevant
PHP Bug Type:     Livedocs problem
Bug description:  Livedocs uses old paths for XSL files

Description:
------------
Livedocs uses old paths for XSL files: they've been moved to different
locations, so the build process fails. The fixes are simple, patches are
included:

Index: mkindex.php
===================================================================
RCS file: /repository/livedocs/mkindex.php,v
retrieving revision 1.47
diff -u -r1.47 mkindex.php
--- mkindex.php 18 Sep 2005 14:04:27 -0000      1.47
+++ mkindex.php 2 Apr 2007 19:33:18 -0000
@@ -169,7 +169,7 @@
 function build_func_list() {
        global $idx;
 
-       $list = file_get_contents($GLOBALS['DOCS'] . DIRECTORY_SEPARATOR .
"xsl/version.xml");
+       $list = file_get_contents($GLOBALS['DOCS'] . DIRECTORY_SEPARATOR .
"phpbook/phpbook-xsl/version.xml");
        $x = preg_match_all('@<function name=([\'"])([a-zA-Z0-9_]+)\\1
from=([\'"])(.+)[EMAIL PROTECTED]', $list, $matches);
        $data = '';
        for ($i = 0; $i < $x; $i++) {

Index: build.sh
===================================================================
RCS file: /repository/livedocs/build.sh,v
retrieving revision 1.31
diff -u -r1.31 build.sh
--- build.sh    14 Aug 2006 16:37:19 -0000      1.31
+++ build.sh    2 Apr 2007 19:27:12 -0000
@@ -10,7 +10,7 @@
        echo "Building user notes"
        TOKEN=$NOTES_TOKEN
        export TOKEN
-       ${PHP} ${LIVEDOCS}/mk_notes.php ${OUTPUTDIR} ${GENDIR} ${NOTES_MIRROR}
+       ${PHP} ${LIVEDOCS}/mk_notes.php "${OUTPUTDIR}" ${GENDIR}
${NOTES_MIRROR}
 #fi
 
 # running ./buildconf
@@ -56,15 +56,15 @@
        echo -n "Making index for $i: "
        date
        ${PHP} ${LIVEDOCS}/mkindex.php ${PHPDOC} $i ${GENDIR} ${BUILDTYPE}
-       mv ${GENDIR}/livedoc-idx.$i.sqlite ${OUTPUTDIR}
+       mv ${GENDIR}/livedoc-idx.$i.sqlite "${OUTPUTDIR}"
        # create output dir
-       mkdir -p ${OUTPUTDIR}/$i
-       chmod 0777 ${OUTPUTDIR}/$i
+       mkdir -p "${OUTPUTDIR}/$i"
+       chmod 0777 "${OUTPUTDIR}/$i"
        # remove cached manual pages
-       rm -f ${OUTPUTDIR}/$i/*.html
+       rm -f "${OUTPUTDIR}/$i/*.html"
        # make search cache database
-       mv ${GENDIR}/livedoc-cache-idx.$i.sqlite ${OUTPUTDIR}/$i/
-       chmod 0666 ${OUTPUTDIR}/$i/livedoc-cache-idx.$i.sqlite
+       mv ${GENDIR}/livedoc-cache-idx.$i.sqlite "${OUTPUTDIR}/$i/"
+       chmod 0666 "${OUTPUTDIR}/$i/livedoc-cache-idx.$i.sqlite"
        cd $curpath

Second patch also includes some quotes that prevent the build script from
choking when ${OUTPUTDIR} has spaces in it, feel free to remove since
that's really a different bug.


-- 
Edit bug report at http://bugs.php.net/?id=40982&edit=1
-- 
Try a CVS snapshot (PHP 4.4): 
http://bugs.php.net/fix.php?id=40982&r=trysnapshot44
Try a CVS snapshot (PHP 5.2): 
http://bugs.php.net/fix.php?id=40982&r=trysnapshot52
Try a CVS snapshot (PHP 6.0): 
http://bugs.php.net/fix.php?id=40982&r=trysnapshot60
Fixed in CVS:                 http://bugs.php.net/fix.php?id=40982&r=fixedcvs
Fixed in release:             
http://bugs.php.net/fix.php?id=40982&r=alreadyfixed
Need backtrace:               http://bugs.php.net/fix.php?id=40982&r=needtrace
Need Reproduce Script:        http://bugs.php.net/fix.php?id=40982&r=needscript
Try newer version:            http://bugs.php.net/fix.php?id=40982&r=oldversion
Not developer issue:          http://bugs.php.net/fix.php?id=40982&r=support
Expected behavior:            http://bugs.php.net/fix.php?id=40982&r=notwrong
Not enough info:              
http://bugs.php.net/fix.php?id=40982&r=notenoughinfo
Submitted twice:              
http://bugs.php.net/fix.php?id=40982&r=submittedtwice
register_globals:             http://bugs.php.net/fix.php?id=40982&r=globals
PHP 3 support discontinued:   http://bugs.php.net/fix.php?id=40982&r=php3
Daylight Savings:             http://bugs.php.net/fix.php?id=40982&r=dst
IIS Stability:                http://bugs.php.net/fix.php?id=40982&r=isapi
Install GNU Sed:              http://bugs.php.net/fix.php?id=40982&r=gnused
Floating point limitations:   http://bugs.php.net/fix.php?id=40982&r=float
No Zend Extensions:           http://bugs.php.net/fix.php?id=40982&r=nozend
MySQL Configuration Error:    http://bugs.php.net/fix.php?id=40982&r=mysqlcfg

Reply via email to