From fe17974eb2460cd1351b155e19f94c7ca959acd5 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 7 Jan 2003 00:38:10 +0000 Subject: [PATCH] A few database changes for Sybase compatibility. --- docs/upgrades/upgrade_5.0.1-5.0.2.sql | 4 ++++ lib/WebGUI.pm | 2 +- lib/WebGUI/Wobject/EventsCalendar.pm | 14 +++++++------- lib/WebGUI/Wobject/Survey.pm | 8 ++++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/docs/upgrades/upgrade_5.0.1-5.0.2.sql b/docs/upgrades/upgrade_5.0.1-5.0.2.sql index dd3a5543e..b58ac2e4f 100644 --- a/docs/upgrades/upgrade_5.0.1-5.0.2.sql +++ b/docs/upgrades/upgrade_5.0.1-5.0.2.sql @@ -990,5 +990,9 @@ insert into international (internationalId,languageId,namespace,message,lastUpda INSERT INTO international VALUES (73,'MailForm',1,'Send',1039776778); INSERT INTO international VALUES (73,'MailForm',3,'Verstuur',1039776778); INSERT INTO international VALUES (73,'MailForm',2,'Versend',1039776778); +alter table Survey_answer change goto gotoQuestion int; +alter table pageStatistics change function wobjectFunction varchar(60); +alter table EventsCalendar_event change EventsCalendar_recurringEventId EventsCalendar_recurringId int not null default 0; +update incrementer set incrementerId='EventsCalendar_recurringId' where incrementerId='EventsCalendar_recurringEventId'; diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index 6a216618d..cd7daaea3 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -244,7 +244,7 @@ sub page { } if ($operationOutput eq "" && $session{setting}{trackPageStatistics} && $session{form}{wid} ne "new") { WebGUI::SQL->write("insert into pageStatistics (dateStamp, userId, username, ipAddress, userAgent, referer, - pageId, pageTitle, wobjectId, function) values (".time().",".$session{user}{userId} + pageId, pageTitle, wobjectId, wobjectFunction) values (".time().",".$session{user}{userId} .",".quote($session{user}{username}).", ".quote($session{env}{REMOTE_ADDR}).", ".quote($session{env}{HTTP_USER_AGENT}).", ".quote($session{env}{HTTP_REFERER}).", ".$session{page}{pageId}.", diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm index 405bbbb24..4cc0c72ad 100644 --- a/lib/WebGUI/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Wobject/EventsCalendar.pm @@ -61,7 +61,7 @@ sub _drawBigCalendar { $message = ""; if ($canEdit) { $message = deleteIcon('func=deleteEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event{EventsCalendar_eventId} - .'&rid='.$event{EventsCalendar_recurringEventId}) + .'&rid='.$event{EventsCalendar_recurringId}) .editIcon('func=editEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event{EventsCalendar_eventId}) .' '; } @@ -151,11 +151,11 @@ sub duplicate { paginateAfter=>$_[0]->get("paginateAfter") }); $sth = WebGUI::SQL->read("select * from EventsCalendar_event where wobjectId=" - .$_[0]->get("wobjectId")." order by EventsCalendar_recurringEventId"); + .$_[0]->get("wobjectId")." order by EventsCalendar_recurringId"); while (@row = $sth->array) { $newEventId = getNextId("EventsCalendar_eventId"); if ($row[6] > 0 && $row[6] != $previousRecurringEventId) { - $row[6] = getNextId("EventsCalendar_recurringEventId"); + $row[6] = getNextId("EventsCalendar_recurringId"); $previousRecurringEventId = $row[6]; } WebGUI::SQL->write("insert into EventsCalendar_event values ($newEventId, ".$w->get("wobjectId").", ". @@ -196,7 +196,7 @@ sub www_deleteEvent { sub www_deleteEventConfirm { return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); if ($session{form}{rid} > 0) { - $_[0]->deleteCollateral("EventsCalendar_event","EventsCalendar_recurringEventId",$session{form}{rid}); + $_[0]->deleteCollateral("EventsCalendar_event","EventsCalendar_recurringId",$session{form}{rid}); } else { $_[0]->deleteCollateral("EventsCalendar_event","EventsCalendar_eventId",$session{form}{eid}); } @@ -371,7 +371,7 @@ sub www_editEventSave { if ($session{form}{recursEvery} eq "never") { $recurringEventId = 0; } else { - $recurringEventId = getNextId("EventsCalendar_recurringEventId"); + $recurringEventId = getNextId("EventsCalendar_recurringId"); while ($startDate[$i] < $until) { $i++; $eventId[$i] = getNextId("EventsCalendar_eventId"); @@ -499,7 +499,7 @@ sub www_view { "list.url"=>WebGUI::URL::page('func=viewEvent&wid='.$_[0]->get("wobjectId").'&eid=' .$event->{EventsCalendar_eventId}), "list.controls"=>deleteIcon('func=deleteEvent&wid='.$_[0]->get("wobjectId").'&eid=' - .$event->{EventsCalendar_eventId}.'&rid='.$event->{EventsCalendar_recurringEventId}) + .$event->{EventsCalendar_eventId}.'&rid='.$event->{EventsCalendar_recurringId}) .editIcon('func=editEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event->{EventsCalendar_eventId}) }); } @@ -527,7 +527,7 @@ sub www_viewEvent { $var{"edit.url"} = WebGUI::URL::page('func=editEvent&eid='.$session{form}{eid}.'&wid='.$session{form}{wid}); $var{"edit.label"} = WebGUI::International::get(575); $var{"delete.url"} = WebGUI::URL::page('func=deleteEvent&eid='.$session{form}{eid}.'&wid=' - .$session{form}{wid}.'&rid='.$event{EventsCalendar_recurringEventId}); + .$session{form}{wid}.'&rid='.$event{EventsCalendar_recurringId}); $var{"delete.label"} = WebGUI::International::get(576); ($id) = WebGUI::SQL->quickArray("select EventsCalendar_eventId from EventsCalendar_event where EventsCalendar_eventId<>$event{EventsCalendar_eventId} and diff --git a/lib/WebGUI/Wobject/Survey.pm b/lib/WebGUI/Wobject/Survey.pm index 60e75855e..9cdcdd6b1 100644 --- a/lib/WebGUI/Wobject/Survey.pm +++ b/lib/WebGUI/Wobject/Survey.pm @@ -308,9 +308,9 @@ sub www_editAnswer { $question = WebGUI::SQL->buildHashRef("select Survey_questionId,question from Survey_question where Survey_id=".$_[0]->get("Survey_id")." order by sequenceNumber"); $f->select( - -name=>"goto", + -name=>"gotoQuestion", -options=>$question, - -value=>[$answer->{goto}], + -value=>[$answer->{gotoQuestion}], -label=>WebGUI::International::get(21,$namespace) ); } @@ -342,7 +342,7 @@ sub www_editAnswerSave { answer => $session{form}{answer}, isCorrect => $session{form}{isCorrect}, Survey_id=>$_[0]->get("Survey_id"), - goto => $session{form}{goto} + gotoQuestion => $session{form}{gotoQuestion} },1,0,"Survey_Id"); if ($session{form}{proceed} eq "addQuestion") { $session{form}{qid} = "new"; @@ -586,7 +586,7 @@ sub www_view { } } if ($questionOrder eq "response" && $previousResponse->{Survey_answerId}) { - my ($responseDriver) = WebGUI::SQL->quickArray("select goto from Survey_answer where + my ($responseDriver) = WebGUI::SQL->quickArray("select gotoQuestion from Survey_answer where Survey_answerId=".$previousResponse->{Survey_answerId}); if ($responseDriver) { $question = $_[0]->getCollateral("Survey_question","Survey_questionId",$responseDriver);