SVN Commit by dpage: r4173 - in trunk/pgadmin3/src: agent agent/include ui

Author: dpage
Date: 2005-05-09 17:13:06 +0100 (Mon, 09 May 2005)
New Revision: 4173

Modified:
trunk/pgadmin3/src/agent/dlgJob.cpp
trunk/pgadmin3/src/agent/dlgSchedule.cpp
trunk/pgadmin3/src/agent/dlgStep.cpp
trunk/pgadmin3/src/agent/include/dlgJob.h
trunk/pgadmin3/src/agent/include/dlgSchedule.h
trunk/pgadmin3/src/agent/include/pgaSchedule.h
trunk/pgadmin3/src/agent/pgaSchedule.cpp
trunk/pgadmin3/src/ui/dlgSchedule.xrc
trunk/pgadmin3/src/ui/xrcDialogs.cpp
Log:
Back to pgAgent - 1st half of schedule exception management code (commit now in case I drop my laptop :-p )

Modified: trunk/pgadmin3/src/agent/dlgJob.cpp
===================================================================
--- trunk/pgadmin3/src/agent/dlgJob.cpp 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/agent/dlgJob.cpp 2005-05-09 16:13:06 UTC (rev 4173)
@@ -212,7 +212,7 @@

void dlgJob::CheckChange()
{
- bool enable=true, foundone = false;
+ bool enable=true;
wxString name=GetName();
if (job)
{
@@ -226,23 +226,11 @@
}
}

- long pos;
- for (pos=0 ; pos < lstSteps->GetItemCount() ; pos++)
- {
- if(lstSteps->GetItemData(pos))
- foundone = true;
- }
+ if (statusBar)
+ statusBar->SetStatusText(wxEmptyString);

- for (pos=0 ; pos < lstSchedules->GetItemCount() ; pos++)
- {
- if(lstSchedules->GetItemData(pos))
- foundone = true;
- }
- if (foundone)
- enable = true;
+ CheckValid(enable, !txtName->GetValue().IsEmpty(), _("Please specify name."));

- CheckValid(enable, !name.IsEmpty(), _("Please specify name."));
-
EnableOK(enable);
}

Modified: trunk/pgadmin3/src/agent/dlgSchedule.cpp
===================================================================
--- trunk/pgadmin3/src/agent/dlgSchedule.cpp 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/agent/dlgSchedule.cpp 2005-05-09 16:13:06 UTC (rev 4173)
@@ -30,29 +30,34 @@
#define timStart CTRL_TIME("timStart")
#define calEnd CTRL_CALENDAR("calEnd")
#define timEnd CTRL_TIME("timEnd")
-#define chkWeekdays CTRL_CHECKLISTBOX("chkWeekDays")
-#define chkMonthdays CTRL_CHECKLISTBOX("chkMonthDays")
+#define chkWeekdays CTRL_CHECKLISTBOX("chkWeekdays")
+#define chkMonthdays CTRL_CHECKLISTBOX("chkMonthdays")
#define chkMonths CTRL_CHECKLISTBOX("chkMonths")
#define chkHours CTRL_CHECKLISTBOX("chkHours")
#define chkMinutes CTRL_CHECKLISTBOX("chkMinutes")
-#define lstExceptions CTRL_LISTCTRL("lstExceptions")
-#define timExceptionTime CTRL_TIME("timExceptionTime")
-#define calExceptionTime CTRL_CALENDAR("calExceptionTime")
+#define lstExceptions CTRL_LISTVIEW("lstExceptions")
+#define timException CTRL_TIME("timException")
+#define calException CTRL_CALENDAR("calException")
#define btnAddException CTRL_BUTTON("btnAddException")
#define btnChangeException CTRL_BUTTON("btnChangeException")
#define btnRemoveException CTRL_BUTTON("btnRemoveException")


BEGIN_EVENT_TABLE(dlgSchedule, dlgAgentProperty)
- EVT_CHECKBOX(XRCID("chkEnabled"), dlgProperty::OnChange)
- EVT_CALENDAR_SEL_CHANGED(XRCID("calStart"), dlgSchedule::OnChangeCal)
- EVT_SPIN(XRCID("timStart"), dlgSchedule::OnChangeSpin)
- EVT_CALENDAR_SEL_CHANGED(XRCID("calEnd"), dlgSchedule::OnChangeCal)
- EVT_SPIN(XRCID("timEnd"), dlgSchedule::OnChangeSpin)
+ EVT_CHECKBOX(XRCID("chkEnabled"), dlgSchedule::OnChange)
+ EVT_CALENDAR_SEL_CHANGED(XRCID("calStart"), dlgSchedule::OnChange)
+ EVT_TEXT(XRCID("timStart"), dlgSchedule::OnChange)
+ EVT_CALENDAR_SEL_CHANGED(XRCID("calEnd"), dlgSchedule::OnChange)
+ EVT_TEXT(XRCID("timEnd"), dlgSchedule::OnChange)
EVT_LIST_ITEM_SELECTED(XRCID("lstExceptions"), dlgSchedule::OnSelChangeException)
EVT_BUTTON(XRCID("btnAddException"), dlgSchedule::OnAddException)
EVT_BUTTON(XRCID("btnChangeException"), dlgSchedule::OnChangeException)
EVT_BUTTON(XRCID("btnRemoveException"), dlgSchedule::OnRemoveException)
+ EVT_CHECKLISTBOX(XRCID("chkWeekdays"), dlgSchedule::OnChange)
+ EVT_CHECKLISTBOX(XRCID("chkMonthdays"), dlgSchedule::OnChange)
+ EVT_CHECKLISTBOX(XRCID("chkMonths"), dlgSchedule::OnChange)
+ EVT_CHECKLISTBOX(XRCID("chkHours"), dlgSchedule::OnChange)
+ EVT_CHECKLISTBOX(XRCID("chkMinutes"), dlgSchedule::OnChange)
END_EVENT_TABLE();


@@ -68,6 +73,10 @@
else
jobId=0;

+ lstExceptions->CreateColumns(0, _("Date"), _("Time"), 90);
+ lstExceptions->AddColumn(wxT("dirty"), 0);
+ lstExceptions->AddColumn(wxT("id"), 0);
+
txtID->Disable();

btnChangeException->Disable();
@@ -118,6 +127,49 @@
for (x=0; x<schedule->GetMinutes().Length(); x++ )
if (schedule->GetMinutes()[x] == 't') chkMinutes->Check(x, true);

+ wxString id, dateToken, timeToken;
+ wxDateTime val;
+ long pos;
+ wxStringTokenizer tkz(schedule->GetExceptions(), wxT("|"));
+
+ while (tkz.HasMoreTokens() )
+ {
+ dateToken.Empty();
+ timeToken.Empty();
+
+ // First is the ID
+ id = tkz.GetNextToken();
+
+ // Look for a date
+ if (tkz.HasMoreTokens())
+ dateToken = tkz.GetNextToken();
+
+ // Look for a time
+ if (tkz.HasMoreTokens())
+ timeToken = tkz.GetNextToken();
+
+ if (!dateToken.IsEmpty() && !timeToken.IsEmpty())
+ {
+ val.ParseDate(dateToken);
+ val.ParseTime(timeToken);
+ pos = lstExceptions->AppendItem(0, val.FormatDate(), val.FormatTime());
+ }
+ else if (!dateToken.IsEmpty() && timeToken.IsEmpty())
+ {
+ val.ParseDate(dateToken);
+ pos = lstExceptions->AppendItem(0, val.FormatDate(), _("<any>"));
+ }
+ else if (dateToken.IsEmpty() && !timeToken.IsEmpty())
+ {
+ val.ParseTime(timeToken);
+ pos = lstExceptions->AppendItem(0, _("<any>"), val.FormatTime());
+ }
+
+ lstExceptions->SetItem(pos, 2, BoolToStr(false));
+ lstExceptions->SetItem(pos, 3, NumToStr(pos));
+
+ }
+
wxNotifyEvent ev;
}
else
@@ -136,37 +188,33 @@
}


-void dlgSchedule::OnChangeCal(wxCalendarEvent &ev)
+void dlgSchedule::OnChange(wxCalendarEvent &ev)
{
CheckChange();
}

-
-void dlgSchedule::OnChangeSpin(wxSpinEvent &ev)
+void dlgSchedule::OnChange(wxCommandEvent &ev)
{
CheckChange();
}

-
void dlgSchedule::CheckChange()
{
timEnd->Enable(calEnd->GetValue().IsValid());

wxString name=GetName();
- bool enable;
- if (schedule)
- {
- enable = name != schedule->GetName()
- || chkEnabled->GetValue() != schedule->GetEnabled()
- || txtComment->GetValue() != schedule->GetComment();
- }
- else
- {
- enable=true;
- }
+ bool enable = true;
+
+ if (statusBar)
+ statusBar->SetStatusText(wxEmptyString);
+
CheckValid(enable, !name.IsEmpty(), _("Please specify name."));
CheckValid(enable, calStart->GetValue().IsValid(), _("Please specify start date."));
- EnableOK(enable);
+
+ if (enable)
+ EnableOK(!GetSql().IsEmpty());
+ else
+ EnableOK(false);
}


@@ -179,6 +227,51 @@

void dlgSchedule::OnAddException(wxCommandEvent &ev)
{
+ if (!calException->GetValue().IsValid() && timException->GetValue().IsNull())
+ {
+ wxMessageBox(_("You must enter a valid date and/or time!"), _("Add exception"), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+
+ wxString exDate, exTime;
+
+ if (calException->GetValue().IsValid())
+ exDate = calException->GetValue().FormatDate();
+ else
+ exDate = _("<any>");
+
+ if (!timException->GetValue().IsNull())
+ exTime = timException->GetValue().Format();
+ else
+ exTime = _("<any>");
+
+ for (int pos=0; pos < lstExceptions->GetItemCount(); pos++)
+ {
+
+ if (lstExceptions->GetText(pos, 0) == exDate &&
+ lstExceptions->GetText(pos, 1) == exTime)
+ {
+ wxMessageBox(_("The specified exception already exists!"), _("Add exception"), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+
+ if (lstExceptions->GetText(pos, 0) == exDate &&
+ lstExceptions->GetText(pos, 1) == _("<any>"))
+ {
+ wxMessageBox(_("An exception already exists for any time on this date!"), _("Add exception"), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+
+ if (lstExceptions->GetText(pos, 1) == exTime &&
+ lstExceptions->GetText(pos, 0) == _("<any>"))
+ {
+ wxMessageBox(_("An exception already exists for this time on any date!"), _("Add exception"), wxICON_EXCLAMATION | wxOK, this);
+ return;
+ }
+ }
+
+ lstExceptions->AppendItem(0, exDate, exTime);
+ CheckChange();
}


@@ -189,8 +282,16 @@

void dlgSchedule::OnRemoveException(wxCommandEvent &ev)
{
+ if (lstExceptions->GetText(lstExceptions->GetFocusedItem(), 3) != wxEmptyString)
+ {
+ deleteExceptions.Add(lstExceptions->GetText(lstExceptions->GetFocusedItem(), 3));
+ }
+ lstExceptions->DeleteCurrentItem();
+
btnChangeException->Disable();
btnRemoveException->Disable();
+
+ CheckChange();
}

Modified: trunk/pgadmin3/src/agent/dlgStep.cpp
===================================================================
--- trunk/pgadmin3/src/agent/dlgStep.cpp 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/agent/dlgStep.cpp 2005-05-09 16:13:06 UTC (rev 4173)
@@ -140,6 +140,10 @@
{
enable=true;
}
+
+ if (statusBar)
+ statusBar->SetStatusText(wxEmptyString);
+
CheckValid(enable, !name.IsEmpty(), _("Please specify name."));
CheckValid(enable, sqlBox->GetLength() > 0, _("Please specify code to execute."));
EnableOK(enable);

Modified: trunk/pgadmin3/src/agent/include/dlgJob.h
===================================================================
--- trunk/pgadmin3/src/agent/include/dlgJob.h 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/agent/include/dlgJob.h 2005-05-09 16:13:06 UTC (rev 4173)
@@ -45,7 +45,6 @@
void OnAddSchedule(wxCommandEvent &ev);
void OnRemoveSchedule(wxCommandEvent &ev);

-
DECLARE_EVENT_TABLE();
};

Modified: trunk/pgadmin3/src/agent/include/dlgSchedule.h
===================================================================
--- trunk/pgadmin3/src/agent/include/dlgSchedule.h 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/agent/include/dlgSchedule.h 2005-05-09 16:13:06 UTC (rev 4173)
@@ -40,8 +40,10 @@
pgaSchedule *schedule;
pgaJob *job;

- void OnChangeCal(wxCalendarEvent &ev);
- void OnChangeSpin(wxSpinEvent &ev);
+ wxArrayString deleteExceptions;
+
+ void OnChange(wxCommandEvent &ev);
+ void OnChange(wxCalendarEvent &ev);
void OnSelChangeException(wxListEvent &ev);
void OnAddException(wxCommandEvent &ev);
void OnChangeException(wxCommandEvent &ev);

Modified: trunk/pgadmin3/src/agent/include/pgaSchedule.h
===================================================================
--- trunk/pgadmin3/src/agent/include/pgaSchedule.h 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/agent/include/pgaSchedule.h 2005-05-09 16:13:06 UTC (rev 4173)
@@ -65,11 +65,15 @@
wxString GetMonthsString();
void iSetMonths(const wxString &s) { months = s; }

+ wxString GetExceptions() const { return exceptions; }
+ wxString GetExceptionsString();
+ void iSetExceptions(const wxString &s) { exceptions = s; }
+
private:
bool enabled;
wxDateTime start, end;
long recId;
- wxString minutes, hours, weekdays, monthdays, months;
+ wxString minutes, hours, weekdays, monthdays, months, exceptions;
};

#endif

Modified: trunk/pgadmin3/src/agent/pgaSchedule.cpp
===================================================================
--- trunk/pgadmin3/src/agent/pgaSchedule.cpp 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/agent/pgaSchedule.cpp 2005-05-09 16:13:06 UTC (rev 4173)
@@ -65,6 +65,7 @@
properties->AppendItem(_("Weekdays"), GetWeekdaysString());
properties->AppendItem(_("Monthdays"), GetMonthdaysString());
properties->AppendItem(_("Months"), GetMonthsString());
+ properties->AppendItem(_("Exceptions"), GetExceptionsString());

properties->AppendItem(_("Comment"), GetComment());
}
@@ -141,7 +142,28 @@

schedule->iSetComment(schedules->GetVal(wxT("jscdesc")));

+ pgSet *exceptions = collection->GetDatabase()->ExecuteSet(
+ wxT("SELECT * FROM pgagent.pga_exception\n")
+ wxT(" WHERE jexscid=") + NumToStr(schedule->GetRecId()) + wxT("\n"));
+
+ tmp.Empty();
+ if (exceptions)
+ {
+ while (!exceptions->Eof())
+ {
+ tmp += exceptions->GetVal(wxT("jexid"));
+ tmp += wxT("|");
+ tmp += exceptions->GetVal(wxT("jexdate"));
+ tmp += wxT("|");
+ tmp += exceptions->GetVal(wxT("jextime"));
+ tmp += wxT("|");

+ exceptions->MoveNext();
+ }
+ }
+ schedule->iSetExceptions(tmp);
+ delete exceptions;
+
if (browser)
{
collection->AppendBrowserItem(browser, schedule);
@@ -409,3 +431,55 @@

return res;
}
+
+wxString pgaSchedule::GetExceptionsString()
+{
+ wxString tmp, token, dateToken, timeToken;
+ wxDateTime val;
+ wxStringTokenizer tkz(exceptions, wxT("|"));
+
+ while (tkz.HasMoreTokens() )
+ {
+
+ dateToken.Empty();
+ timeToken.Empty();
+
+ // First is the ID which can be ignored
+ token = tkz.GetNextToken();
+
+ // Look for a date
+ if (tkz.HasMoreTokens())
+ dateToken = tkz.GetNextToken();
+
+ // Look for a time
+ if (tkz.HasMoreTokens())
+ timeToken = tkz.GetNextToken();
+
+ if (tmp.IsEmpty())
+ tmp += wxT("[");
+ else
+ tmp += wxT(", [");
+
+ if (!dateToken.IsEmpty() && !timeToken.IsEmpty())
+ {
+ val.ParseDate(dateToken);
+ val.ParseTime(timeToken);
+ tmp += val.Format();
+ }
+ else if (!dateToken.IsEmpty() && timeToken.IsEmpty())
+ {
+ val.ParseDate(dateToken);
+ tmp += val.FormatDate();
+ }
+ else if (dateToken.IsEmpty() && !timeToken.IsEmpty())
+ {
+ val.ParseTime(timeToken);
+ tmp += val.FormatTime();
+ }
+
+ tmp += wxT("]");
+
+ }
+
+ return tmp;
+}
\ No newline at end of file

Modified: trunk/pgadmin3/src/ui/dlgSchedule.xrc
===================================================================
--- trunk/pgadmin3/src/ui/dlgSchedule.xrc 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/ui/dlgSchedule.xrc 2005-05-09 16:13:06 UTC (rev 4173)
@@ -74,11 +74,11 @@
<object class="notebookpage">
<label>Days</label>
<object class="wxPanel" name="pnlDays">
- <object class="wxStaticText" name="stWeekDays">
+ <object class="wxStaticText" name="stWeekdays">
<label>Week Days</label>
<pos>5,7d</pos>
</object>
- <object class="wxCheckListBox" name="chkWeekDays">
+ <object class="wxCheckListBox" name="chkWeekdays">
<content>
<item>Sunday</item>
<item>Monday</item>
@@ -91,11 +91,11 @@
<pos>70,5d</pos>
<size>135,59d</size>
</object>
- <object class="wxStaticText" name="stMonthDays">
+ <object class="wxStaticText" name="stMonthdays">
<label>Month Days</label>
<pos>5,72d</pos>
</object>
- <object class="wxCheckListBox" name="chkMonthDays">
+ <object class="wxCheckListBox" name="chkMonthdays">
<content>
<item>1st</item>
<item>2nd</item>
@@ -278,7 +278,7 @@
<label>Time</label>
<pos>5,166d</pos>
</object>
- <object class="wxTimeSpinCtrl" name="timExceptionTime">
+ <object class="wxTimeSpinCtrl" name="timException">
<pos>33,164d</pos>
<size>65,12d</size>
</object>
@@ -286,7 +286,7 @@
<label>Date</label>
<pos>5,182d</pos>
</object>
- <object class="wxCalendarBox" name="calExceptionDate">
+ <object class="wxCalendarBox" name="calException">
<pos>33,180d</pos>
<size>65,15d</size>
<style>wxCAL_MONDAY_FIRST</style>

Modified: trunk/pgadmin3/src/ui/xrcDialogs.cpp
===================================================================
--- trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-05-09 09:27:30 UTC (rev 4172)
+++ trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-05-09 16:13:06 UTC (rev 4173)
@@ -5462,7 +5462,7 @@
98,106,101,99,116,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,
101,115,111,117,114,99,101,62,10};

-static size_t xml_res_size_31 = 11575;
+static size_t xml_res_size_31 = 11567;
static unsigned char xml_res_file_31[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -5586,16 +5586,16 @@
97,115,115,61,34,119,120,80,97,110,101,108,34,32,110,97,109,101,61,34,112,
110,108,68,97,121,115,34,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,
106,101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,105,99,
-84,101,120,116,34,32,110,97,109,101,61,34,115,116,87,101,101,107,68,97,
+84,101,120,116,34,32,110,97,109,101,61,34,115,116,87,101,101,107,100,97,
121,115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,
62,87,101,101,107,32,68,97,121,115,60,47,108,97,98,101,108,62,10,32,32,
32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,55,100,60,47,112,
111,115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,
97,115,115,61,34,119,120,67,104,101,99,107,76,105,115,116,66,111,120,34,
-32,110,97,109,101,61,34,99,104,107,87,101,101,107,68,97,121,115,34,62,10,
-32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,62,10,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,83,117,
+32,110,97,109,101,61,34,99,104,107,87,101,101,107,100,97,121,115,34,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,83,117,
110,100,97,121,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,
32,32,32,32,60,105,116,101,109,62,77,111,110,100,97,121,60,47,105,116,101,
109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,
@@ -5613,14 +5613,14 @@
47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,
101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,
32,99,108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,
-34,32,110,97,109,101,61,34,115,116,77,111,110,116,104,68,97,121,115,34,
+34,32,110,97,109,101,61,34,115,116,77,111,110,116,104,100,97,121,115,34,
62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,77,111,
110,116,104,32,68,97,121,115,60,47,108,97,98,101,108,62,10,32,32,32,32,
32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,55,50,100,60,47,112,111,
115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,
10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,
115,115,61,34,119,120,67,104,101,99,107,76,105,115,116,66,111,120,34,32,
-110,97,109,101,61,34,99,104,107,77,111,110,116,104,68,97,121,115,34,62,
+110,97,109,101,61,34,99,104,107,77,111,110,116,104,100,97,121,115,34,62,
10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,62,
10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,49,115,
116,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,
@@ -5931,75 +5931,74 @@
32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,
32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,84,105,
109,101,83,112,105,110,67,116,114,108,34,32,110,97,109,101,61,34,116,105,
-109,69,120,99,101,112,116,105,111,110,84,105,109,101,34,62,10,32,32,32,
-32,32,32,32,32,32,32,32,32,60,112,111,115,62,51,51,44,49,54,52,100,60,47,
-112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,
-62,54,53,44,49,50,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,
+109,69,120,99,101,112,116,105,111,110,34,62,10,32,32,32,32,32,32,32,32,
+32,32,32,32,60,112,111,115,62,51,51,44,49,54,52,100,60,47,112,111,115,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,54,53,44,49,
+50,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,
+111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,
+101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,
+120,116,34,32,110,97,109,101,61,34,115,116,68,97,116,101,34,62,10,32,32,
+32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,68,97,116,101,60,
+47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
+115,62,53,44,49,56,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,
32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,
-60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,
-105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,68,97,116,101,
-34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,68,
-97,116,101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,112,111,115,62,53,44,49,56,50,100,60,47,112,111,115,62,10,32,32,
-32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,
-32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
-120,67,97,108,101,110,100,97,114,66,111,120,34,32,110,97,109,101,61,34,
-99,97,108,69,120,99,101,112,116,105,111,110,68,97,116,101,34,62,10,32,32,
-32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,51,51,44,49,56,48,100,60,
-47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,
-101,62,54,53,44,49,53,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,
-32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,67,65,76,95,77,79,78,
-68,65,89,95,70,73,82,83,84,60,47,115,116,121,108,101,62,10,32,32,32,32,
-32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,
-32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,
-117,116,116,111,110,34,32,110,97,109,101,61,34,98,116,110,67,104,97,110,
-103,101,69,120,99,101,112,116,105,111,110,34,62,10,32,32,32,32,32,32,32,
-32,32,32,32,32,60,108,97,98,101,108,62,67,104,97,110,103,101,60,47,108,
-97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
-62,49,48,48,44,49,54,51,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,
-32,32,32,32,32,60,115,105,122,101,62,53,48,44,45,49,100,60,47,115,105,122,
-101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,
-10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,
-115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,
-98,116,110,65,100,100,69,120,99,101,112,116,105,111,110,34,62,10,32,32,
-32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,65,100,100,60,47,
-108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
-115,62,49,48,48,44,49,56,48,100,60,47,112,111,115,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,60,115,105,122,101,62,53,48,44,45,49,100,60,47,115,
-105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,
-116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,
-108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,
-61,34,98,116,110,82,101,109,111,118,101,69,120,99,101,112,116,105,111,110,
-34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,82,
-101,109,111,118,101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,
-32,32,32,32,32,60,112,111,115,62,49,53,53,44,49,56,48,100,60,47,112,111,
-115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,53,
-48,44,45,49,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,
-32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,47,111,
-98,106,101,99,116,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,
-10,32,32,32,32,32,32,60,112,111,115,62,50,44,50,100,60,47,112,111,115,62,
-10,32,32,32,32,32,32,60,115,105,122,101,62,50,49,52,44,50,49,53,100,60,
-47,115,105,122,101,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,
-32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,
-66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,72,69,
-76,80,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,72,101,108,112,
-60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115,62,50,44,
-50,50,48,100,60,47,112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,
-116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,
-34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,
-68,95,79,75,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,79,75,60,
-47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,100,101,102,97,117,108,
-116,62,49,60,47,100,101,102,97,117,108,116,62,10,32,32,32,32,32,32,60,112,
-111,115,62,49,49,51,44,50,50,48,100,60,47,112,111,115,62,10,32,32,32,32,
-60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,
+60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,67,97,108,101,
+110,100,97,114,66,111,120,34,32,110,97,109,101,61,34,99,97,108,69,120,99,
+101,112,116,105,111,110,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+112,111,115,62,51,51,44,49,56,48,100,60,47,112,111,115,62,10,32,32,32,32,
+32,32,32,32,32,32,32,32,60,115,105,122,101,62,54,53,44,49,53,100,60,47,
+115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,
+108,101,62,119,120,67,65,76,95,77,79,78,68,65,89,95,70,73,82,83,84,60,47,
+115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,
+101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,
32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,
-109,101,61,34,119,120,73,68,95,67,65,78,67,69,76,34,62,10,32,32,32,32,32,
-32,60,108,97,98,101,108,62,67,97,110,99,101,108,60,47,108,97,98,101,108,
-62,10,32,32,32,32,32,32,60,112,111,115,62,49,54,54,44,50,50,48,100,60,47,
-112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,
-32,60,115,105,122,101,62,50,49,56,44,50,51,56,100,60,47,115,105,122,101,
-62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,
-114,99,101,62,10};
+109,101,61,34,98,116,110,67,104,97,110,103,101,69,120,99,101,112,116,105,
+111,110,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,
+62,67,104,97,110,103,101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,60,112,111,115,62,49,48,48,44,49,54,51,100,60,47,112,
+111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,
+53,48,44,45,49,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,
+32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,
+111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,
+111,110,34,32,110,97,109,101,61,34,98,116,110,65,100,100,69,120,99,101,
+112,116,105,111,110,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,
+97,98,101,108,62,65,100,100,60,47,108,97,98,101,108,62,10,32,32,32,32,32,
+32,32,32,32,32,32,32,60,112,111,115,62,49,48,48,44,49,56,48,100,60,47,112,
+111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,
+53,48,44,45,49,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,
+32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,
+111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,
+111,110,34,32,110,97,109,101,61,34,98,116,110,82,101,109,111,118,101,69,
+120,99,101,112,116,105,111,110,34,62,10,32,32,32,32,32,32,32,32,32,32,32,
+32,60,108,97,98,101,108,62,82,101,109,111,118,101,60,47,108,97,98,101,108,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,49,53,53,44,
+49,56,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,
+60,115,105,122,101,62,53,48,44,45,49,100,60,47,115,105,122,101,62,10,32,
+32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,
+32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,47,111,
+98,106,101,99,116,62,10,32,32,32,32,32,32,60,112,111,115,62,50,44,50,100,
+60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,62,50,49,52,
+44,50,49,53,100,60,47,115,105,122,101,62,10,32,32,32,32,60,47,111,98,106,
+101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,
+115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,
+120,73,68,95,72,69,76,80,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,
+62,72,101,108,112,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,
+111,115,62,50,44,50,50,48,100,60,47,112,111,115,62,10,32,32,32,32,60,47,
+111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,
+108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,
+61,34,119,120,73,68,95,79,75,34,62,10,32,32,32,32,32,32,60,108,97,98,101,
+108,62,79,75,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,100,101,
+102,97,117,108,116,62,49,60,47,100,101,102,97,117,108,116,62,10,32,32,32,
+32,32,32,60,112,111,115,62,49,49,51,44,50,50,48,100,60,47,112,111,115,62,
+10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,
+106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,
+34,32,110,97,109,101,61,34,119,120,73,68,95,67,65,78,67,69,76,34,62,10,
+32,32,32,32,32,32,60,108,97,98,101,108,62,67,97,110,99,101,108,60,47,108,
+97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115,62,49,54,54,44,50,
+50,48,100,60,47,112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,
+62,10,32,32,32,32,60,115,105,122,101,62,50,49,56,44,50,51,56,100,60,47,
+115,105,122,101,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,
+101,115,111,117,114,99,101,62,10};

static size_t xml_res_size_32 = 2009;
static unsigned char xml_res_file_32[] = {