Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv17428
Modified Files:
Tag: release-1_2-branch
msql.php
Log Message:
Removed debug output; improved error messages. pages with backslashes
are not being saved to the archive due to a primary key violation.
Index: msql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/msql.php,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** msql.php 2001/11/16 02:42:27 1.6.2.6
--- msql.php 2001/11/16 02:53:21 1.6.2.7
***************
*** 210,214 ****
$retval = msql_query($query, $dbi['dbc']);
if ($retval == false) {
! printf(gettext ("Insert/update failed: %s"), msql_error());
print "<br>\n";
}
--- 210,214 ----
$retval = msql_query($query, $dbi['dbc']);
if ($retval == false) {
! printf(gettext ("Insert/update to table 'wiki' failed: %s"), msql_error());
print "<br>\n";
}
***************
*** 231,239 ****
for ($x = 0; $x < count($pagehash["content"]); $x++) {
$line = addslashes($pagehash["content"][$x]);
$esc_pagename = addslashes($pagename);
$query = "INSERT INTO $dbi[page_table] " .
"(pagename, lineno, line) " .
"VALUES('$esc_pagename', $x, '$line')";
! echo "Page line insert query: $query<br>\n";
$retval = msql_query($query, $dbi['dbc']);
if ($retval == false) {
--- 231,240 ----
for ($x = 0; $x < count($pagehash["content"]); $x++) {
$line = addslashes($pagehash["content"][$x]);
+ if ($line == '') continue; // why do we always have 127 lines?
$esc_pagename = addslashes($pagename);
$query = "INSERT INTO $dbi[page_table] " .
"(pagename, lineno, line) " .
"VALUES('$esc_pagename', $x, '$line')";
! //echo "Page line insert query: $query<br>\n";
$retval = msql_query($query, $dbi['dbc']);
if ($retval == false) {
***************
*** 287,291 ****
$retval = msql_query($query, $dbi['dbc']);
if ($retval == false) {
! printf(gettext ("Insert/update failed: %s"), msql_error());
print "<br>\n";
}
--- 288,292 ----
$retval = msql_query($query, $dbi['dbc']);
if ($retval == false) {
! printf(gettext ("Insert/update into table 'archive' failed: %s"), msql_error());
print "<br>\n";
}
|
