nlopess Tue Apr 27 10:43:28 2004 EDT
Modified files:
/livedocs mk_peardoc.php mk_phpdoc.php mk_smarty.php mkindex.php
Log:
latest sqlite/php5 snapshot echoes a warning with empty queries.
this patch fixes them
http://cvs.php.net/diff.php/livedocs/mk_peardoc.php?r1=1.4&r2=1.5&ty=u
Index: livedocs/mk_peardoc.php
diff -u livedocs/mk_peardoc.php:1.4 livedocs/mk_peardoc.php:1.5
--- livedocs/mk_peardoc.php:1.4 Tue Apr 20 16:13:13 2004
+++ livedocs/mk_peardoc.php Tue Apr 27 10:43:28 2004
@@ -18,7 +18,7 @@
// | Configuration file for peardoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_peardoc.php,v 1.4 2004/04/20 20:13:13 didou Exp $
+// $Id: mk_peardoc.php,v 1.5 2004/04/27 14:43:28 nlopess Exp $
define('MK_VERSION', false);
define('MANUAL_TITLE', 'PEAR Manual');
@@ -72,7 +72,9 @@
$qry .= "INSERT INTO full_search VALUES('{$w}', {$id});";
}
}
- sqlite_query($idx, $qry);
+ if($qry) {
+ sqlite_query($idx, $qry);
+ }
} else {
echo "BAD ID: $docbook_id ($path, $f, $section)\n";
}
http://cvs.php.net/diff.php/livedocs/mk_phpdoc.php?r1=1.4&r2=1.5&ty=u
Index: livedocs/mk_phpdoc.php
diff -u livedocs/mk_phpdoc.php:1.4 livedocs/mk_phpdoc.php:1.5
--- livedocs/mk_phpdoc.php:1.4 Tue Apr 20 16:13:13 2004
+++ livedocs/mk_phpdoc.php Tue Apr 27 10:43:28 2004
@@ -18,7 +18,7 @@
// | Configuration file for phpdoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_phpdoc.php,v 1.4 2004/04/20 20:13:13 didou Exp $
+// $Id: mk_phpdoc.php,v 1.5 2004/04/27 14:43:28 nlopess Exp $
define('MK_VERSION', true);
define('MANUAL_TITLE', 'PHP Manual');
@@ -73,7 +73,9 @@
$qry .= "INSERT INTO full_search VALUES('{$w}', {$id});";
}
}
- sqlite_query($idx, $qry);
+ if($qry) {
+ sqlite_query($idx, $qry);
+ }
} else {
echo "BAD ID: $docbook_id ($path, $f, $section)\n";
}
http://cvs.php.net/diff.php/livedocs/mk_smarty.php?r1=1.4&r2=1.5&ty=u
Index: livedocs/mk_smarty.php
diff -u livedocs/mk_smarty.php:1.4 livedocs/mk_smarty.php:1.5
--- livedocs/mk_smarty.php:1.4 Tue Apr 20 16:13:13 2004
+++ livedocs/mk_smarty.php Tue Apr 27 10:43:28 2004
@@ -18,7 +18,7 @@
// | Configuration file for peardoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_smarty.php,v 1.4 2004/04/20 20:13:13 didou Exp $
+// $Id: mk_smarty.php,v 1.5 2004/04/27 14:43:28 nlopess Exp $
define('MK_VERSION', false);
define('MANUAL_TITLE', 'Smarty Manual');
@@ -44,19 +44,23 @@
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});";
- }
- }
- sqlite_query($idx, $qry);
+ 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";
}
http://cvs.php.net/diff.php/livedocs/mkindex.php?r1=1.31&r2=1.32&ty=u
Index: livedocs/mkindex.php
diff -u livedocs/mkindex.php:1.31 livedocs/mkindex.php:1.32
--- livedocs/mkindex.php:1.31 Tue Apr 20 16:14:07 2004
+++ livedocs/mkindex.php Tue Apr 27 10:43:28 2004
@@ -19,7 +19,7 @@
// | construct an index |
// +----------------------------------------------------------------------+
//
-// $Id: mkindex.php,v 1.31 2004/04/20 20:14:07 didou Exp $
+// $Id: mkindex.php,v 1.32 2004/04/27 14:43:28 nlopess Exp $
/* just to be on the safe side */
@@ -475,7 +475,11 @@
foreach ($tocd as $k => $v) {
$qry .= "UPDATE toc SET descr='".sqlite_escape_string($v)."' WHERE id={$k};";
}
-sqlite_query($idx, $qry);
+
+if($qry) {
+ sqlite_query($idx, $qry);
+}
+
sqlite_query($idx, 'COMMIT');
/* stop list, list of words we do not want indexed */
@@ -504,7 +508,11 @@
$del = $row[2] - 1;
$qry .= "DELETE FROM full_search WHERE
skey='".sqlite_escape_string($row[0])."' AND toc_id=".$row[1].";";
}
-sqlite_query($idx, $qry);
+
+if($qry) {
+ sqlite_query($idx, $qry);
+}
+
sqlite_query($idx, 'COMMIT');
sqlite_query($idx, 'VACUUM full_search');
