Menu
▾
▴
tora-cvs — CVS update notification
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(24) |
Mar
(11) |
Apr
(14) |
May
(1) |
Jun
(2) |
Jul
(85) |
Aug
(14) |
Sep
(1) |
Oct
(26) |
Nov
(8) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
(13) |
Jun
(7) |
Jul
(8) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(98) |
Mar
(40) |
Apr
(14) |
May
(14) |
Jun
(36) |
Jul
(3) |
Aug
|
Sep
(23) |
Oct
|
Nov
|
Dec
(8) |
| 2006 |
Jan
(17) |
Feb
(46) |
Mar
(105) |
Apr
(22) |
May
(7) |
Jun
(11) |
Jul
(6) |
Aug
|
Sep
|
Oct
(4) |
Nov
(8) |
Dec
|
| 2007 |
Jan
(13) |
Feb
(21) |
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(55) |
Oct
(97) |
Nov
(3) |
Dec
(127) |
| 2008 |
Jan
(87) |
Feb
(111) |
Mar
(48) |
Apr
(82) |
May
(90) |
Jun
(49) |
Jul
(46) |
Aug
(43) |
Sep
(74) |
Oct
(30) |
Nov
(19) |
Dec
(48) |
| 2009 |
Jan
(13) |
Feb
(13) |
Mar
(3) |
Apr
(13) |
May
(22) |
Jun
(7) |
Jul
(16) |
Aug
(37) |
Sep
(60) |
Oct
(17) |
Nov
(24) |
Dec
(6) |
| 2010 |
Jan
(22) |
Feb
(63) |
Mar
(32) |
Apr
(34) |
May
(29) |
Jun
(53) |
Jul
(40) |
Aug
(34) |
Sep
(33) |
Oct
(85) |
Nov
(32) |
Dec
(23) |
| 2011 |
Jan
(23) |
Feb
(37) |
Mar
(20) |
Apr
(20) |
May
(16) |
Jun
(21) |
Jul
(18) |
Aug
(28) |
Sep
(62) |
Oct
(27) |
Nov
(40) |
Dec
(33) |
| 2012 |
Jan
(33) |
Feb
(3) |
Mar
(18) |
Apr
(35) |
May
(37) |
Jun
(48) |
Jul
(24) |
Aug
(38) |
Sep
(42) |
Oct
(47) |
Nov
(26) |
Dec
|
| 2013 |
Jan
(6) |
Feb
(38) |
Mar
(50) |
Apr
(34) |
May
(15) |
Jun
(16) |
Jul
(18) |
Aug
(123) |
Sep
(47) |
Oct
(63) |
Nov
(39) |
Dec
(43) |
| 2014 |
Jan
(41) |
Feb
(44) |
Mar
(25) |
Apr
(16) |
May
(2) |
Jun
|
Jul
(8) |
Aug
|
Sep
(4) |
Oct
|
Nov
(34) |
Dec
(4) |
| 2015 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <hp...@us...> - 2003-03-13 09:41:35
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv23500
Modified Files:
NEWS todefaultkeywords.h toworksheet.cpp toworksheetsetupui.ui
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.833
retrieving revision 1.834
diff -C2 -d -r1.833 -r1.834
*** NEWS 10 Mar 2003 02:20:09 -0000 1.833
--- NEWS 13 Mar 2003 09:41:27 -0000 1.834
***************
*** 1,4 ****
--- 1,6 ----
1.3.10:
+ 2003-03-13: Added while, out and type reserved words.
+ 2003-03-10: Added option to execute when selecting from log.
2003-03-10: Some more work on the mandrake spec file.
2003-03-10: Changed version.
Index: todefaultkeywords.h
===================================================================
RCS file: /cvsroot/tora/tora/todefaultkeywords.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** todefaultkeywords.h 8 Mar 2003 15:42:27 -0000 1.16
--- todefaultkeywords.h 13 Mar 2003 09:41:30 -0000 1.17
***************
*** 493,496 ****
--- 493,497 ----
"ORGANIZATION",
"OTHERS",
+ "OUT",
"OUTER",
"OUTLINE",
***************
*** 711,714 ****
--- 712,716 ----
"TRUNCATE",
"TX",
+ "TYPE",
"TYPES",
"TZ_OFFSET",
***************
*** 756,759 ****
--- 758,762 ----
"WHENEVER",
"WHERE",
+ "WHILE",
"WITH",
"WITHIN",
Index: toworksheet.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toworksheet.cpp,v
retrieving revision 1.188
retrieving revision 1.189
diff -C2 -d -r1.188 -r1.189
*** toworksheet.cpp 13 Feb 2003 13:05:14 -0000 1.188
--- toworksheet.cpp 13 Mar 2003 09:41:30 -0000 1.189
***************
*** 119,122 ****
--- 119,123 ----
#define CONF_MOVE_TO_ERR "MoveToError"
#define CONF_HISTORY "History"
+ #define CONF_EXEC_LOG "ExecLog"
class toWorksheetSetup : public toWorksheetSetupUI, public toSettingTab
***************
*** 144,147 ****
--- 145,149 ----
DisplayNumber->setChecked(true);
DefaultFile->setText(tool->config(CONF_AUTO_LOAD,""));
+ ExecLog->setChecked(!tool->config(CONF_EXEC_LOG,"").isEmpty());
}
virtual void saveSetting(void)
***************
*** 168,171 ****
--- 170,174 ----
Tool->setConfig(CONF_TIMED_STATS,TimedStatistics->isChecked()?"Yes":"");
Tool->setConfig(CONF_NUMBER,DisplayNumber->isChecked()?"Yes":"");
+ Tool->setConfig(CONF_EXEC_LOG,ExecLog->isChecked()?"Yes":"");
Tool->setConfig(CONF_AUTO_LOAD,DefaultFile->text());
}
***************
*** 1485,1491 ****
insertStatement(item->allText(0));
! if (item->text(4).isEmpty())
! query(item->allText(0),false);
! else {
std::map<int,QWidget *>::iterator i=History.find(item->text(4).toInt());
QueryString=item->allText(0);
--- 1488,1495 ----
insertStatement(item->allText(0));
! if (item->text(4).isEmpty()) {
! if (!WorksheetTool.config(CONF_EXEC_LOG,"").isEmpty())
! query(item->allText(0),false);
! } else {
std::map<int,QWidget *>::iterator i=History.find(item->text(4).toInt());
QueryString=item->allText(0);
Index: toworksheetsetupui.ui
===================================================================
RCS file: /cvsroot/tora/tora/toworksheetsetupui.ui,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** toworksheetsetupui.ui 15 Apr 2002 11:27:09 -0000 1.7
--- toworksheetsetupui.ui 13 Mar 2003 09:41:31 -0000 1.8
***************
*** 156,160 ****
</property>
</widget>
! <spacer row="11" column="1" >
<property>
<name>name</name>
--- 156,160 ----
</property>
</widget>
! <spacer row="12" column="1" >
<property>
<name>name</name>
***************
*** 177,181 ****
</property>
</spacer>
! <widget row="10" column="2" >
<class>QPushButton</class>
<property stdset="1">
--- 177,181 ----
</property>
</spacer>
! <widget row="11" column="2" >
<class>QPushButton</class>
<property stdset="1">
***************
*** 188,192 ****
</property>
</widget>
! <widget row="10" column="1" >
<class>QLineEdit</class>
<property stdset="1">
--- 188,192 ----
</property>
</widget>
! <widget row="11" column="1" >
<class>QLineEdit</class>
<property stdset="1">
***************
*** 195,199 ****
</property>
</widget>
! <widget row="10" column="0" >
<class>QLabel</class>
<property stdset="1">
--- 195,199 ----
</property>
</widget>
! <widget row="11" column="0" >
<class>QLabel</class>
<property stdset="1">
***************
*** 244,247 ****
--- 244,264 ----
</property>
</widget>
+ <widget row="10" column="0" rowspan="1" colspan="3" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ExecLog</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Execute directory when selecting in log</string>
+ </property>
+ <property>
+ <name>toolTip</name>
+ <string>Execute a statement when it is
+ selected in the log, if disabled simply selected
+ the statement in the log.</string>
+ </property>
+ </widget>
</grid>
</widget>
***************
*** 255,258 ****
--- 272,281 ----
<slot>chooseFile()</slot>
</connection>
+ <connection>
+ <sender>History</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>ExecLog</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
<slot access="public">chooseFile()</slot>
</connections>
***************
*** 265,268 ****
--- 288,293 ----
<tabstop>TimedStatistics</tabstop>
<tabstop>DisplayNumber</tabstop>
+ <tabstop>History</tabstop>
+ <tabstop>ExecLog</tabstop>
<tabstop>DefaultFile</tabstop>
<tabstop>FileChoose</tabstop>
|
|
From: <hp...@us...> - 2003-03-10 03:04:16
|
Update of /cvsroot/tora/tora/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv1073/rpm
Modified Files:
tora.spec
Log Message:
Index: tora.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** tora.spec 10 Mar 2003 02:20:12 -0000 1.69
--- tora.spec 10 Mar 2003 03:04:08 -0000 1.70
***************
*** 7,12 ****
%define _name tora
! %define _version 1.3.10
! %define _release 1mdk
%define _prefix /usr
%define _qtdir /usr/lib/qt3
--- 7,12 ----
%define _name tora
! %define _version 1.3.10pre
! %define _release 2mdk
%define _prefix /usr
%define _qtdir /usr/lib/qt3
***************
*** 91,100 ****
Requires: %{_name} = %{_version}
Autoreq: 0
- Requires: tora
%description oracle
! Oracle specific plugins for %{_name}.
%changelog
* Mon Mar 10 2003 Henrik Johnson <to...@un...>
- added the oracle preload and a LD_LIBRARY_PATH setup to make compilation work without Oracle in your ld.so path.
--- 91,106 ----
Requires: %{_name} = %{_version}
Autoreq: 0
%description oracle
! Oracle specific plugins for %{_name}. This plugin will require a valid installation
! of an Oracle Client of version 8.1 or later to function that can be downloaded by
! a free registration from Oracle Technet from http://technet.oracle.com. NOTE: You
! will require to download the entire server distribution to install the client, but
! it is available as a choice in the installer.
%changelog
+ * Mon Mar 10 2003 Henrik Johnson <to...@un...>
+ - change description of Oracle package to reflect needing an Oracle Client installation.
+
* Mon Mar 10 2003 Henrik Johnson <to...@un...>
- added the oracle preload and a LD_LIBRARY_PATH setup to make compilation work without Oracle in your ld.so path.
|
|
From: <hp...@us...> - 2003-03-10 02:20:17
|
Update of /cvsroot/tora/tora/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv19656/rpm
Modified Files:
tora-static.spec tora.spec
Log Message:
Index: tora-static.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora-static.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** tora-static.spec 15 Feb 2003 23:50:27 -0000 1.61
--- tora-static.spec 10 Mar 2003 02:20:12 -0000 1.62
***************
*** 1,4 ****
%define _name tora
! %define _version 1.3.9.2
%define _release 1static
%define _prefix /usr/X11R6
--- 1,4 ----
%define _name tora
! %define _version 1.3.10
%define _release 1static
%define _prefix /usr/X11R6
Index: tora.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** tora.spec 10 Mar 2003 01:20:44 -0000 1.68
--- tora.spec 10 Mar 2003 02:20:12 -0000 1.69
***************
*** 1,35 ****
# This specfile is Mandrake Linux specific
#
! # Requires the following .rpmmacros
! #
! # %__find_requires %(echo $HOME)/bin/find-requires-nonoracle %{?buildroot:%{buildroot}}
! #
! # Where the find-requires-nonoracle contains the following
! #
! # #!/bin/sh
! # /usr/lib/rpm/find-requires $@ | grep -v 'libclntsh\.so' | grep -v 'libwtc.*\.so'
! #
! # This is to remove dependencies to the oracle libraries in the oracle rpm.
#
%define _name tora
! %define _version 1.3.9.2
! %define _release 2mdk
%define _prefix /usr
%define _qtdir /usr/lib/qt3
! Summary: Toolkit for Oracle
! Name: %{_name}
! Version: %{_version}
! Release: %{_release}
! Source: %{_name}-%{_version}.tar.gz
! URL: http://www.globecom.se/tora
! Group: Development/Databases
! Packager: Henrik Johnson <to...@un...>
! Distribution: Mandrake Linux 9.1
! Copyright: GPL
! BuildRoot: %{_tmppath}/tora-root
! Prefix: %{_prefix}
%description
--- 1,27 ----
# This specfile is Mandrake Linux specific
#
! # This requires a working Oracle installation to build with a set ORACLE_HOME
! # environment. Requires at least version 8.1.7 of Oracle.
#
%define _name tora
! %define _version 1.3.10
! %define _release 1mdk
%define _prefix /usr
%define _qtdir /usr/lib/qt3
! Summary: Toolkit for Oracle
! Name: %{_name}
! Version: %{_version}
! Release: %{_release}
! Source: %{_name}-%{_version}.tar.gz
! URL: http://www.globecom.se/tora
! Group: Development/Databases
! Packager: Henrik Johnson <to...@un...>
! Distribution: Mandrake Linux 9.1
! Copyright: GPL
! BuildRoot: %{_tmppath}/tora-root
! Prefix: %{_prefix}
%description
***************
*** 95,117 ****
%package oracle
! Summary: Oracle specific plugins for %{_name}
Group: Development/Databases
Requires: %{_name} = %{_version}
%description oracle
Oracle specific plugins for %{_name}.
%changelog
! * Tue Dec 18 2001 Henrik Johnson <to...@un...>
! - created from SuSE specfile by Pascal Bleser
!
! * Sun Mar 9 2003 Henrik Johnson <to...@un...>
! - adapted to Mandrake Linux
* Mon Mar 10 2003 Henrik Johnson <to...@un...>
- added comment about fixing requires problem.
%prep
%setup -q
export QTDIR="%{_qtdir}"
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
--- 87,118 ----
%package oracle
! Summary: Oracle specific plugins for %{_name}
Group: Development/Databases
Requires: %{_name} = %{_version}
+ Autoreq: 0
+ Requires: tora
+
%description oracle
Oracle specific plugins for %{_name}.
%changelog
! * Mon Mar 10 2003 Henrik Johnson <to...@un...>
! - added the oracle preload and a LD_LIBRARY_PATH setup to make compilation work without Oracle in your ld.so path.
! - also added a workaround of the whole requires problem for the Oracle package.
! - changed version to 1.3.10.
* Mon Mar 10 2003 Henrik Johnson <to...@un...>
- added comment about fixing requires problem.
+ * Sun Mar 9 2003 Henrik Johnson <to...@un...>
+ - adapted to Mandrake Linux.
+
+ * Tue Dec 18 2001 Henrik Johnson <to...@un...>
+ - created from SuSE specfile by Pascal Bleser.
+
%prep
%setup -q
export QTDIR="%{_qtdir}"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ORACLE_HOME/lib"
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
|
|
From: <hp...@us...> - 2003-03-10 02:20:15
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv19656
Modified Files:
NEWS configure.pl toconf.h
Added Files:
tooraclepreload.cpp
Log Message:
--- NEW FILE: tooraclepreload.cpp ---
#ifndef TOMONOLITHIC
#include <qcstring.h>
#include <dlfcn.h>
#include <stdlib.h>
class toInit {
public:
toInit(void)
{
char *home=getenv("ORACLE_HOME");
if (!home)
return;
QCString dlpath=home;
dlpath+="/lib/libclntsh.so";
if (!dlopen(dlpath,RTLD_NOW|RTLD_GLOBAL))
return;
}
};
static toInit Init;
#endif
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.832
retrieving revision 1.833
diff -C2 -d -r1.832 -r1.833
*** NEWS 8 Mar 2003 15:42:27 -0000 1.832
--- NEWS 10 Mar 2003 02:20:09 -0000 1.833
***************
*** 1,7 ****
1.3.10:
2003-03-08: Created Mandrake Linux specific RPM.
! 2003-02-18: Fixed problem with not making outer john to v$process in Session viewer.
! 2003-02-18: Added some more keywords.
1.3.9.2: Released 2003-02-16
--- 1,10 ----
1.3.10:
+ 2003-03-10: Some more work on the mandrake spec file.
+ 2003-03-10: Changed version.
+ 2003-03-10: Added a dummy plugin to preload oracle libraries from ORACLE_HOME path.
2003-03-08: Created Mandrake Linux specific RPM.
! 2003-02-08: Fixed problem with not making outer john to v$process in Session viewer.
! 2003-02-08: Added some more keywords.
1.3.9.2: Released 2003-02-16
Index: configure.pl
===================================================================
RCS file: /cvsroot/tora/tora/configure.pl,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** configure.pl 8 Feb 2003 11:44:43 -0000 1.151
--- configure.pl 10 Mar 2003 02:20:10 -0000 1.152
***************
*** 209,212 ****
--- 209,214 ----
\$(GCC) -shared \$(CFLAGS) \$(LFLAGS) \$(LFLAGS_GLOB) \$(MYSQL_SHARED) -o \$@ \$^
__EOMK__
+ "tooraclepreload" => { "Files" => [ "tooraclepreload" ],
+ "Oracle" => 1 },
);
***************
*** 1464,1467 ****
--- 1466,1473 ----
print MAKEFILE "DEFINES+=-DTO_KDE\n";
}
+ if ($Target ne "tora-plugin") {
+ print MAKEFILE "DEFINES+=-DTOMONOLITHIC\n";
+ }
+
print MAKEFILE "\n";
Index: toconf.h
===================================================================
RCS file: /cvsroot/tora/tora/toconf.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** toconf.h 16 Feb 2003 10:20:07 -0000 1.100
--- toconf.h 10 Mar 2003 02:20:10 -0000 1.101
***************
*** 157,161 ****
#endif
// Version of TOra, must also change rpm files
! #define TOVERSION "1.3.9.2"
// Stable or development version of TOra
#define TOTYPE "DEVELOP"
--- 157,161 ----
#endif
// Version of TOra, must also change rpm files
! #define TOVERSION "1.3.10"
// Stable or development version of TOra
#define TOTYPE "DEVELOP"
|
|
From: <hp...@us...> - 2003-03-10 01:20:47
|
Update of /cvsroot/tora/tora/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv15306
Modified Files:
tora.spec
Log Message:
Index: tora.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** tora.spec 9 Mar 2003 22:35:20 -0000 1.67
--- tora.spec 10 Mar 2003 01:20:44 -0000 1.68
***************
*** 1,10 ****
# This specfile is Mandrake Linux specific
#
! # Just removing the references to menu stuff should make it generic
#
%define _name tora
%define _version 1.3.9.2
! %define _release 1mdk
%define _prefix /usr
%define _qtdir /usr/lib/qt3
--- 1,20 ----
# This specfile is Mandrake Linux specific
#
! # Requires the following .rpmmacros
! #
! # %__find_requires %(echo $HOME)/bin/find-requires-nonoracle %{?buildroot:%{buildroot}}
! #
! # Where the find-requires-nonoracle contains the following
! #
! # #!/bin/sh
! # /usr/lib/rpm/find-requires $@ | grep -v 'libclntsh\.so' | grep -v 'libwtc.*\.so'
! #
! # This is to remove dependencies to the oracle libraries in the oracle rpm.
#
+
%define _name tora
%define _version 1.3.9.2
! %define _release 2mdk
%define _prefix /usr
%define _qtdir /usr/lib/qt3
***************
*** 94,97 ****
--- 104,113 ----
* Tue Dec 18 2001 Henrik Johnson <to...@un...>
- created from SuSE specfile by Pascal Bleser
+
+ * Sun Mar 9 2003 Henrik Johnson <to...@un...>
+ - adapted to Mandrake Linux
+
+ * Mon Mar 10 2003 Henrik Johnson <to...@un...>
+ - added comment about fixing requires problem.
%prep
|
|
From: <hp...@us...> - 2003-03-09 23:13:05
|
Update of /cvsroot/tora/tora/rpm In directory sc8-pr-cvs1:/tmp/cvs-serv4724/rpm Modified Files: tora.menu Log Message: Index: tora.menu =================================================================== RCS file: /cvsroot/tora/tora/rpm/tora.menu,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tora.menu 9 Mar 2003 22:41:01 -0000 1.4 --- tora.menu 9 Mar 2003 23:13:02 -0000 1.5 *************** *** 1,4 **** ?package(tora): needs="X11" icon="tora.xpm" \ ! section="Applications/Developement/Tools" \ title="TOra" longtitle="Toolkit for Oracle" \ command="/usr/bin/tora" --- 1,4 ---- ?package(tora): needs="X11" icon="tora.xpm" \ ! section="Applications/Development/Tools" \ title="TOra" longtitle="Toolkit for Oracle" \ command="/usr/bin/tora" |
|
From: <hp...@us...> - 2003-03-09 22:41:04
|
Update of /cvsroot/tora/tora/rpm In directory sc8-pr-cvs1:/tmp/cvs-serv21805 Modified Files: tora.menu Log Message: Index: tora.menu =================================================================== RCS file: /cvsroot/tora/tora/rpm/tora.menu,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tora.menu 9 Mar 2003 22:35:20 -0000 1.3 --- tora.menu 9 Mar 2003 22:41:01 -0000 1.4 *************** *** 1,3 **** ! ?package(DrakeLogo): needs="X11" icon="tora.xpm" \ section="Applications/Developement/Tools" \ title="TOra" longtitle="Toolkit for Oracle" \ --- 1,3 ---- ! ?package(tora): needs="X11" icon="tora.xpm" \ section="Applications/Developement/Tools" \ title="TOra" longtitle="Toolkit for Oracle" \ |
|
From: <hp...@us...> - 2003-03-09 22:35:27
|
Update of /cvsroot/tora/tora/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv19027/rpm
Modified Files:
tora.menu tora.spec
Log Message:
Index: tora.menu
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.menu,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tora.menu 26 May 2001 02:18:03 -0000 1.2
--- tora.menu 9 Mar 2003 22:35:20 -0000 1.3
***************
*** 2,5 ****
section="Applications/Developement/Tools" \
title="TOra" longtitle="Toolkit for Oracle" \
! command="/usr/X11R6/bin/tora"
--- 2,5 ----
section="Applications/Developement/Tools" \
title="TOra" longtitle="Toolkit for Oracle" \
! command="/usr/bin/tora"
Index: tora.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** tora.spec 8 Mar 2003 15:42:27 -0000 1.66
--- tora.spec 9 Mar 2003 22:35:20 -0000 1.67
***************
*** 1,8 ****
# This specfile is Mandrake Linux specific
%define _name tora
%define _version 1.3.9.2
! %define _release 1gc
! %define _prefix /usr/X11R6
%define _qtdir /usr/lib/qt3
--- 1,11 ----
# This specfile is Mandrake Linux specific
+ #
+ # Just removing the references to menu stuff should make it generic
+ #
%define _name tora
%define _version 1.3.9.2
! %define _release 1mdk
! %define _prefix /usr
%define _qtdir /usr/lib/qt3
***************
*** 104,108 ****
--with-kde \
--without-rpath \
- --with-oracle \
--with-rpm-contents="%{_prefix}/lib"
--- 107,110 ----
***************
*** 139,143 ****
--- 141,150 ----
%{_prefix}/bin/*
%dir %{_prefix}/lib/tora
+ %{_prefix}/lib/tora/*.tpl
+ %{_prefix}/lib/tora/*.qm
%{_prefix}/lib/tora/help
+ %{_menudir}/tora
+ %{_iconsdir}/hicolor/*/apps/tora.xpm
+ %{_datadir}/applnk/Development/tora.desktop
%files oracle -f rpmoracle
|
|
From: <hp...@us...> - 2003-03-08 15:42:33
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv15400
Modified Files:
NEWS todefaultkeywords.h totuning.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.831
retrieving revision 1.832
diff -C2 -d -r1.831 -r1.832
*** NEWS 19 Feb 2003 19:10:32 -0000 1.831
--- NEWS 8 Mar 2003 15:42:27 -0000 1.832
***************
*** 1,4 ****
--- 1,5 ----
1.3.10:
+ 2003-03-08: Created Mandrake Linux specific RPM.
2003-02-18: Fixed problem with not making outer john to v$process in Session viewer.
2003-02-18: Added some more keywords.
***************
*** 6,9 ****
--- 7,11 ----
1.3.9.2: Released 2003-02-16
+ 2003-02-15: If paramget data
2003-02-15: Use SQL parse in parts of the debugger.
2003-02-15: Fixed SIGSEGV problem in listviews.
Index: todefaultkeywords.h
===================================================================
RCS file: /cvsroot/tora/tora/todefaultkeywords.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** todefaultkeywords.h 19 Feb 2003 19:10:34 -0000 1.15
--- todefaultkeywords.h 8 Mar 2003 15:42:27 -0000 1.16
***************
*** 479,483 ****
"OIDINDEX",
"OLD",
- "OTHERS",
"ON",
"ONLINE",
--- 479,482 ----
***************
*** 493,496 ****
--- 492,496 ----
"ORDER",
"ORGANIZATION",
+ "OTHERS",
"OUTER",
"OUTLINE",
Index: totuning.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totuning.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** totuning.cpp 11 Feb 2003 00:32:25 -0000 1.97
--- totuning.cpp 8 Mar 2003 15:42:27 -0000 1.98
***************
*** 67,71 ****
#include <qmenubar.h>
#include <qmessagebox.h>
! #include <qobjcoll.h>
#include <qpainter.h>
#include <qscrollview.h>
--- 67,75 ----
#include <qmenubar.h>
#include <qmessagebox.h>
! #if QT_VERSION > 300
! # include <qobjectlist.h>
! #else
! # include <qobjcoll.h>
! #endif
#include <qpainter.h>
#include <qscrollview.h>
|
|
From: <hp...@us...> - 2003-03-08 15:42:33
|
Update of /cvsroot/tora/tora/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv15400/rpm
Modified Files:
tora.spec
Log Message:
Index: tora.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** tora.spec 15 Feb 2003 23:50:27 -0000 1.65
--- tora.spec 8 Mar 2003 15:42:27 -0000 1.66
***************
*** 1,3 ****
! # This specfile is no longer in use
%define _name tora
--- 1,3 ----
! # This specfile is Mandrake Linux specific
%define _name tora
***************
*** 5,9 ****
%define _release 1gc
%define _prefix /usr/X11R6
! %define _qt2dir /usr/lib/qt2
Summary: Toolkit for Oracle
--- 5,9 ----
%define _release 1gc
%define _prefix /usr/X11R6
! %define _qtdir /usr/lib/qt3
Summary: Toolkit for Oracle
***************
*** 15,19 ****
Group: Development/Databases
Packager: Henrik Johnson <to...@un...>
! Distribution: Mandrake Linux 9.0
Copyright: GPL
BuildRoot: %{_tmppath}/tora-root
--- 15,19 ----
Group: Development/Databases
Packager: Henrik Johnson <to...@un...>
! Distribution: Mandrake Linux 9.1
Copyright: GPL
BuildRoot: %{_tmppath}/tora-root
***************
*** 25,29 ****
* Handles multiple connections
! * Support Oracle & MySQL
* Advanced SQL Worksheet
* Explain plan
--- 25,29 ----
* Handles multiple connections
! * Support Oracle, MySQL & PostgreSQL
* Advanced SQL Worksheet
* Explain plan
***************
*** 79,91 ****
* Printing of any list, text or chart
! This build is compiled with KDE support.
!
! %package mysql
! Summary: MySQL specific plugins for %{_name}
! Group: Development/Databases
! Requires: %{_name} = %{_version}
! Requires: mysql-shared
! %description mysql
! MySQL specific plugins for %{_name}.
%package oracle
--- 79,83 ----
* Printing of any list, text or chart
! This build is compiled with KDE and Mandrake Menu support.
%package oracle
***************
*** 102,106 ****
%prep
%setup -q
! export QTDIR="%{_qt2dir}"
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
--- 94,98 ----
%prep
%setup -q
! export QTDIR="%{_qtdir}"
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
***************
*** 109,120 ****
--prefix-bin="%{_prefix}/bin" \
--prefix-lib="%{_prefix}/lib" \
! --with-qt="%{_qt2dir}" \
--with-kde \
--without-rpath \
! --with-static-oracle \
--with-rpm-contents="%{_prefix}/lib"
%build
! export QTDIR="%{_qt2dir}"
%{__make}
%{__strip} \
--- 101,112 ----
--prefix-bin="%{_prefix}/bin" \
--prefix-lib="%{_prefix}/lib" \
! --with-qt="%{_qtdir}" \
--with-kde \
--without-rpath \
! --with-oracle \
--with-rpm-contents="%{_prefix}/lib"
%build
! export QTDIR="%{_qtdir}"
%{__make}
%{__strip} \
***************
*** 130,133 ****
--- 122,134 ----
install
+ mkdir -p $RPM_BUILD_ROOT%{_menudir}
+ cp rpm/tora.menu $RPM_BUILD_ROOT%{_menudir}/tora
+
+ %post
+ %{update_menus}
+
+ %postun
+ %{clean_menus}
+
%clean
%{__rm} -rf "${RPM_BUILD_ROOT}"
***************
*** 139,145 ****
%dir %{_prefix}/lib/tora
%{_prefix}/lib/tora/help
-
- %files mysql -f rpmmysql
- %defattr(-,root,root)
%files oracle -f rpmoracle
--- 140,143 ----
|
|
From: <hp...@us...> - 2003-02-19 19:10:41
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv29031
Modified Files:
NEWS todefaultkeywords.h tosession.cpp
Log Message:
Moving to other machine
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.830
retrieving revision 1.831
diff -C2 -d -r1.830 -r1.831
*** NEWS 18 Feb 2003 12:57:32 -0000 1.830
--- NEWS 19 Feb 2003 19:10:32 -0000 1.831
***************
*** 1,4 ****
--- 1,5 ----
1.3.10:
+ 2003-02-18: Fixed problem with not making outer john to v$process in Session viewer.
2003-02-18: Added some more keywords.
Index: todefaultkeywords.h
===================================================================
RCS file: /cvsroot/tora/tora/todefaultkeywords.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** todefaultkeywords.h 18 Feb 2003 12:57:32 -0000 1.14
--- todefaultkeywords.h 19 Feb 2003 19:10:34 -0000 1.15
***************
*** 216,219 ****
--- 216,220 ----
"ELEMENT",
"ELSE",
+ "ELSIF",
"ENABLE",
"ENCRYPTED",
***************
*** 235,238 ****
--- 236,240 ----
"EXEMPT",
"EXISTS",
+ "EXIT",
"EXPIRE",
"EXPLAIN",
Index: tosession.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tosession.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** tosession.cpp 11 Feb 2003 22:18:46 -0000 1.69
--- tosession.cpp 19 Feb 2003 19:10:35 -0000 1.70
***************
*** 193,197 ****
" AND a.sql_address = d.address(+) AND a.sql_hash_value = d.hash_value(+)\n"
" AND (d.child_number = 0 OR d.child_number IS NULL)\n"
! " AND a.paddr = e.addr\n"
"%1 ORDER BY a.Sid",
"List sessions, must have same number of culumns and the first and last 2 must be "
--- 193,197 ----
" AND a.sql_address = d.address(+) AND a.sql_hash_value = d.hash_value(+)\n"
" AND (d.child_number = 0 OR d.child_number IS NULL)\n"
! " AND a.paddr = e.addr(+)\n"
"%1 ORDER BY a.Sid",
"List sessions, must have same number of culumns and the first and last 2 must be "
|
|
From: <hp...@us...> - 2003-02-18 12:57:36
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv4258
Modified Files:
NEWS todefaultkeywords.h
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.829
retrieving revision 1.830
diff -C2 -d -r1.829 -r1.830
*** NEWS 15 Feb 2003 23:46:08 -0000 1.829
--- NEWS 18 Feb 2003 12:57:32 -0000 1.830
***************
*** 1,2 ****
--- 1,6 ----
+ 1.3.10:
+
+ 2003-02-18: Added some more keywords.
+
1.3.9.2: Released 2003-02-16
Index: todefaultkeywords.h
===================================================================
RCS file: /cvsroot/tora/tora/todefaultkeywords.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** todefaultkeywords.h 13 Feb 2003 14:42:30 -0000 1.13
--- todefaultkeywords.h 18 Feb 2003 12:57:32 -0000 1.14
***************
*** 33,762 ****
****************************************************************************/
! static char *DefaultKeywords[]={"ABORT",
! "ACCESS",
! "ACCESSED",
! "ACCOUNT",
! "ACTIVATE",
! "ADMIN",
! "ADMINISTER",
! "ADMINISTRATOR",
[...1435 lines suppressed...]
! "VARCHAR",
! "VARCHAR2",
! "VARRAY",
! "VARYING",
! "VIEW",
! "WAIT",
! "WHEN",
! "WHENEVER",
! "WHERE",
! "WITH",
! "WITHIN",
! "WITHOUT",
! "WORK",
! "WRITE",
! "XID",
! "XMLSCHEMA",
! "XMLTYPE",
! "ZONE",
! NULL
};
|
|
From: <hp...@us...> - 2003-02-16 10:20:14
|
Update of /cvsroot/tora/tora In directory sc8-pr-cvs1:/tmp/cvs-serv8349 Modified Files: toconf.h Log Message: Index: toconf.h =================================================================== RCS file: /cvsroot/tora/tora/toconf.h,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** toconf.h 12 Feb 2003 20:17:46 -0000 1.99 --- toconf.h 16 Feb 2003 10:20:07 -0000 1.100 *************** *** 157,161 **** #endif // Version of TOra, must also change rpm files ! #define TOVERSION "1.3.9.1" // Stable or development version of TOra #define TOTYPE "DEVELOP" --- 157,161 ---- #endif // Version of TOra, must also change rpm files ! #define TOVERSION "1.3.9.2" // Stable or development version of TOra #define TOTYPE "DEVELOP" |
|
From: <hp...@us...> - 2003-02-15 23:50:31
|
Update of /cvsroot/tora/tora/rpm In directory sc8-pr-cvs1:/tmp/cvs-serv3607/rpm Modified Files: tora-static.spec tora.spec Log Message: Index: tora-static.spec =================================================================== RCS file: /cvsroot/tora/tora/rpm/tora-static.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** tora-static.spec 11 Feb 2003 00:47:17 -0000 1.60 --- tora-static.spec 15 Feb 2003 23:50:27 -0000 1.61 *************** *** 1,4 **** %define _name tora ! %define _version 1.3.9.1 %define _release 1static %define _prefix /usr/X11R6 --- 1,4 ---- %define _name tora ! %define _version 1.3.9.2 %define _release 1static %define _prefix /usr/X11R6 Index: tora.spec =================================================================== RCS file: /cvsroot/tora/tora/rpm/tora.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** tora.spec 11 Feb 2003 00:47:17 -0000 1.64 --- tora.spec 15 Feb 2003 23:50:27 -0000 1.65 *************** *** 2,6 **** %define _name tora ! %define _version 1.3.9.1 %define _release 1gc %define _prefix /usr/X11R6 --- 2,6 ---- %define _name tora ! %define _version 1.3.9.2 %define _release 1gc %define _prefix /usr/X11R6 |
|
From: <hp...@us...> - 2003-02-15 23:46:12
|
Update of /cvsroot/tora/tora In directory sc8-pr-cvs1:/tmp/cvs-serv1988 Modified Files: NEWS Log Message: Index: NEWS =================================================================== RCS file: /cvsroot/tora/tora/NEWS,v retrieving revision 1.828 retrieving revision 1.829 diff -C2 -d -r1.828 -r1.829 *** NEWS 15 Feb 2003 23:27:04 -0000 1.828 --- NEWS 15 Feb 2003 23:46:08 -0000 1.829 *************** *** 1,3 **** ! 1.3.10: 2003-02-15: Use SQL parse in parts of the debugger. --- 1,3 ---- ! 1.3.9.2: Released 2003-02-16 2003-02-15: Use SQL parse in parts of the debugger. |
|
From: <hp...@us...> - 2003-02-15 23:43:54
|
Update of /cvsroot/tora/tora In directory sc8-pr-cvs1:/tmp/cvs-serv1173 Modified Files: BUGS Log Message: Index: BUGS =================================================================== RCS file: /cvsroot/tora/tora/BUGS,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** BUGS 10 Feb 2003 23:11:37 -0000 1.78 --- BUGS 15 Feb 2003 23:43:51 -0000 1.79 *************** *** 7,13 **** Looses clipboard when application closes. - KDE: - When destructing several docked windows sometimes make weird slot disconnect. - toGetToken: Doesn't handle comments when going backwards. --- 7,10 ---- *************** *** 15,27 **** toMysqlConnection: Doesn't handle other locales than latin1 correctly. - - otl: - Sometimes looses open cursors when cancelling and multiple queries are running. - - toThread: - Leaves defunct processes when running under gdb. - - toScript: - Seems to not update enable/disable status when changing to report mode. toWaitEvents: --- 12,15 ---- |
|
From: <hp...@us...> - 2003-02-15 23:27:08
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv27597
Modified Files:
NEWS todebug.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.827
retrieving revision 1.828
diff -C2 -d -r1.827 -r1.828
*** NEWS 15 Feb 2003 22:31:55 -0000 1.827
--- NEWS 15 Feb 2003 23:27:04 -0000 1.828
***************
*** 1,4 ****
--- 1,5 ----
1.3.10:
+ 2003-02-15: Use SQL parse in parts of the debugger.
2003-02-15: Fixed SIGSEGV problem in listviews.
2003-02-15: Fixed twirl not showing initially... again.
Index: todebug.cpp
===================================================================
RCS file: /cvsroot/tora/tora/todebug.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** todebug.cpp 3 Feb 2003 22:12:43 -0000 1.100
--- todebug.cpp 15 Feb 2003 23:27:04 -0000 1.101
***************
*** 2095,2130 ****
bool ret=true;
if (!str.isEmpty()) {
- bool inWord=false;
- int curWord=0;
- QString words[10];
bool body=false;
- int begin[10];
! for (unsigned int i=0;i<str.length();i++) {
! if (str.at(i).isSpace()) {
! if (inWord) {
! curWord++;
! if (curWord>=10)
! break;
! inWord=false;
! }
! } else {
! if (!inWord) {
! begin[curWord]=i;
! inWord=true;
! }
! words[curWord]+=str.at(i);
! }
! }
! int word=0;
! if (words[word].upper()==QString::fromLatin1("CREATE")) {
! word++;
! if (words[word].upper()==QString::fromLatin1("OR")&&
! words[word+1].upper()==QString::fromLatin1("REPLACE"))
! word+=2;
}
! QString type=words[word].upper();
if (type!=QString::fromLatin1("PROCEDURE")&&
type!=QString::fromLatin1("TYPE")&&
--- 2095,2114 ----
bool ret=true;
if (!str.isEmpty()) {
bool body=false;
! toSQLParse::stringTokenizer tokens(str);
! QString token=tokens.getToken();
!
! if (token.upper()=="CREATE") {
! token=tokens.getToken();
! if (token.upper()=="OR") {
! token=tokens.getToken();
! if (token.upper()=="REPLACE")
! token=tokens.getToken();
! }
}
! QString type=token.upper();
if (type!=QString::fromLatin1("PROCEDURE")&&
type!=QString::fromLatin1("TYPE")&&
***************
*** 2134,2168 ****
return false;
}
- word++;
! if (words[word].upper()==QString::fromLatin1("BODY")) {
body=true;
! word++;
! }
! QString what=words[word];
! word++;
! if(!what.contains('.')&&words[word][0]=='.') {
! what+=words[word];
! word++;
! }
! if (what.right(1)==QString::fromLatin1(".")) {
! what+=words[word];
! word++;
! }
! if (word>=curWord) {
! toStatusMessage(tr("Invalid start of code"));
! return false;
}
! QString schema;
! QString object;
!
! int pos=what.find('.');
! if (pos==-1) {
! schema=Schema;
! object=what;
! } else {
! schema=what.left(pos);
! object=what.right(what.length()-pos-1);
}
--- 2118,2136 ----
return false;
}
! token=tokens.getToken();
! if (token.upper()=="BODY") {
body=true;
! token=tokens.getToken();
}
+ QString object=token;
+ QString schema=Schema;
! int offset=tokens.offset();
! token=tokens.getToken();
! if (token==".") {
! schema=object;
! object=tokens.getToken();
! offset=tokens.offset();
}
***************
*** 2177,2181 ****
sql.append(object);
sql.append(QString::fromLatin1(" "));
! sql.append(str.right(str.length()-begin[word]));
try {
--- 2145,2149 ----
sql.append(object);
sql.append(QString::fromLatin1(" "));
! sql.append(str.mid(offset));
try {
|
|
From: <hp...@us...> - 2003-02-15 22:32:00
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv8507
Modified Files:
NEWS tobackground.cpp tomain.cpp toresultview.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.826
retrieving revision 1.827
diff -C2 -d -r1.826 -r1.827
*** NEWS 15 Feb 2003 13:40:43 -0000 1.826
--- NEWS 15 Feb 2003 22:31:55 -0000 1.827
***************
*** 1,4 ****
--- 1,6 ----
1.3.10:
+ 2003-02-15: Fixed SIGSEGV problem in listviews.
+ 2003-02-15: Fixed twirl not showing initially... again.
2003-02-15: Don't expand filenames if the file exist without extension.
2003-02-15: Made charts obey number formatting as well.
Index: tobackground.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tobackground.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tobackground.cpp 10 Feb 2003 23:11:40 -0000 1.13
--- tobackground.cpp 15 Feb 2003 22:31:55 -0000 1.14
***************
*** 549,552 ****
--- 549,555 ----
Animation=new QMovie(arr);
setMovie(*Animation);
+ #if 0
+ Animation->pause();
+ #endif
TimerID=startTimer(500);
}
***************
*** 554,562 ****
virtual void timerEvent(QTimerEvent *time)
{
! if (TimerID==time->timerId())
killTimer(TimerID);
! if (Running==0)
! Animation->pause();
}
virtual void mouseReleaseEvent(QMouseEvent *e)
{
--- 557,568 ----
virtual void timerEvent(QTimerEvent *time)
{
! if (TimerID==time->timerId()) {
killTimer(TimerID);
! TimerID=-1;
! if (Running==0)
! Animation->pause();
! }
}
+
virtual void mouseReleaseEvent(QMouseEvent *e)
{
***************
*** 637,641 ****
{
toMain *main=toMainWidget();
! if (!main)
return;
--- 643,647 ----
{
toMain *main=toMainWidget();
! if (!main||Label)
return;
Index: tomain.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tomain.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** tomain.cpp 12 Feb 2003 20:17:46 -0000 1.160
--- tomain.cpp 15 Feb 2003 22:31:56 -0000 1.161
***************
*** 572,575 ****
--- 572,577 ----
#endif
+ toBackground::init();
+
if (Connections.size()==0) {
try {
Index: toresultview.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultview.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** toresultview.cpp 11 Feb 2003 22:18:38 -0000 1.117
--- toresultview.cpp 15 Feb 2003 22:31:56 -0000 1.118
***************
*** 134,137 ****
--- 134,139 ----
QString toResultViewItem::firstText(int col) const
{
+ if (col>=ColumnCount)
+ return QString::null;
QString txt=ColumnData[col].Data;
int pos=txt.find('\n');
***************
*** 345,348 ****
--- 347,352 ----
QString toResultViewCheck::firstText(int col) const
{
+ if (col>=ColumnCount)
+ return QString::null;
QString txt=ColumnData[col].Data;
int pos=txt.find('\n');
|
|
From: <hp...@us...> - 2003-02-15 13:40:47
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv32440
Modified Files:
NEWS tolinechart.cpp topiechart.cpp utils.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.825
retrieving revision 1.826
diff -C2 -d -r1.825 -r1.826
*** NEWS 15 Feb 2003 11:59:36 -0000 1.825
--- NEWS 15 Feb 2003 13:40:43 -0000 1.826
***************
*** 1,4 ****
--- 1,6 ----
1.3.10:
+ 2003-02-15: Don't expand filenames if the file exist without extension.
+ 2003-02-15: Made charts obey number formatting as well.
2003-02-14: Change password when it has expired.
2003-02-14: Get password from new connection instead of the password editor in new connections.
Index: tolinechart.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tolinechart.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** tolinechart.cpp 12 Feb 2003 20:17:46 -0000 1.42
--- tolinechart.cpp 15 Feb 2003 13:40:43 -0000 1.43
***************
*** 220,224 ****
if (!str.isEmpty())
str+=QString::fromLatin1("\n");
! str+=QString::number(*(*i).rbegin());
str+=YPostfix;
}
--- 220,224 ----
if (!str.isEmpty())
str+=QString::fromLatin1("\n");
! str+=toQValue::formatNumber(*(*i).rbegin());
str+=YPostfix;
}
***************
*** 311,316 ****
QRect ybounds;
if (leftAxis) {
! minstr=QString::number(zMinValue);
! maxstr=QString::number(zMaxValue);
maxstr+=YPostfix;
QRect bounds=fm.boundingRect(0,0,100000,100000,FONT_ALIGN,minstr);
--- 311,316 ----
QRect ybounds;
if (leftAxis) {
! minstr=toQValue::formatNumber(zMinValue);
! maxstr=toQValue::formatNumber(zMaxValue);
maxstr+=YPostfix;
QRect bounds=fm.boundingRect(0,0,100000,100000,FONT_ALIGN,minstr);
***************
*** 622,627 ****
{
toLineChartSetupUI setup(this,NULL,true);
! setup.MinValue->setText(QString::number(MinValue));
! setup.MaxValue->setText(QString::number(MaxValue));
setup.AutoMax->setChecked(MaxAuto);
setup.AutoMin->setChecked(MinAuto);
--- 622,627 ----
{
toLineChartSetupUI setup(this,NULL,true);
! setup.MinValue->setText(toQValue::formatNumber(MinValue));
! setup.MaxValue->setText(toQValue::formatNumber(MaxValue));
setup.AutoMax->setChecked(MaxAuto);
setup.AutoMin->setChecked(MinAuto);
Index: topiechart.cpp
===================================================================
RCS file: /cvsroot/tora/tora/topiechart.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** topiechart.cpp 12 Feb 2003 20:17:47 -0000 1.23
--- topiechart.cpp 15 Feb 2003 13:40:43 -0000 1.24
***************
*** 194,198 ****
sizstr.sprintf("%0.1f",100*(*j)/tot);
else
! sizstr=QString::number(*j);
sizstr+=Postfix;
}
--- 194,198 ----
sizstr.sprintf("%0.1f",100*(*j)/tot);
else
! sizstr=toQValue::formatNumber(*j);
sizstr+=Postfix;
}
***************
*** 234,238 ****
sizstr.sprintf("%0.1f",100*(*j)/tot);
else
! sizstr=QString::number(*j);
sizstr+=Postfix;
}
--- 234,238 ----
sizstr.sprintf("%0.1f",100*(*j)/tot);
else
! sizstr=toQValue::formatNumber(*j);
sizstr+=Postfix;
}
Index: utils.cpp
===================================================================
RCS file: /cvsroot/tora/tora/utils.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** utils.cpp 13 Feb 2003 13:05:14 -0000 1.134
--- utils.cpp 15 Feb 2003 13:40:43 -0000 1.135
***************
*** 853,858 ****
if (pos>=0)
t+=filter.mid(pos,len);
! else
! t+=QString::fromLatin1(".sql");
}
return t;
--- 853,861 ----
if (pos>=0)
t+=filter.mid(pos,len);
! else {
! QFile file(t);
! if (!file.exists())
! t+=QString::fromLatin1(".sql");
! }
}
return t;
|
|
From: <hp...@us...> - 2003-02-15 13:01:11
|
Update of /cvsroot/tora/tora In directory sc8-pr-cvs1:/tmp/cvs-serv16583 Modified Files: otlv4.h Log Message: Index: otlv4.h =================================================================== RCS file: /cvsroot/tora/tora/otlv4.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** otlv4.h 15 Feb 2003 11:59:36 -0000 1.9 --- otlv4.h 15 Feb 2003 13:01:01 -0000 1.10 *************** *** 1,5 **** ! // ! // Oracle, ODBC and DB2/CLI Template Library, Version 4.0.1, ! // Copyright (C) Sergei Kuchin, 1996,2001 // Author: Sergei Kuchin // This library is free software. Permission to use, copy, --- 1,5 ---- ! // ============================================================== ! // Oracle, ODBC and DB2/CLI Template Library, Version 4.0.41, ! // Copyright (C) Sergei Kuchin, 1996,2002 // Author: Sergei Kuchin [...4737 lines suppressed...] protected: \ otl_stream* stream; \ *************** *** 12311,12318 **** #endif ! // #ifdef OTL_ORA_TEXT_ON ! // #undef OTL_ORA_TEXT_ON ! // #undef text ! // #endif #endif --- 13892,13898 ---- #endif ! #if defined(OTL_ORA_TEXT_ON)&&defined(text) ! #undef text ! #endif #endif |
|
From: <hp...@us...> - 2003-02-15 11:59:40
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv28737
Modified Files:
NEWS otlv4.h toconnection.h tonewconnection.cpp
tooracleconnection.cpp tooracleextract.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.824
retrieving revision 1.825
diff -C2 -d -r1.824 -r1.825
*** NEWS 13 Feb 2003 14:42:27 -0000 1.824
--- NEWS 15 Feb 2003 11:59:36 -0000 1.825
***************
*** 1,4 ****
--- 1,7 ----
1.3.10:
+ 2003-02-14: Change password when it has expired.
+ 2003-02-14: Get password from new connection instead of the password editor in new connections.
+ 2003-02-14: Fixed problem with getting sizing in oracle extractor.
2003-02-13: Fixed problem with connectionhistory.
2003-02-13: Format BLOB:s as hex when reading.
Index: otlv4.h
===================================================================
RCS file: /cvsroot/tora/tora/otlv4.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** otlv4.h 7 Oct 2002 18:58:22 -0000 1.8
--- otlv4.h 15 Feb 2003 11:59:36 -0000 1.9
***************
*** 6804,6807 ****
--- 6804,6829 ----
}
+ int change_password
+ (const char* userid,
+ const char* password,
+ const char* newpass)
+ {int status;
+
+ if(!attached)return 0;
+
+ status=OCIPasswordChange
+ (svchp,
+ errhp,
+ OTL_RCAST(text*,OTL_CCAST(char*,userid)),
+ strlen(userid),
+ OTL_RCAST(text*,OTL_CCAST(char*,password)),
+ strlen(password),
+ OTL_RCAST(text*,OTL_CCAST(char*,newpass)),
+ strlen(newpass),
+ OTL_SCAST(ub4,OCI_DEFAULT));
+ if(status)return 0;
+ return 1;
+ }
+
int cancel(void)
{int status;
***************
*** 8556,8559 ****
--- 8578,8600 ----
++throw_count;
if(throw_count>1)return;
+ #if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON)
+ if(STD_NAMESPACE_PREFIX uncaught_exception())return;
+ #endif
+ throw otl_exception(connect_struct);
+ }
+ }
+
+ void change_password
+ (const char* userid,
+ const char* password,
+ const char* newpass)
+ {
+ retcode=connect_struct.change_password
+ (userid,password,newpass);
+ if(!retcode) {
+ #if 0
+ ++throw_count;
+ if(throw_count>1)return;
+ #endif
#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON)
if(STD_NAMESPACE_PREFIX uncaught_exception())return;
Index: toconnection.h
===================================================================
RCS file: /cvsroot/tora/tora/toconnection.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** toconnection.h 4 Feb 2003 21:23:55 -0000 1.53
--- toconnection.h 15 Feb 2003 11:59:36 -0000 1.54
***************
*** 621,624 ****
--- 621,628 ----
const QString &password() const
{ return Password; }
+ /** Change password of connection.
+ */
+ void setPassword(const QString &pwd)
+ { Password=pwd; }
/** Get host of connection.
*/
Index: tonewconnection.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tonewconnection.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** tonewconnection.cpp 13 Feb 2003 14:42:30 -0000 1.42
--- tonewconnection.cpp 15 Feb 2003 11:59:36 -0000 1.43
***************
*** 215,224 ****
toTool::globalSetConfig(CONF_USER,Username->text());
QString pass;
- if (toTool::globalConfig(CONF_SAVE_PWD,DEFAULT_SAVE_PWD)!=DEFAULT_SAVE_PWD)
- pass=Password->text();
- else
- pass=DEFAULT_SAVE_PWD;
- toTool::globalSetConfig(CONF_PASSWORD,toObfuscate(pass));
- toTool::globalSetConfig(CONF_DATABASE,Database->currentText());
QString host;
if (SqlNet->isHidden())
--- 215,218 ----
***************
*** 258,261 ****
--- 252,264 ----
}
}
+
+ if (toTool::globalConfig(CONF_SAVE_PWD,DEFAULT_SAVE_PWD)!=DEFAULT_SAVE_PWD)
+ pass=retCon->password();
+ else
+ pass=DEFAULT_SAVE_PWD;
+ toTool::globalSetConfig(CONF_PASSWORD,toObfuscate(pass));
+ toTool::globalSetConfig(CONF_DATABASE,Database->currentText());
+ toTool::globalSetConfig(CONF_PASSWORD,toObfuscate(retCon->password()));
+
new QListViewItem(Previous,NULL,
Provider->currentText(),
***************
*** 263,267 ****
Database->currentText(),
Username->text(),
! pass);
historySave();
return retCon;
--- 266,270 ----
Database->currentText(),
Username->text(),
! retCon->password());
historySave();
return retCon;
Index: tooracleconnection.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tooracleconnection.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** tooracleconnection.cpp 13 Feb 2003 14:42:30 -0000 1.70
--- tooracleconnection.cpp 15 Feb 2003 11:59:36 -0000 1.71
***************
*** 54,57 ****
--- 54,58 ----
#include <qcheckbox.h>
#include <qfile.h>
+ #include <qinputdialog.h>
#include <qlineedit.h>
#include <qpushbutton.h>
***************
*** 916,929 ****
else if (mode==QString::fromLatin1("SYS_DBA"))
session_mode=OCI_SYSDBA;
! conn=new otl_connect;
! conn->set_stream_pool_size(max(toTool::globalConfig(CONF_OPEN_CURSORS,
! DEFAULT_OPEN_CURSORS).toInt(),1));
! if(!sqlNet)
! conn->server_attach();
! else
! conn->server_attach(connection().database().utf8());
! QCString user=connection().user().utf8();
! QCString pass=connection().password().utf8();
! conn->session_begin(user.isEmpty()?"":(const char *)user,pass.isEmpty()?"":(const char *)pass,0,session_mode);
} catch (const otl_exception &exc) {
if (!sqlNet) {
--- 917,967 ----
else if (mode==QString::fromLatin1("SYS_DBA"))
session_mode=OCI_SYSDBA;
! do {
! conn=new otl_connect;
! conn->set_stream_pool_size(max(toTool::globalConfig(CONF_OPEN_CURSORS,
! DEFAULT_OPEN_CURSORS).toInt(),1));
! if(!sqlNet)
! conn->server_attach();
! else
! conn->server_attach(connection().database().utf8());
! QCString user=connection().user().utf8();
! QCString pass=connection().password().utf8();
! try {
! conn->session_begin(user.isEmpty()?"":(const char *)user,pass.isEmpty()?"":(const char *)pass,0,session_mode);
! } catch(const otl_exception &exc) {
! if (toThread::mainThread()&&exc.code==28001) {
! bool ok=false;
! QString newpass=QInputDialog::getText(qApp->translate("toOracleConnection","Password expired"),
! qApp->translate("toOracleConnection","Enter new password"),
! QLineEdit::Password,
! QString::null,
! &ok,
! toMainWidget());
! if (ok) {
! QString newpass2=QInputDialog::getText(qApp->translate("toOracleConnection","Password expired"),
! qApp->translate("toOracleConnection","Enter password again for confirmation"),
! QLineEdit::Password,
! QString::null,
! &ok,
! toMainWidget());
! if (ok) {
! if (newpass2!=newpass)
! throw qApp->translate("toOracleConnection","The two passwords doesn't match");
! QCString nputf=newpass.utf8();
! conn->change_password(user.isEmpty()?"":(const char *)user,
! pass.isEmpty()?"":(const char *)pass,
! newpass.isEmpty()?"":(const char *)nputf);
! connection().setPassword(newpass);
! delete conn;
! conn=NULL;
! } else
! throw exc;
! } else {
! throw exc;
! }
! } else
! throw exc;
! }
! } while(!conn);
} catch (const otl_exception &exc) {
if (!sqlNet) {
Index: tooracleextract.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tooracleextract.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** tooracleextract.cpp 12 Feb 2003 20:17:47 -0000 1.35
--- tooracleextract.cpp 15 Feb 2003 11:59:36 -0000 1.36
***************
*** 7423,7429 ****
static toSQL SQLSetSizing("toOracleExtract:SetSizing",
! "SELECT db_block_size FROM v$parameter WHERE name = 'db_block_size'",
"Get information about block sizes from alloced space, same columns");
void toOracleExtract::initialize(toExtract &ext) const
{
--- 7423,7445 ----
static toSQL SQLSetSizing("toOracleExtract:SetSizing",
! "SELECT value FROM v$parameter WHERE name = 'db_block_size'",
"Get information about block sizes from alloced space, same columns");
+ static toSQL SQLSetSizingFallback("toOracleExtract:SetSizingFallback",
+ "SELECT bytes/blocks/1024 AS block_size\n"
+ " FROM user_free_space\n"
+ " WHERE bytes IS NOT NULL\n"
+ " AND blocks IS NOT NULL\n"
+ " AND ROWNUM < 2",
+ "Get information about block sizes, same columns");
+
+ static toSQL SQLSetSizingFallback2("toOracleExtract:SetSizingFallback2",
+ "SELECT bytes/blocks/1024 AS block_size\n"
+ " FROM user_segments\n"
+ " WHERE bytes IS NOT NULL\n"
+ " AND blocks IS NOT NULL\n"
+ " AND ROWNUM < 2",
+ "Get information about block sizes, same columns");
+
void toOracleExtract::initialize(toExtract &ext) const
{
***************
*** 7438,7443 ****
ext.setState("Segments",DbaSegments);
! toQList ret=toQuery::readQueryNull(CONNECTION,SQLSetSizing);
! ext.setBlockSize(toShift(ret).toInt());
}
--- 7454,7466 ----
ext.setState("Segments",DbaSegments);
! try {
! toQList ret=toQuery::readQueryNull(CONNECTION,SQLSetSizing);
! ext.setBlockSize(toShift(ret).toInt());
! } catch(...) {
! toQList ret=toQuery::readQueryNull(CONNECTION,SQLSetSizingFallback);
! if (ret.size()==0)
! ret=toQuery::readQueryNull(CONNECTION,SQLSetSizingFallback2);
! ext.setBlockSize(toShift(ret).toInt());
! }
}
|
|
From: <hp...@us...> - 2003-02-13 14:42:36
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv15770
Modified Files:
NEWS todefaultkeywords.h tonewconnection.cpp
tooracleconnection.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.823
retrieving revision 1.824
diff -C2 -d -r1.823 -r1.824
*** NEWS 13 Feb 2003 13:05:13 -0000 1.823
--- NEWS 13 Feb 2003 14:42:27 -0000 1.824
***************
*** 1,4 ****
--- 1,6 ----
1.3.10:
+ 2003-02-13: Fixed problem with connectionhistory.
+ 2003-02-13: Format BLOB:s as hex when reading.
2003-02-13: Check if tools are supported on a database when creating windows.
2003-02-13: Fixed problem with non Oracle databases and worksheets.
Index: todefaultkeywords.h
===================================================================
RCS file: /cvsroot/tora/tora/todefaultkeywords.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** todefaultkeywords.h 11 Feb 2003 22:18:26 -0000 1.12
--- todefaultkeywords.h 13 Feb 2003 14:42:30 -0000 1.13
***************
*** 740,743 ****
--- 740,744 ----
"VALIDATE",
"VALIDATION",
+ "VALUES",
"VARCHAR",
"VARCHAR2",
Index: tonewconnection.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tonewconnection.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** tonewconnection.cpp 3 Feb 2003 22:12:44 -0000 1.41
--- tonewconnection.cpp 13 Feb 2003 14:42:30 -0000 1.42
***************
*** 276,330 ****
}
void toNewConnection::historySave(void) {
! int siz=toTool::globalConfig(CONF_CONNECT_SIZE,DEFAULT_CONNECT_SIZE).toInt();
! int i=0;
! int j=0;
! int oldHist=toTool::globalConfig(CONF_CONNECT_CURRENT,0).toInt();
!
! for(QListViewItem *item=Previous->firstChild();i<oldHist;item=(item?item=item->nextSibling():0)) {
! QCString path=CONF_CONNECT_HISTORY;
! path+=":";
! path+=QString::number(i).latin1();
!
! QCString tmp=path;
! tmp+=CONF_PROVIDER;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(0));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_HOST;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(1));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_DATABASE;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(2));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_USER;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(3));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_PASSWORD;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,toObfuscate(item->text(4)));
! else
! toTool::globalEraseConfig(tmp);
! i++;
! if (i<siz&&item)
! j++;
! }
! toTool::globalSetConfig(CONF_CONNECT_CURRENT,QString::number(j));
! toTool::saveConfig();
}
--- 276,329 ----
}
void toNewConnection::historySave(void) {
! int siz=toTool::globalConfig(CONF_CONNECT_SIZE,DEFAULT_CONNECT_SIZE).toInt();
! int i=0;
! int j=0;
! for(QListViewItem *item=Previous->firstChild();i<siz;item=(item?item=item->nextSibling():0)) {
! QCString path=CONF_CONNECT_HISTORY;
! path+=":";
! path+=QString::number(i).latin1();
!
! QCString tmp=path;
! tmp+=CONF_PROVIDER;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(0));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_HOST;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(1));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_DATABASE;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(2));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_USER;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,item->text(3));
! else
! toTool::globalEraseConfig(tmp);
!
! tmp=path;
! tmp+=CONF_PASSWORD;
! if (i<siz&&item)
! toTool::globalSetConfig(tmp,toObfuscate(item->text(4)));
! else
! toTool::globalEraseConfig(tmp);
!
! i++;
! if (i<siz&&item)
! j++;
! }
! toTool::globalSetConfig(CONF_CONNECT_CURRENT,QString::number(j));
! toTool::saveConfig();
}
Index: tooracleconnection.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tooracleconnection.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** tooracleconnection.cpp 11 Feb 2003 00:43:01 -0000 1.69
--- tooracleconnection.cpp 13 Feb 2003 14:42:30 -0000 1.70
***************
*** 294,298 ****
}
buffer[data.len()]=0;
! QString buf(QString::fromUtf8(buffer));
delete[] buffer;
Running=false;
--- 294,308 ----
}
buffer[data.len()]=0;
! QString buf;
! if (dsc->ftype==otl_var_clob)
! buf=QString::fromUtf8(buffer);
! else {
! buf.fill('0',data.len()*2);
! QString t;
! for(int i=0;i<data.len();i++) {
! t.sprintf("%02x",((unsigned int)buffer[i])%0xff);
! buf.replace(i*2,2,t);
! }
! }
delete[] buffer;
Running=false;
|
|
From: <hp...@us...> - 2003-02-13 13:05:18
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv9352
Modified Files:
NEWS totool.cpp toworksheet.cpp utils.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.822
retrieving revision 1.823
diff -C2 -d -r1.822 -r1.823
*** NEWS 12 Feb 2003 20:17:43 -0000 1.822
--- NEWS 13 Feb 2003 13:05:13 -0000 1.823
***************
*** 1,2 ****
--- 1,8 ----
+ 1.3.10:
+
+ 2003-02-13: Check if tools are supported on a database when creating windows.
+ 2003-02-13: Fixed problem with non Oracle databases and worksheets.
+ 2003-02-13: Updated to new version of OTL.
+
1.3.9.1: Released 2003-02-12
Index: totool.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totool.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** totool.cpp 12 Feb 2003 20:17:49 -0000 1.70
--- totool.cpp 13 Feb 2003 13:05:14 -0000 1.71
***************
*** 197,200 ****
--- 197,202 ----
toMain *main=(toMain *)qApp->mainWidget();
try {
+ if (!canHandle(main->currentConnection()))
+ throw QString("The tool %1 doesn't support the current database").arg(name());
QWidget *newWin=toolWindow(main->workspace(),main->currentConnection());
Index: toworksheet.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toworksheet.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** toworksheet.cpp 12 Feb 2003 20:17:51 -0000 1.187
--- toworksheet.cpp 13 Feb 2003 13:05:14 -0000 1.188
***************
*** 303,306 ****
--- 303,310 ----
Resources->changeParams(address);
+
+ QString sql=toSQL::string(TOSQL_LONGOPS,connection());
+ sql+=" AND b.SQL_Address||':'||b.SQL_Hash_Value = :addr<char[100]>";
+ LongOps->setSQL(sql);
LongOps->changeParams(address);
} TOCATCH
***************
*** 392,399 ****
ResourceSplitter=new QSplitter(Vertical,ResultTab);
Resources=new toResultResources(ResourceSplitter);
LongOps=new toResultLong(ResourceSplitter);
! QString sql=toSQL::string(TOSQL_LONGOPS,connection());
! sql+=" AND b.SQL_Address||':'||b.SQL_Hash_Value = :addr<char[100]>";
! LongOps->setSQL(sql);
Visualize=new toVisualize(Result,ResultTab);
ResultTab->addTab(Visualize,tr("&Visualize"));
--- 396,402 ----
ResourceSplitter=new QSplitter(Vertical,ResultTab);
Resources=new toResultResources(ResourceSplitter);
+
LongOps=new toResultLong(ResourceSplitter);
!
Visualize=new toVisualize(Result,ResultTab);
ResultTab->addTab(Visualize,tr("&Visualize"));
Index: utils.cpp
===================================================================
RCS file: /cvsroot/tora/tora/utils.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** utils.cpp 11 Feb 2003 22:18:48 -0000 1.133
--- utils.cpp 13 Feb 2003 13:05:14 -0000 1.134
***************
*** 594,598 ****
if (bar) {
toMainWidget()->moveToolBar(bar,place);
! bar->setStretchableWidget(container,TO_KDE_TOOLBAR_WIDGET);
}
}
--- 594,598 ----
if (bar) {
toMainWidget()->moveToolBar(bar,place);
! bar->setStretchableWidget(container);
}
}
|
|
From: <hp...@us...> - 2003-02-12 20:18:03
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv23448
Modified Files:
NEWS toconf.h tolinechart.cpp tomain.cpp tooracleextract.cpp
topiechart.cpp torollback.cpp torollback.h tosqlparse.cpp
totool.cpp toworksheet.cpp
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.821
retrieving revision 1.822
diff -C2 -d -r1.821 -r1.822
*** NEWS 11 Feb 2003 23:16:17 -0000 1.821
--- NEWS 12 Feb 2003 20:17:43 -0000 1.822
***************
*** 1,4 ****
! 1.3.9.1: Released 2003-02-11
2003-02-11: Make it posible to view execution plan etc when recalling logged results.
2003-02-11: Recall log results by clicking into logging list of worksheet.
--- 1,12 ----
! 1.3.9.1: Released 2003-02-12
+ 2003-02-12: Added option to disable snapshot too old detection (Disabled by default).
+ 2003-02-12: Fixed indent problem with before mentioned case.
+ 2003-02-12: Fixed case problem in select sql parse.
+ 2003-02-12: Don't need resize workaround for Qt 3.1 anymore.
+ 2003-02-12: Added buttons for traversing previous entries.
+ 2003-02-12: Added windows legacy bindings for copy/paste/delete.
+ 2003-02-12: Get block size from parameters not alloced/free space (Much faster).
+ 2003-02-12: Changed version to 1.3.9.1.
2003-02-11: Make it posible to view execution plan etc when recalling logged results.
2003-02-11: Recall log results by clicking into logging list of worksheet.
Index: toconf.h
===================================================================
RCS file: /cvsroot/tora/tora/toconf.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** toconf.h 10 Feb 2003 23:11:42 -0000 1.98
--- toconf.h 12 Feb 2003 20:17:46 -0000 1.99
***************
*** 157,161 ****
#endif
// Version of TOra, must also change rpm files
! #define TOVERSION "1.3.10"
// Stable or development version of TOra
#define TOTYPE "DEVELOP"
--- 157,161 ----
#endif
// Version of TOra, must also change rpm files
! #define TOVERSION "1.3.9.1"
// Stable or development version of TOra
#define TOTYPE "DEVELOP"
Index: tolinechart.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tolinechart.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** tolinechart.cpp 24 Oct 2002 20:28:25 -0000 1.41
--- tolinechart.cpp 12 Feb 2003 20:17:46 -0000 1.42
***************
*** 751,755 ****
toMainWidget()->windowsMenu();
! #if 1
// This is a really ugly workaround for a Qt layout bug
QWidget *tmp=NULL;
--- 751,755 ----
toMainWidget()->windowsMenu();
! #if QT_VERSION < 0x030100
// This is a really ugly workaround for a Qt layout bug
QWidget *tmp=NULL;
Index: tomain.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tomain.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** tomain.cpp 10 Feb 2003 23:11:45 -0000 1.159
--- tomain.cpp 12 Feb 2003 20:17:46 -0000 1.160
***************
*** 245,254 ****
EditMenu->insertItem(tr("&Options..."),TO_EDIT_OPTIONS);
- #if 0 // Doesn't work and I don't understand why
QAccel *accel=new QAccel(this);
! accel->connectItem(Key_Insert|CTRL,this,SLOT(copyButton));
! accel->connectItem(Key_Delete|SHIFT,this,SLOT(cutButton));
! accel->connectItem(Key_Insert|SHIFT,this,SLOT(pasteButton));
! #endif
EditMenu->setAccel(Key_Z|CTRL,TO_EDIT_UNDO);
--- 245,252 ----
EditMenu->insertItem(tr("&Options..."),TO_EDIT_OPTIONS);
QAccel *accel=new QAccel(this);
! accel->connectItem(accel->insertItem(Key_Insert|CTRL),this,SLOT(copyButton()));
! accel->connectItem(accel->insertItem(Key_Delete|SHIFT),this,SLOT(cutButton()));
! accel->connectItem(accel->insertItem(Key_Insert|SHIFT),this,SLOT(pasteButton()));
EditMenu->setAccel(Key_Z|CTRL,TO_EDIT_UNDO);
Index: tooracleextract.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tooracleextract.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** tooracleextract.cpp 6 Feb 2003 22:34:50 -0000 1.34
--- tooracleextract.cpp 12 Feb 2003 20:17:47 -0000 1.35
***************
*** 7423,7438 ****
static toSQL SQLSetSizing("toOracleExtract:SetSizing",
! "SELECT block_size\n"
! " FROM (SELECT bytes/blocks/1024 AS block_size\n"
! " FROM user_segments\n"
! " WHERE bytes IS NOT NULL\n"
! " AND blocks IS NOT NULL\n"
! " UNION\n"
! " SELECT bytes/blocks/1024 AS block_size\n"
! " FROM user_free_space\n"
! " WHERE bytes IS NOT NULL\n"
! " AND blocks IS NOT NULL)\n"
! " WHERE rownum < 2",
! "Get information about block sizes, same columns");
void toOracleExtract::initialize(toExtract &ext) const
--- 7423,7428 ----
static toSQL SQLSetSizing("toOracleExtract:SetSizing",
! "SELECT db_block_size FROM v$parameter WHERE name = 'db_block_size'",
! "Get information about block sizes from alloced space, same columns");
void toOracleExtract::initialize(toExtract &ext) const
Index: topiechart.cpp
===================================================================
RCS file: /cvsroot/tora/tora/topiechart.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** topiechart.cpp 9 Sep 2002 07:03:45 -0000 1.22
--- topiechart.cpp 12 Feb 2003 20:17:47 -0000 1.23
***************
*** 92,96 ****
toMainWidget()->windowsMenu();
! #if 1
// This is a really ugly workaround for a Qt layout bug
QWidget *tmp=NULL;
--- 92,96 ----
toMainWidget()->windowsMenu();
! #if QT_VERSION < 0x030100
// This is a really ugly workaround for a Qt layout bug
QWidget *tmp=NULL;
Index: torollback.cpp
===================================================================
RCS file: /cvsroot/tora/tora/torollback.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** torollback.cpp 3 Feb 2003 22:12:45 -0000 1.66
--- torollback.cpp 12 Feb 2003 20:17:48 -0000 1.67
***************
*** 96,106 ****
--- 96,109 ----
#define CONF_NEED_TWO "NeedTwo"
#define CONF_ALIGN_LEFT "AlignLeft"
+ #define CONF_OLD_ENABLE "OldEnable"
class toRollbackPrefs : public QGroupBox,public toSettingTab
{
+ QCheckBox *OldEnable;
QCheckBox *NoExec;
QCheckBox *NeedRead;
QCheckBox *NeedTwo;
QCheckBox *AlignLeft;
+
toTool *Tool;
***************
*** 115,134 ****
setTitle(qApp->translate("toRollbackPrefs","Rollback Tool" ));
NoExec=new QCheckBox(this,"NoCopy");
NoExec->setText(qApp->translate("toRollbackPrefs","&Restart reexecuted statements" ));
QToolTip::add(NoExec,qApp->translate("toRollbackPrefs","Start statements again that have been reexecuted."));
NeedRead=new QCheckBox(this,"Needread");
NeedRead->setText(qApp->translate("toRollbackPrefs","&Must read buffers" ));
QToolTip::add(NeedRead,qApp->translate("toRollbackPrefs","Don't display statements that have not read buffers."));
NeedTwo=new QCheckBox(this,"NeedTwo");
NeedTwo->setText(qApp->translate("toRollbackPrefs","&Exclude first appearance" ));
QToolTip::add(NeedTwo,qApp->translate("toRollbackPrefs","A statement must be visible at least two consecutive polls to be displayed."));
! AlignLeft=new QCheckBox(this,"AlignLeft");
! AlignLeft->setText(qApp->translate("toRollbackPrefs","&Disregard start extent." ));
! QToolTip::add(AlignLeft,qApp->translate("toRollbackPrefs","Always start from the left border when displaying extent usage."));
!
if (!tool->config(CONF_NO_EXEC,"Yes").isEmpty())
NoExec->setChecked(true);
--- 118,151 ----
setTitle(qApp->translate("toRollbackPrefs","Rollback Tool" ));
+ OldEnable=new QCheckBox(this,"OldEnable");
+ OldEnable->setText(qApp->translate("toRollbackPrefs","&Enable snapshot too old detection." ));
+ QToolTip::add(OldEnable,qApp->translate("toRollbackPrefs","Enable snapshot too old detection, will put load on large databases."));
+
+ AlignLeft=new QCheckBox(this,"AlignLeft");
+ AlignLeft->setText(qApp->translate("toRollbackPrefs","&Disregard start extent." ));
+ AlignLeft->setEnabled(false);
+ connect(OldEnable,SIGNAL(toggled(bool)),AlignLeft,SLOT(setEnabled(bool)));
+ QToolTip::add(AlignLeft,qApp->translate("toRollbackPrefs","Always start from the left border when displaying extent usage."));
+
NoExec=new QCheckBox(this,"NoCopy");
NoExec->setText(qApp->translate("toRollbackPrefs","&Restart reexecuted statements" ));
+ NoExec->setEnabled(false);
+ connect(OldEnable,SIGNAL(toggled(bool)),NoExec,SLOT(setEnabled(bool)));
QToolTip::add(NoExec,qApp->translate("toRollbackPrefs","Start statements again that have been reexecuted."));
NeedRead=new QCheckBox(this,"Needread");
NeedRead->setText(qApp->translate("toRollbackPrefs","&Must read buffers" ));
+ NeedRead->setEnabled(false);
+ connect(OldEnable,SIGNAL(toggled(bool)),NeedRead,SLOT(setEnabled(bool)));
QToolTip::add(NeedRead,qApp->translate("toRollbackPrefs","Don't display statements that have not read buffers."));
NeedTwo=new QCheckBox(this,"NeedTwo");
NeedTwo->setText(qApp->translate("toRollbackPrefs","&Exclude first appearance" ));
+ NeedTwo->setEnabled(false);
+ connect(OldEnable,SIGNAL(toggled(bool)),NeedTwo,SLOT(setEnabled(bool)));
QToolTip::add(NeedTwo,qApp->translate("toRollbackPrefs","A statement must be visible at least two consecutive polls to be displayed."));
! if (!tool->config(CONF_OLD_ENABLE,"").isEmpty())
! OldEnable->setChecked(true);
if (!tool->config(CONF_NO_EXEC,"Yes").isEmpty())
NoExec->setChecked(true);
***************
*** 147,150 ****
--- 164,168 ----
Tool->setConfig(CONF_NEED_TWO,NeedTwo->isChecked()?"Yes":"");
Tool->setConfig(CONF_ALIGN_LEFT,AlignLeft->isChecked()?"Yes":"");
+ Tool->setConfig(CONF_OLD_ENABLE,OldEnable->isChecked()?"Yes":"");
}
***************
*** 610,613 ****
--- 628,638 ----
toolbar->addSeparator();
+ QToolButton *enableOld=new QToolButton(toolbar);
+ enableOld->setToggleButton(true);
+ enableOld->setIconSet(QIconSet(QPixmap((const char **)torollback_xpm)));
+ connect(enableOld,SIGNAL(toggled(bool)),this,SLOT(enableOld(bool)));
+ QToolTip::add(enableOld,tr("Enable snapshot too old detection."));
+ toolbar->addSeparator();
+
OnlineButton=new QToolButton(QPixmap((const char **)online_xpm),
tr("Take segment online"),
***************
*** 651,661 ****
QTabWidget *tab=new QTabWidget(splitter,"TabWidget");
- QSplitter *horsplit=new QSplitter(Horizontal,splitter);
- tab->addTab(horsplit,tr("Open Cursors"));
-
TransactionUsers=new toResultLong(false,false,toQuery::Background,tab);
tab->addTab(TransactionUsers,tr("Transaction Users"));
TransactionUsers->setSQL(SQLTransactionUsers);
Statements=new toRollbackOpen(horsplit);
Statements->setSelectionMode(QListView::Single);
--- 676,686 ----
QTabWidget *tab=new QTabWidget(splitter,"TabWidget");
TransactionUsers=new toResultLong(false,false,toQuery::Background,tab);
tab->addTab(TransactionUsers,tr("Transaction Users"));
TransactionUsers->setSQL(SQLTransactionUsers);
+ QSplitter *horsplit=new QSplitter(Horizontal,splitter);
+ tab->addTab(horsplit,tr("Open Cursors"));
+
Statements=new toRollbackOpen(horsplit);
Statements->setSelectionMode(QListView::Single);
***************
*** 673,676 ****
--- 698,706 ----
this,SLOT(windowActivated(QWidget *)));
+ if (!RollbackTool.config(CONF_OLD_ENABLE,"").isEmpty())
+ enableOld->setOn(true);
+ else
+ Statements->setEnabled(false);
+
refresh();
***************
*** 729,744 ****
break;
}
! item=Statements->selectedItem();
! if (item)
! current=item->text(4);
! else
! current="";
! Statements->refresh();
! if (!current.isEmpty())
! for (item=Statements->firstChild();item;item=item->nextSibling())
! if (item->text(4)==current) {
! Statements->setSelected(item,true);
! break;
! }
TransactionUsers->refresh();
}
--- 759,776 ----
break;
}
! if (Statements->isEnabled()) {
! item=Statements->selectedItem();
! if (item)
! current=item->text(4);
! else
! current="";
! Statements->refresh();
! if (!current.isEmpty())
! for (item=Statements->firstChild();item;item=item->nextSibling())
! if (item->text(4)==current) {
! Statements->setSelected(item,true);
! break;
! }
! }
TransactionUsers->refresh();
}
***************
*** 839,841 ****
--- 871,878 ----
refresh();
} TOCATCH
+ }
+
+ void toRollback::enableOld(bool ena)
+ {
+ Statements->setEnabled(ena);
}
Index: torollback.h
===================================================================
RCS file: /cvsroot/tora/tora/torollback.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** torollback.h 14 Jan 2002 09:36:43 -0000 1.20
--- torollback.h 12 Feb 2003 20:17:48 -0000 1.21
***************
*** 93,96 ****
--- 93,97 ----
void changeRefresh(const QString &str);
+ void enableOld(bool);
void refresh(void);
void online(void);
Index: tosqlparse.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tosqlparse.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** tosqlparse.cpp 7 Oct 2002 19:27:11 -0000 1.38
--- tosqlparse.cpp 12 Feb 2003 20:17:49 -0000 1.39
***************
*** 87,298 ****
}
! int main(int argc,char **argv) {
QString res="\n"
! "BEGIN\n"
! "IF 1 == 1 THEN\n"
! "NULL;\n"
! "END IF;\n"
! "IF appraisal IS NULL THEN\n"
! "NULL;\n"
[...1122 lines suppressed...]
--- 1248,1253 ----
level==0&&
stat.subTokens().begin()!=stat.subTokens().end()&&
! (*stat.subTokens().rbegin()).String==(";"))
! ret+=("\n");
} else if (!comment.isEmpty()) {
ret+=IndentComment(Settings.CommentColumn,current,comment,true);
***************
*** 1270,1274 ****
pos--;
}
! return ret.mid(0,pos)+QString::fromLatin1("\n");
}
--- 1276,1280 ----
pos--;
}
! return ret.mid(0,pos)+("\n");
}
Index: totool.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totool.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** totool.cpp 8 Feb 2003 00:20:03 -0000 1.69
--- totool.cpp 12 Feb 2003 20:17:49 -0000 1.70
***************
*** 222,226 ****
}
! #if 1
// This is a really ugly workaround for a Qt layout bug
QWidget *tmp=NULL;
--- 222,226 ----
}
! #if QT_VERSION < 0x030100
// This is a really ugly workaround for a Qt layout bug
QWidget *tmp=NULL;
Index: toworksheet.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toworksheet.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -C2 -d -r1.186 -r1.187
*** toworksheet.cpp 11 Feb 2003 23:16:20 -0000 1.186
--- toworksheet.cpp 12 Feb 2003 20:17:51 -0000 1.187
***************
*** 60,63 ****
--- 60,64 ----
#endif
+ #include <qaccel.h>
#include <qcheckbox.h>
#include <qcheckbox.h>
***************
*** 102,105 ****
--- 103,108 ----
#include "icons/stop.xpm"
#include "icons/toworksheet.xpm"
+ #include "icons/up.xpm"
+ #include "icons/down.xpm"
#define TO_ID_STATISTICS (toMain::TO_TOOL_MENU_ID+ 0)
***************
*** 478,481 ****
--- 481,495 ----
toolbar->addSeparator();
+ new QToolButton(QPixmap((const char **)up_xpm),
+ tr("Previous log entry"),
+ tr("Previous log entry"),
+ this,SLOT(executePreviousLog()),
+ toolbar);
+ new QToolButton(QPixmap((const char **)down_xpm),
+ tr("Next log entry"),
+ tr("Next log entry"),
+ this,SLOT(executeNextLog()),
+ toolbar);
+ toolbar->addSeparator();
SavedButton=new toPopupButton(QPixmap((const char **)compile_xpm),
***************
*** 610,617 ****
tr("Erase &Log"),this,SLOT(eraseLogButton(void)));
toMainWidget()->menuBar()->insertItem(tr("W&orksheet"),ToolMenu,-1,toToolMenuIndex());
ToolMenu->setItemEnabled(TO_ID_STOP,StopButton->isEnabled());
! ToolMenu->setItemChecked(TO_ID_STATISTICS,
! StatisticButton->isOn());
}
} else {
--- 624,631 ----
tr("Erase &Log"),this,SLOT(eraseLogButton(void)));
+
toMainWidget()->menuBar()->insertItem(tr("W&orksheet"),ToolMenu,-1,toToolMenuIndex());
ToolMenu->setItemEnabled(TO_ID_STOP,StopButton->isEnabled());
! ToolMenu->setItemChecked(TO_ID_STATISTICS,StatisticButton->isOn());
}
} else {
|
|
From: <hp...@us...> - 2003-02-11 23:16:27
|
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv30545
Modified Files:
NEWS toworksheet.cpp toworksheet.h
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.820
retrieving revision 1.821
diff -C2 -d -r1.820 -r1.821
*** NEWS 11 Feb 2003 22:18:19 -0000 1.820
--- NEWS 11 Feb 2003 23:16:17 -0000 1.821
***************
*** 1,4 ****
--- 1,6 ----
1.3.9.1: Released 2003-02-11
+ 2003-02-11: Make it posible to view execution plan etc when recalling logged results.
+ 2003-02-11: Recall log results by clicking into logging list of worksheet.
2003-02-11: Removed include of sstream.
2003-02-11: Made toNull/Unnull use toQValues.
Index: toworksheet.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toworksheet.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** toworksheet.cpp 11 Feb 2003 22:18:46 -0000 1.185
--- toworksheet.cpp 11 Feb 2003 23:16:20 -0000 1.186
***************
*** 441,444 ****
--- 441,446 ----
Logging->addColumn(tr("Duration"));
Logging->setColumnAlignment(3,AlignRight);
+ Logging->setSelectionMode(QListView::Single);
+ connect(Logging,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(executeLog()));
LastLogItem=NULL;
***************
*** 987,991 ****
citem=dynamic_cast<toResultViewItem *>(last);
if (!citem||citem->allText(0)!=sql) {
! Logging->setCurrentItem(item);
Logging->ensureItemVisible(item);
}
--- 989,995 ----
citem=dynamic_cast<toResultViewItem *>(last);
if (!citem||citem->allText(0)!=sql) {
! disconnect(Logging,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(executeLog()));
! Logging->setSelected(item,true);
! connect(Logging,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(executeLog()));
Logging->ensureItemVisible(item);
}
***************
*** 1444,1461 ****
pt=pt->nextSibling();
! toResultViewItem *prev=dynamic_cast<toResultViewItem *>(pt);
! if (prev) {
! Logging->setCurrentItem(prev);
! insertStatement(prev->allText(0));
! if (prev->text(4).isEmpty())
! query(prev->allText(0),false);
! else {
! std::map<int,QWidget *>::iterator i=History.find(prev->text(4).toInt());
! if (i!=History.end()&&(*i).second) {
! Current->hide();
! Current=(*i).second;
! Current->show();
! }
}
}
--- 1448,1481 ----
pt=pt->nextSibling();
! if (pt)
! Logging->setSelected(pt,true);
! }
! }
! void toWorksheet::executeLog(void)
! {
! if (Light)
! return;
!
! Result->stop();
!
! LastLine=LastOffset=-1;
! saveHistory();
!
! QListViewItem *ci=Logging->currentItem();
! toResultViewItem *item=dynamic_cast<toResultViewItem *>(ci);
! if (item) {
! insertStatement(item->allText(0));
!
! if (item->text(4).isEmpty())
! query(item->allText(0),false);
! else {
! std::map<int,QWidget *>::iterator i=History.find(item->text(4).toInt());
! QueryString=item->allText(0);
! changeResult(ResultTab->currentPage());
! if (i!=History.end()&&(*i).second) {
! Current->hide();
! Current=(*i).second;
! Current->show();
}
}
***************
*** 1476,1494 ****
if (item&&item->nextSibling()) {
toResultViewItem *next=dynamic_cast<toResultViewItem *>(item->nextSibling());
! if (next) {
! Logging->setCurrentItem(next);
! insertStatement(next->allText(0));
!
! if (next->text(4).isEmpty())
! query(next->allText(0),false);
! else {
! std::map<int,QWidget *>::iterator i=History.find(next->text(4).toInt());
! if (i!=History.end()&&(*i).second) {
! Current->hide();
! Current=(*i).second;
! Current->show();
! }
! }
! }
}
}
--- 1496,1501 ----
if (item&&item->nextSibling()) {
toResultViewItem *next=dynamic_cast<toResultViewItem *>(item->nextSibling());
! if (next)
! Logging->setSelected(next,true);
}
}
Index: toworksheet.h
===================================================================
RCS file: /cvsroot/tora/tora/toworksheet.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** toworksheet.h 11 Feb 2003 22:18:48 -0000 1.60
--- toworksheet.h 11 Feb 2003 23:16:21 -0000 1.61
***************
*** 171,174 ****
--- 171,175 ----
void executePreviousLog(void);
void executeNextLog(void);
+ void executeLog(void);
void addLog(const QString &sql,const toConnection::exception &result,bool error);
void changeRefresh(const QString &);
|
2 messages has been excluded from this view by a project administrator.