oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing upgrade problems.

Browse source
This commit is contained in:
JT Smith 2002-11-04 05:40:09 +00:00
parent 0e8bbc823c
commit 1b9565f06c
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/upgrades/upgrade_4.6.9-4.7.0.sql
View file

@ -47,11 +47,12 @@ update incrementer set nextValue=nextValue+974 where incrementerId='pageId';
update page set pageId=pageId+974 where pageId>25; update page set pageId=pageId+974 where pageId>25;
update page set parentId=parentId+974 where parentId>25; update page set parentId=parentId+974 where parentId>25;
update page set styleId=styleId+974 where styleId>25; update page set styleId=styleId+974 where styleId>25;
update wobject set pageId=pageId+974 where pageId>25;
update incrementer set nextValue=nextValue+974 where incrementerId='styleId'; update incrementer set nextValue=nextValue+974 where incrementerId='styleId';
update style set styleId=styleId+974 where styleId>25; update style set styleId=styleId+974 where styleId>25;
update discussion set messageId=messageId+999; update discussion set messageId=messageId+50000;
update discussion set rid=rid+999; update discussion set rid=rid+50000;
update discussion set pid=pid+999 where pid<>0; update discussion set pid=pid+50000 where pid<>0;
update incrementer set nextValue=nextValue+999 where incrementerId='messageId'; update incrementer set nextValue=nextValue+999 where incrementerId='messageId';
update messageLog set messageLogId=messageLogId+999; update messageLog set messageLogId=messageLogId+999;
update incrementer set nextValue=nextValue+999 where incrementerId='messageLogId'; update incrementer set nextValue=nextValue+999 where incrementerId='messageLogId';

1
lib/WebGUI/Discussion.pm
View file

@ -464,7 +464,6 @@ sub showReplyTree {
'</td><td class="tableHeader">'.WebGUI::International::get(245).'</td></tr>'; '</td><td class="tableHeader">'.WebGUI::International::get(245).'</td></tr>';
@data = WebGUI::SQL->quickArray("select messageId,subject,username,dateOfPost,userId,status @data = WebGUI::SQL->quickArray("select messageId,subject,username,dateOfPost,userId,status
from discussion where messageId=$message{rid}"); from discussion where messageId=$message{rid}");
$data[1] = WebGUI::HTML::filter($data[1],'all');
$html .= '<tr'; $html .= '<tr';
if ($session{form}{mid} eq $message{rid}) { if ($session{form}{mid} eq $message{rid}) {
$html .= ' class="highlight"'; $html .= ' class="highlight"';

2
lib/WebGUI/Wobject.pm
View file

@ -1249,7 +1249,7 @@ sub www_showMessage {
($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=".$_[0]->get("wobjectId")); ($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=".$_[0]->get("wobjectId"));
$session{form}{mid} = $session{form}{mid} || $defaultMid || 0; $session{form}{mid} = $session{form}{mid} || $defaultMid || 0;
$output = WebGUI::Discussion::showMessage($_[1],$_[0]); $output = WebGUI::Discussion::showMessage($_[1],$_[0]);
$output .= WebGUI::Discussion::showThreads(); $output .= WebGUI::Discussion::showReplyTree();
return $output; return $output;
} }

4
sbin/upgrade.pl
View file

@ -100,9 +100,9 @@ foreach $config (keys %config) {
print "\n".$config{$config}{db}." ".$upgrade{$upgrade}{from}."-".$upgrade{$upgrade}{to}."\n"; print "\n".$config{$config}{db}." ".$upgrade{$upgrade}{from}."-".$upgrade{$upgrade}{to}."\n";
print "\tBacking up $config{$config}{db} ($upgrade{$upgrade}{from}).\n"; print "\tBacking up $config{$config}{db} ($upgrade{$upgrade}{from}).\n";
mkdir($backupDir."/db/".$config{$config}{db}); mkdir($backupDir."/db/".$config{$config}{db});
system($mysqldump." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass}." --add-drop-table ".$config{$config}{db}." > ".$backupDir."/db/".$config{$config}{db}."/".$upgrade{$upgrade}{from}.".sql"); system($mysqldump." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass}." --add-drop-table --databases ".$config{$config}{db}." > ".$backupDir."/db/".$config{$config}{db}."/".$upgrade{$upgrade}{from}.".sql");
print "\tUpgrading to $upgrade{$upgrade}{to}.\n"; print "\tUpgrading to $upgrade{$upgrade}{to}.\n";
system($mysql." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass}." --add-drop-table ".$config{$config}{db}." < ".$upgrade{$upgrade}{sql}); system($mysql." -u".$config{$config}{dbuser}." -p".$config{$config}{dbpass}." --database=".$config{$config}{db}." < ".$upgrade{$upgrade}{sql});
$config{$config}{version} = $upgrade{$upgrade}{to}; $config{$config}{version} = $upgrade{$upgrade}{to};
} }
} }