[PHP-DOC] cvs: livedocs / build.sh mk_notes.php

[Ilia Alshanetsky]

iliaa           Wed Feb  9 14:37:02 2005 EDT

  Modified files:              
    /livedocs   mk_notes.php build.sh 
  Log:
  Fixed building on notes based on a bz2 file.
  
  
http://cvs.php.net/diff.php/livedocs/mk_notes.php?r1=1.5&r2=1.6&ty=u
Index: livedocs/mk_notes.php
diff -u livedocs/mk_notes.php:1.5 livedocs/mk_notes.php:1.6
--- livedocs/mk_notes.php:1.5   Thu Nov 11 14:33:27 2004
+++ livedocs/mk_notes.php       Wed Feb  9 14:37:02 2005
@@ -19,7 +19,7 @@
 // | livedocs.                                                            |
 // +----------------------------------------------------------------------+
 //
-// $Id: mk_notes.php,v 1.5 2004/11/11 19:33:27 wez Exp $
+// $Id: mk_notes.php,v 1.6 2005/02/09 19:37:02 iliaa Exp $
 
 $create = <<<SQL
 BEGIN;
@@ -35,7 +35,7 @@
 SQL;
 $dbname = $argv[1] . '/livedoc-notes.sqlite';
 $tmpdir = $argv[2];
-$mirror = $argv[3];
+$mirror = !empty($argv[3]) ? $argv[3] : 'www';
 
 if (file_exists($dbname)) {
        if (filemtime($dbname) < time() + (60 * 60)) {
@@ -79,8 +79,7 @@
 
        } while (true);
 
-} else {
-
+} else if (extension_loaded('bz2')) {
        $name = tempnam($tmpdir, 'notes');
        copy('http://'.$mirror.'.php.net/backend/notes/all.bz2', $name);
        $fp = fopen("compress.bzip2://".$name, 'r');
@@ -101,6 +100,10 @@
                }
        }
 
+       if ($buffer) {
+               sqlite_query($DB, $buffer);
+       }
+
        $n_data = ftell($fp);
 }
        
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.26&r2=1.27&ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.26 livedocs/build.sh:1.27
--- livedocs/build.sh:1.26      Thu Nov 11 14:33:27 2004
+++ livedocs/build.sh   Wed Feb  9 14:37:02 2005
@@ -6,12 +6,12 @@
 
 echo "####################"
 
-if test -n "$NOTES_MIRROR$NOTES_TOKEN" ; then
+#if test -n "$NOTES_MIRROR$NOTES_TOKEN" ; then
        echo "Building user notes"
        TOKEN=$NOTES_TOKEN
        export TOKEN
        ${PHP} ${LIVEDOCSFORPHP}/mk_notes.php ${OUTPUTDIR} ${GENDIR} 
${NOTES_MIRROR}
-fi
+#fi
 
 # running ./buildconf
 cd ${PHPDOC}