opentrep-svn Mailing List for Open Travel Request Parser
Status: Beta
Brought to you by:
denis_arnaud
Menu
▾
▴
opentrep-svn — Subversion Activity Notification List
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(19) |
Sep
(4) |
Oct
(10) |
Nov
(2) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(3) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
(1) |
Sep
(9) |
Oct
|
Nov
(1) |
Dec
|
| 2011 |
Jan
|
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <den...@us...> - 2011-07-03 19:20:22
|
Revision: 239
http://opentrep.svn.sourceforge.net/opentrep/?rev=239&view=rev
Author: denis_arnaud
Date: 2011-07-03 19:20:16 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
[Packaging][SOCI] SOCI now depends on the multi-threaded version of the Boost libraries.
Modified Paths:
--------------
branches/soci-3.0.0/soci.spec
Modified: branches/soci-3.0.0/soci.spec
===================================================================
--- branches/soci-3.0.0/soci.spec 2011-07-03 16:45:59 UTC (rev 238)
+++ branches/soci-3.0.0/soci.spec 2011-07-03 19:20:16 UTC (rev 239)
@@ -18,7 +18,7 @@
#
Name: soci
Version: 3.0.0
-Release: 19%{?dist}
+Release: 22%{?dist}
Summary: The database access library for C++ programmers
@@ -26,15 +26,18 @@
License: Boost
URL: http://%{name}.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# That patch will be submitted upstream
-Patch0: %{name}-%{version}-gcc44-compatibility.patch
-# That patch will be submitted upstream
-Patch1: %{name}-%{version}-gnu-autotools-compatibility.patch
-# Patch fixing compilation bug (https://bugzilla.redhat.com/show_bug.cgi?id=631175):
-Patch2: %{name}-%{version}-make-tab.patch
-# Patch fixing compilation bug with g++ 4.6 (fixed upstream:
+# This issue has been fixed upstream, e.g., see:
# http://soci.git.sourceforge.net/git/gitweb.cgi?p=soci/soci;a=commitdiff;h=9e467b5a4ab4cdda6cd801fb76b2d853340dc5d7):
-Patch3: %{name}-%{version}-backend-default-constructor.patch
+Patch0: %{name}-%{version}-gcc46-compatibility.patch
+# This patch is being submitted upstream. A decision about whether and how
+# burying headers) should be taken after the release of version 3.1.0):
+Patch1: %{name}-%{version}-buried-headers.patch
+# Just add standard documentation, from upstream documents:
+Patch2: %{name}-%{version}-add-doc.patch
+# This patch is temporary, for the 3.0.0 version, as:
+# * it allows to build cleanly with the GNU Autotools;
+# * whereas upstream now uses CMake.
+Patch3: %{name}-%{version}-gnu-autotools-compatibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -47,36 +50,36 @@
%{?with_mysql:%package mysql
-Summary: MySQL backend for %{name}
+Summary: MySQL back-end for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
BuildRequires: mysql-devel >= 5.0
%description mysql
-This package contains the MySQL backend for SOCI, i.e.,
+This package contains the MySQL back-end for SOCI, i.e.,
dynamic library specific to the MySQL database. If you would like to
use SOCI in your programs with MySQL, you will need to
install %{name}-mysql.}
%{?with_postgresql:%package postgresql
-Summary: PostGreSQL backend for %{name}
+Summary: PostGreSQL back-end for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
BuildRequires: postgresql-devel >= 7.1
%description postgresql
-This package contains the PostGreSQL backend for SOCI, i.e.,
+This package contains the PostGreSQL back-end for SOCI, i.e.,
dynamic library specific to the PostGreSQL database. If you would like
to use SOCI in your programs with PostGreSQL, you will need to
install %{name}-postgresql.}
%{?with_oracle:%package oracle
-Summary: Oracle backend for %{name}
+Summary: Oracle back-end for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description oracle
-This package contains the Oracle backend for SOCI, i.e.,
+This package contains the Oracle back-end for SOCI, i.e.,
dynamic library specific to the Oracle database. If you would like to
use SOCI in your programs with Oracle, you will need to install
%{name}-oracle.}
@@ -94,39 +97,39 @@
programs using %{name}, you will need to install %{name}-devel.
%{?with_mysql:%package mysql-devel
-Summary: MySQL backend for %{name}
+Summary: MySQL back-end for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-mysql = %{version}-%{release}
Requires: mysql-devel >= 5.0
%description mysql-devel
-This package contains the MySQL backend for %{name}, i.e., header
+This package contains the MySQL back-end for %{name}, i.e., header
files and dynamic libraries specific to the MySQL database. If you
would like to develop programs using %{name} and MySQL, you will need
to install %{name}-mysql.}
%{?with_postgresql:%package postgresql-devel
-Summary: PostGreSQL backend for %{name}
+Summary: PostGreSQL back-end for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-postgresql = %{version}-%{release}
Requires: postgresql-devel >= 7.1
%description postgresql-devel
-This package contains the PostGreSQL backend for %{name}, i.e., header
+This package contains the PostGreSQL back-end for %{name}, i.e., header
files and dynamic libraries specific to the PostGreSQL database. If
you would like to develop programs using %{name} and PostGreSQL, you
will need to install %{name}-postgresql.}
%{?with_oracle:%package oracle-devel
-Summary: Oracle backend for %{name}
+Summary: Oracle back-end for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-oracle = %{version}-%{release}
%description oracle-devel
-This package contains the Oracle backend for %{name}, i.e., header
+This package contains the Oracle back-end for %{name}, i.e., header
files and dynamic libraries specific to the Oracle database. If you
would like to develop programs using %{name} and Oracle, you will need
to install %{name}-oracle.}
@@ -150,7 +153,7 @@
%prep
%setup -q
-# Apply the g++ 4.4 compatibility patch
+# Apply the g++ 4.6 compatibility patch
%patch0 -p1
# Rename change-log and license file, so that they comply with
@@ -167,17 +170,17 @@
rm -f doc/._*.html
# Rename the source code directory, so that the files (e.g, header
-# files) can be exported correctly into {_standard_dir}/%{name}
+# files) can be exported correctly into {_standard_dir}/%%{name}
mv src %{name}
-# Apply the GNU Autotools compatibility patch
+# Apply the buried headers patch
%patch1 -p1
-# Apply the patch for the Makefile bug
+# Add standard documentation
%patch2 -p1
-# Apply the patch for compilation error with the backend default constructor
-%patch3 -p0
+# Apply the GNU Autotools compatibility patch
+%patch3 -p1
# Fix some permissions and formats
find ./doc -type f -perm 755 -exec chmod 644 {} \;
@@ -296,8 +299,18 @@
%changelog
+* Sun Jul 03 2011 Denis Arnaud <den...@m4...> - 3.0.0-22
+- Now links with the multi-threaded versions of the Boost libraries
+
+* Mon Apr 25 2011 Denis Arnaud <den...@m4...> - 3.0.0-21
+- Rebuild for Boost-1.46.1-2
+
+* Wed Feb 09 2011 Fedora Release Engineering <re...@li...> - 3.0.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Tue Feb 08 2011 Denis Arnaud <den...@m4...> 3.0.0-19
- Fixed a compilation error with g++ 4.6 on default constructor definition
+- Split the big patch into smaller pieces
* Tue Sep 07 2010 Denis Arnaud <den...@m4...> 3.0.0-18
- Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-07-03 16:46:10
|
Revision: 238
http://opentrep.svn.sourceforge.net/opentrep/?rev=238&view=rev
Author: denis_arnaud
Date: 2011-07-03 16:45:59 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
[Build] Updated the GNU Autotools scripts for the new autoconf version (2.68).
Modified Paths:
--------------
branches/soci-3.0.0/configure.ac
Modified: branches/soci-3.0.0/configure.ac
===================================================================
--- branches/soci-3.0.0/configure.ac 2011-02-09 00:02:20 UTC (rev 237)
+++ branches/soci-3.0.0/configure.ac 2011-07-03 16:45:59 UTC (rev 238)
@@ -43,6 +43,10 @@
;;
esac
+# Set default language to C++
+AC_LANG([C++])
+AC_LANG_CPLUSPLUS
+
# Checks for programs
save_CXXFLAGS="$CXXFLAGS"
AC_PROG_CXX
@@ -53,9 +57,6 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
-# Set default language to C++
-AC_LANG([C++])
-
# Check for exceptions switch
AC_ARG_ENABLE(exceptions,
[AS_HELP_STRING([--enable-exceptions],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-09 00:02:26
|
Revision: 237
http://opentrep.svn.sourceforge.net/opentrep/?rev=237&view=rev
Author: denis_arnaud
Date: 2011-02-09 00:02:20 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] Fixed the manual page.
Modified Paths:
--------------
branches/soci-3.0.0/man/soci-config.1
Modified: branches/soci-3.0.0/man/soci-config.1
===================================================================
--- branches/soci-3.0.0/man/soci-config.1 2011-02-08 23:21:19 UTC (rev 236)
+++ branches/soci-3.0.0/man/soci-config.1 2011-02-09 00:02:20 UTC (rev 237)
@@ -12,7 +12,7 @@
to the .m4 macros for GNU autoconf that are included with \fISOCI\fP.
.
.SH OPTIONS
-.l
+.PP
\fIsoci-config\fP accepts the following options:
.TP 8
.B \-\-version
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-08 23:21:25
|
Revision: 236
http://opentrep.svn.sourceforge.net/opentrep/?rev=236&view=rev
Author: denis_arnaud
Date: 2011-02-08 23:21:19 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] Suppressed an empty line at the end of COPYING.
Modified Paths:
--------------
branches/soci-3.0.0/COPYING
Modified: branches/soci-3.0.0/COPYING
===================================================================
--- branches/soci-3.0.0/COPYING 2011-02-08 21:41:02 UTC (rev 235)
+++ branches/soci-3.0.0/COPYING 2011-02-08 23:21:19 UTC (rev 236)
@@ -21,4 +21,3 @@
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-08 21:41:09
|
Revision: 235
http://opentrep.svn.sourceforge.net/opentrep/?rev=235&view=rev
Author: denis_arnaud
Date: 2011-02-08 21:41:02 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] The RPM specification is no longer generated by configure from an .spec.in template.
Modified Paths:
--------------
branches/soci-3.0.0/configure.ac
branches/soci-3.0.0/soci.spec
Modified: branches/soci-3.0.0/configure.ac
===================================================================
--- branches/soci-3.0.0/configure.ac 2011-02-08 21:36:00 UTC (rev 234)
+++ branches/soci-3.0.0/configure.ac 2011-02-08 21:41:02 UTC (rev 235)
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script
#-------------------------------------------------------------------
AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (C) 2004-2009 Maciej Sobczak <mso...@us...>])
+AC_COPYRIGHT([Copyright (C) 2004-2011 Maciej Sobczak <mso...@us...>])
AC_INIT([SOCI],[3.0.0],[mso...@us...],[soci])
AC_CONFIG_HEADER([soci/config.h])
AC_CONFIG_SRCDIR([soci/core/error.cpp])
@@ -10,10 +10,6 @@
AM_PATH_CPPUNIT(1.10)
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
-# RPM release number
-RPM_RELEASE="16"
-AC_SUBST(RPM_RELEASE)
-
# Shared library versioning
GENERIC_LIBRARY_VERSION="3:0:0"
# | | |
@@ -302,7 +298,6 @@
Makefile
soci-config
soci.pc
- soci.spec
soci/Makefile
soci/core/Makefile
soci/core/test/Makefile
Modified: branches/soci-3.0.0/soci.spec
===================================================================
--- branches/soci-3.0.0/soci.spec 2011-02-08 21:36:00 UTC (rev 234)
+++ branches/soci-3.0.0/soci.spec 2011-02-08 21:41:02 UTC (rev 235)
@@ -16,29 +16,32 @@
#
##
#
-Name: @PACKAGE@
-Version: @VERSION@
-Release: @RPM_RELEASE@%{?dist}
+Name: soci
+Version: 3.0.0
+Release: 19%{?dist}
Summary: The database access library for C++ programmers
Group: System Environment/Libraries
License: Boost
URL: http://%{name}.sourceforge.net
-Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# That patch will be submitted upstream
-Patch0: %{name}-%{version}-@RPM...@-f...
+Patch0: %{name}-%{version}-gcc44-compatibility.patch
# That patch will be submitted upstream
-Patch1: %{name}-%{version}-@RPM...@-f...
+Patch1: %{name}-%{version}-gnu-autotools-compatibility.patch
+# Patch fixing compilation bug (https://bugzilla.redhat.com/show_bug.cgi?id=631175):
+Patch2: %{name}-%{version}-make-tab.patch
+# Patch fixing compilation bug with g++ 4.6 (fixed upstream:
+# http://soci.git.sourceforge.net/git/gitweb.cgi?p=soci/soci;a=commitdiff;h=9e467b5a4ab4cdda6cd801fb76b2d853340dc5d7):
+Patch3: %{name}-%{version}-backend-default-constructor.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
-#BuildRequires: cppunit-devel >= 1.10
BuildRequires: libtool
-#Requires:
%description
-@PACKAGE_NAME@ is a C++ database access library that provides the
+%{name} is a C++ database access library that provides the
illusion of embedding SQL in regular C++ code, staying entirely within
the C++ standard.
@@ -50,9 +53,9 @@
BuildRequires: mysql-devel >= 5.0
%description mysql
-This package contains the MySQL backend for @PACKAGE_NAME@, i.e.,
+This package contains the MySQL backend for SOCI, i.e.,
dynamic library specific to the MySQL database. If you would like to
-use @PACKAGE_NAME@ in your programs with MySQL, you will need to
+use SOCI in your programs with MySQL, you will need to
install %{name}-mysql.}
%{?with_postgresql:%package postgresql
@@ -62,9 +65,9 @@
BuildRequires: postgresql-devel >= 7.1
%description postgresql
-This package contains the PostGreSQL backend for @PACKAGE_NAME@, i.e.,
+This package contains the PostGreSQL backend for SOCI, i.e.,
dynamic library specific to the PostGreSQL database. If you would like
-to use @PACKAGE_NAME@ in your programs with PostGreSQL, you will need to
+to use SOCI in your programs with PostGreSQL, you will need to
install %{name}-postgresql.}
%{?with_oracle:%package oracle
@@ -73,9 +76,9 @@
Requires: %{name} = %{version}-%{release}
%description oracle
-This package contains the Oracle backend for @PACKAGE_NAME@, i.e.,
+This package contains the Oracle backend for SOCI, i.e.,
dynamic library specific to the Oracle database. If you would like to
-use @PACKAGE_NAME@ in your programs with Oracle, you will need to install
+use SOCI in your programs with Oracle, you will need to install
%{name}-oracle.}
@@ -130,7 +133,7 @@
%package doc
-Summary: HTML documentation for the @PACKAGE_NAME@ library
+Summary: HTML documentation for the SOCI library
Group: Documentation
%if 0%{?fedora} >= 10
BuildArch: noarch
@@ -140,8 +143,8 @@
#BuildRequires: doxygen, ghostscript
%description doc
-This package contains the documentation in the HTML format of the @PACKAGE_NAME@
-library. The documentation is the same as at the @PACKAGE_NAME@ web page.
+This package contains the documentation in the HTML format of the SOCI
+library. The documentation is the same as at the SOCI web page.
%prep
@@ -170,6 +173,12 @@
# Apply the GNU Autotools compatibility patch
%patch1 -p1
+# Apply the patch for the Makefile bug
+%patch2 -p1
+
+# Apply the patch for compilation error with the backend default constructor
+%patch3 -p0
+
# Fix some permissions and formats
find ./doc -type f -perm 755 -exec chmod 644 {} \;
chmod -x AUTHORS ChangeLog COPYING NEWS README
@@ -287,6 +296,12 @@
%changelog
+* Tue Feb 08 2011 Denis Arnaud <den...@m4...> 3.0.0-19
+- Fixed a compilation error with g++ 4.6 on default constructor definition
+
+* Tue Sep 07 2010 Denis Arnaud <den...@m4...> 3.0.0-18
+- Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)
+
* Sat Jan 23 2010 Denis Arnaud <den...@m4...> 3.0.0-16
- Added a missing cstring header include for g++-4.4 compatibility
@@ -334,3 +349,4 @@
* Fri Mar 27 2009 Denis Arnaud <den...@m4...> 3.0.0-1
- First RPM release
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-08 21:36:07
|
Revision: 234
http://opentrep.svn.sourceforge.net/opentrep/?rev=234&view=rev
Author: denis_arnaud
Date: 2011-02-08 21:36:00 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] The RPM specification is no longer generated by configure from an .spec.in template.
Added Paths:
-----------
branches/soci-3.0.0/soci.spec
Removed Paths:
-------------
branches/soci-3.0.0/soci.spec.in
Copied: branches/soci-3.0.0/soci.spec (from rev 232, branches/soci-3.0.0/soci.spec.in)
===================================================================
--- branches/soci-3.0.0/soci.spec (rev 0)
+++ branches/soci-3.0.0/soci.spec 2011-02-08 21:36:00 UTC (rev 234)
@@ -0,0 +1,336 @@
+#
+##
+# Default values are --with mysql --with postgresql --without oracle
+# Note that, for Oracle, when enabled, the following options should
+# also be given:
+# --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public
+# --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib
+# If the macros are defined, redefine them with the correct compilation flags.
+%bcond_without mysql
+%bcond_without postgresql
+%bcond_with oracle
+
+%define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1
+%{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public}
+%{!?_with_oracle_libdir: %define _with_oracle_libdir --with-oracle-lib=%{_default_oracle_dir}/lib}
+#
+##
+#
+Name: @PACKAGE@
+Version: @VERSION@
+Release: @RPM_RELEASE@%{?dist}
+
+Summary: The database access library for C++ programmers
+
+Group: System Environment/Libraries
+License: Boost
+URL: http://%{name}.sourceforge.net
+Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz
+# That patch will be submitted upstream
+Patch0: %{name}-%{version}-@RPM...@-f...
+# That patch will be submitted upstream
+Patch1: %{name}-%{version}-@RPM...@-f...
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: boost-devel
+#BuildRequires: cppunit-devel >= 1.10
+BuildRequires: libtool
+#Requires:
+
+%description
+@PACKAGE_NAME@ is a C++ database access library that provides the
+illusion of embedding SQL in regular C++ code, staying entirely within
+the C++ standard.
+
+
+%{?with_mysql:%package mysql
+Summary: MySQL backend for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+BuildRequires: mysql-devel >= 5.0
+
+%description mysql
+This package contains the MySQL backend for @PACKAGE_NAME@, i.e.,
+dynamic library specific to the MySQL database. If you would like to
+use @PACKAGE_NAME@ in your programs with MySQL, you will need to
+install %{name}-mysql.}
+
+%{?with_postgresql:%package postgresql
+Summary: PostGreSQL backend for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+BuildRequires: postgresql-devel >= 7.1
+
+%description postgresql
+This package contains the PostGreSQL backend for @PACKAGE_NAME@, i.e.,
+dynamic library specific to the PostGreSQL database. If you would like
+to use @PACKAGE_NAME@ in your programs with PostGreSQL, you will need to
+install %{name}-postgresql.}
+
+%{?with_oracle:%package oracle
+Summary: Oracle backend for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description oracle
+This package contains the Oracle backend for @PACKAGE_NAME@, i.e.,
+dynamic library specific to the Oracle database. If you would like to
+use @PACKAGE_NAME@ in your programs with Oracle, you will need to install
+%{name}-oracle.}
+
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+This package contains the header files, dynamic libraries and
+development documentation for %{name}. If you would like to develop
+programs using %{name}, you will need to install %{name}-devel.
+
+%{?with_mysql:%package mysql-devel
+Summary: MySQL backend for %{name}
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-mysql = %{version}-%{release}
+Requires: mysql-devel >= 5.0
+
+%description mysql-devel
+This package contains the MySQL backend for %{name}, i.e., header
+files and dynamic libraries specific to the MySQL database. If you
+would like to develop programs using %{name} and MySQL, you will need
+to install %{name}-mysql.}
+
+%{?with_postgresql:%package postgresql-devel
+Summary: PostGreSQL backend for %{name}
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-postgresql = %{version}-%{release}
+Requires: postgresql-devel >= 7.1
+
+%description postgresql-devel
+This package contains the PostGreSQL backend for %{name}, i.e., header
+files and dynamic libraries specific to the PostGreSQL database. If
+you would like to develop programs using %{name} and PostGreSQL, you
+will need to install %{name}-postgresql.}
+
+%{?with_oracle:%package oracle-devel
+Summary: Oracle backend for %{name}
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-oracle = %{version}-%{release}
+
+%description oracle-devel
+This package contains the Oracle backend for %{name}, i.e., header
+files and dynamic libraries specific to the Oracle database. If you
+would like to develop programs using %{name} and Oracle, you will need
+to install %{name}-oracle.}
+
+
+%package doc
+Summary: HTML documentation for the @PACKAGE_NAME@ library
+Group: Documentation
+%if 0%{?fedora} >= 10
+BuildArch: noarch
+#BuildRequires: texlive-latex, texlive-dvips
+%endif
+#BuildRequires: tetex-latex, tetex-dvips
+#BuildRequires: doxygen, ghostscript
+
+%description doc
+This package contains the documentation in the HTML format of the @PACKAGE_NAME@
+library. The documentation is the same as at the @PACKAGE_NAME@ web page.
+
+
+%prep
+%setup -q
+
+# Apply the g++ 4.4 compatibility patch
+%patch0 -p1
+
+# Rename change-log and license file, so that they comply with
+# packaging standard
+mv CHANGES ChangeLog
+mv LICENSE_1_0.txt COPYING
+rm -f INSTALL
+
+# Remove MacOSX compatibility building files
+rm -f build/unix/._*.tcl
+rm -f ._Makefile ._configure
+rm -f src/core/._*.h src/core/._*.cpp
+rm -f src/backends/postgresql/._*.h
+rm -f doc/._*.html
+
+# Rename the source code directory, so that the files (e.g, header
+# files) can be exported correctly into {_standard_dir}/%{name}
+mv src %{name}
+
+# Apply the GNU Autotools compatibility patch
+%patch1 -p1
+
+# Fix some permissions and formats
+find ./doc -type f -perm 755 -exec chmod 644 {} \;
+chmod -x AUTHORS ChangeLog COPYING NEWS README
+# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;
+
+
+%build
+%configure --disable-static \
+%{?with_mysql:--enable-backend-mysql} \
+%{?with_postgresql:--enable-backend-postgresql} \
+%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}}
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+##
+# Remove unpackaged files from the buildroot
+rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la
+##
+##
+# Duplicate the header files, so as to keep the compatibility, for
+# developers using the SOCI library, with the non-packaged version of
+# that library.
+for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do
+ cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name}
+done
+%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
+%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
+%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%{?with_mysql:%post mysql -p /sbin/ldconfig
+
+%postun mysql -p /sbin/ldconfig}
+
+%{?with_postgresql:%post postgresql -p /sbin/ldconfig
+
+%postun postgresql -p /sbin/ldconfig}
+
+%{?with_oracle:%post oracle -p /sbin/ldconfig
+
+%postun oracle -p /sbin/ldconfig}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_core.so.*
+
+%{?with_mysql:%files mysql
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_mysql.so.*}
+
+%{?with_postgresql:%files postgresql
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_postgresql.so.*}
+
+%{?with_oracle:%files oracle
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/lib%{name}_oracle.so.*}
+
+
+%files devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/core
+%{_includedir}/%{name}/*.h
+%{_includedir}/%{name}/core/*.h
+%{_includedir}/%{name}/core/test
+%{_bindir}/%{name}-config
+%{_libdir}/lib%{name}_core.so
+%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/aclocal/%{name}.m4
+%{_mandir}/man1/%{name}-config.1.*
+
+%{?with_mysql:%files mysql-devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/backends/mysql
+%{_libdir}/lib%{name}_mysql.so}
+
+%{?with_postgresql:%files postgresql-devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/backends/postgresql
+%{_libdir}/lib%{name}_postgresql.so}
+
+%{?with_oracle:%files oracle-devel
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/backends/oracle
+%{_libdir}/lib%{name}_oracle.so}
+
+
+%files doc
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README doc
+
+
+%changelog
+* Sat Jan 23 2010 Denis Arnaud <den...@m4...> 3.0.0-16
+- Added a missing cstring header include for g++-4.4 compatibility
+
+* Fri Jan 22 2010 Rahul Sundaram <sun...@fe...> - 3.0.0-15
+- Rebuild for Boost soname bump
+
+* Sun Jul 26 2009 Fedora Release Engineering <re...@li...> - 3.0.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May 09 2009 Denis Arnaud <den...@m4...> 3.0.0-13
+- Introduced distinct dependencies for different distributions
+
+* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-12
+- Removed the dependency on the version of Boost, and on CPPUnit
+
+* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-11
+- Removed the dependency on Latex for documentation delivery
+
+* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-10
+- Burried the Boost Fusion header include for core/test/common-tests.h
+
+* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-9
+- Added a missing cstdio header include for g++-4.4 compatibility
+
+* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-8
+- Added missing cstdio header includes for g++-4.4 compatibility
+
+* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-7
+- Added a missing cstdio header include for g++-4.4 compatibility
+
+* Sat May 02 2009 Denis Arnaud <den...@m4...> 3.0.0-6
+- Removed the unused build conditionals
+
+* Tue Apr 28 2009 Denis Arnaud <den...@m4...> 3.0.0-5
+- Simplified the conditional build rules within the RPM specification file
+
+* Sat Apr 18 2009 Denis Arnaud <den...@m4...> 3.0.0-4
+- Fixed an issue about OPTFLAGS compilation
+
+* Tue Apr 14 2009 Denis Arnaud <den...@m4...> 3.0.0-3
+- Restarted from pristine version 3.0.0 of upstream (SOCI) project
+
+* Sat Apr 4 2009 Denis Arnaud <den...@m4...> 3.0.0-2
+- Specific RPM for each backend
+
+* Fri Mar 27 2009 Denis Arnaud <den...@m4...> 3.0.0-1
+- First RPM release
Deleted: branches/soci-3.0.0/soci.spec.in
===================================================================
--- branches/soci-3.0.0/soci.spec.in 2011-02-08 21:35:14 UTC (rev 233)
+++ branches/soci-3.0.0/soci.spec.in 2011-02-08 21:36:00 UTC (rev 234)
@@ -1,336 +0,0 @@
-#
-##
-# Default values are --with mysql --with postgresql --without oracle
-# Note that, for Oracle, when enabled, the following options should
-# also be given:
-# --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public
-# --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib
-# If the macros are defined, redefine them with the correct compilation flags.
-%bcond_without mysql
-%bcond_without postgresql
-%bcond_with oracle
-
-%define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1
-%{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public}
-%{!?_with_oracle_libdir: %define _with_oracle_libdir --with-oracle-lib=%{_default_oracle_dir}/lib}
-#
-##
-#
-Name: @PACKAGE@
-Version: @VERSION@
-Release: @RPM_RELEASE@%{?dist}
-
-Summary: The database access library for C++ programmers
-
-Group: System Environment/Libraries
-License: Boost
-URL: http://%{name}.sourceforge.net
-Source0: http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz
-# That patch will be submitted upstream
-Patch0: %{name}-%{version}-@RPM...@-f...
-# That patch will be submitted upstream
-Patch1: %{name}-%{version}-@RPM...@-f...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: boost-devel
-#BuildRequires: cppunit-devel >= 1.10
-BuildRequires: libtool
-#Requires:
-
-%description
-@PACKAGE_NAME@ is a C++ database access library that provides the
-illusion of embedding SQL in regular C++ code, staying entirely within
-the C++ standard.
-
-
-%{?with_mysql:%package mysql
-Summary: MySQL backend for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-BuildRequires: mysql-devel >= 5.0
-
-%description mysql
-This package contains the MySQL backend for @PACKAGE_NAME@, i.e.,
-dynamic library specific to the MySQL database. If you would like to
-use @PACKAGE_NAME@ in your programs with MySQL, you will need to
-install %{name}-mysql.}
-
-%{?with_postgresql:%package postgresql
-Summary: PostGreSQL backend for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-BuildRequires: postgresql-devel >= 7.1
-
-%description postgresql
-This package contains the PostGreSQL backend for @PACKAGE_NAME@, i.e.,
-dynamic library specific to the PostGreSQL database. If you would like
-to use @PACKAGE_NAME@ in your programs with PostGreSQL, you will need to
-install %{name}-postgresql.}
-
-%{?with_oracle:%package oracle
-Summary: Oracle backend for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description oracle
-This package contains the Oracle backend for @PACKAGE_NAME@, i.e.,
-dynamic library specific to the Oracle database. If you would like to
-use @PACKAGE_NAME@ in your programs with Oracle, you will need to install
-%{name}-oracle.}
-
-
-%package devel
-Summary: Header files, libraries and development documentation for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-This package contains the header files, dynamic libraries and
-development documentation for %{name}. If you would like to develop
-programs using %{name}, you will need to install %{name}-devel.
-
-%{?with_mysql:%package mysql-devel
-Summary: MySQL backend for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-mysql = %{version}-%{release}
-Requires: mysql-devel >= 5.0
-
-%description mysql-devel
-This package contains the MySQL backend for %{name}, i.e., header
-files and dynamic libraries specific to the MySQL database. If you
-would like to develop programs using %{name} and MySQL, you will need
-to install %{name}-mysql.}
-
-%{?with_postgresql:%package postgresql-devel
-Summary: PostGreSQL backend for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-postgresql = %{version}-%{release}
-Requires: postgresql-devel >= 7.1
-
-%description postgresql-devel
-This package contains the PostGreSQL backend for %{name}, i.e., header
-files and dynamic libraries specific to the PostGreSQL database. If
-you would like to develop programs using %{name} and PostGreSQL, you
-will need to install %{name}-postgresql.}
-
-%{?with_oracle:%package oracle-devel
-Summary: Oracle backend for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-oracle = %{version}-%{release}
-
-%description oracle-devel
-This package contains the Oracle backend for %{name}, i.e., header
-files and dynamic libraries specific to the Oracle database. If you
-would like to develop programs using %{name} and Oracle, you will need
-to install %{name}-oracle.}
-
-
-%package doc
-Summary: HTML documentation for the @PACKAGE_NAME@ library
-Group: Documentation
-%if 0%{?fedora} >= 10
-BuildArch: noarch
-#BuildRequires: texlive-latex, texlive-dvips
-%endif
-#BuildRequires: tetex-latex, tetex-dvips
-#BuildRequires: doxygen, ghostscript
-
-%description doc
-This package contains the documentation in the HTML format of the @PACKAGE_NAME@
-library. The documentation is the same as at the @PACKAGE_NAME@ web page.
-
-
-%prep
-%setup -q
-
-# Apply the g++ 4.4 compatibility patch
-%patch0 -p1
-
-# Rename change-log and license file, so that they comply with
-# packaging standard
-mv CHANGES ChangeLog
-mv LICENSE_1_0.txt COPYING
-rm -f INSTALL
-
-# Remove MacOSX compatibility building files
-rm -f build/unix/._*.tcl
-rm -f ._Makefile ._configure
-rm -f src/core/._*.h src/core/._*.cpp
-rm -f src/backends/postgresql/._*.h
-rm -f doc/._*.html
-
-# Rename the source code directory, so that the files (e.g, header
-# files) can be exported correctly into {_standard_dir}/%{name}
-mv src %{name}
-
-# Apply the GNU Autotools compatibility patch
-%patch1 -p1
-
-# Fix some permissions and formats
-find ./doc -type f -perm 755 -exec chmod 644 {} \;
-chmod -x AUTHORS ChangeLog COPYING NEWS README
-# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;
-
-
-%build
-%configure --disable-static \
-%{?with_mysql:--enable-backend-mysql} \
-%{?with_postgresql:--enable-backend-postgresql} \
-%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}}
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-##
-# Remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la
-##
-##
-# Duplicate the header files, so as to keep the compatibility, for
-# developers using the SOCI library, with the non-packaged version of
-# that library.
-for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do
- cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name}
-done
-%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
-%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
-%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%{?with_mysql:%post mysql -p /sbin/ldconfig
-
-%postun mysql -p /sbin/ldconfig}
-
-%{?with_postgresql:%post postgresql -p /sbin/ldconfig
-
-%postun postgresql -p /sbin/ldconfig}
-
-%{?with_oracle:%post oracle -p /sbin/ldconfig
-
-%postun oracle -p /sbin/ldconfig}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/lib%{name}_core.so.*
-
-%{?with_mysql:%files mysql
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/lib%{name}_mysql.so.*}
-
-%{?with_postgresql:%files postgresql
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/lib%{name}_postgresql.so.*}
-
-%{?with_oracle:%files oracle
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/lib%{name}_oracle.so.*}
-
-
-%files devel
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/core
-%{_includedir}/%{name}/*.h
-%{_includedir}/%{name}/core/*.h
-%{_includedir}/%{name}/core/test
-%{_bindir}/%{name}-config
-%{_libdir}/lib%{name}_core.so
-%{_libdir}/pkgconfig/%{name}.pc
-%{_datadir}/aclocal/%{name}.m4
-%{_mandir}/man1/%{name}-config.1.*
-
-%{?with_mysql:%files mysql-devel
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/backends/mysql
-%{_libdir}/lib%{name}_mysql.so}
-
-%{?with_postgresql:%files postgresql-devel
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/backends/postgresql
-%{_libdir}/lib%{name}_postgresql.so}
-
-%{?with_oracle:%files oracle-devel
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/backends/oracle
-%{_libdir}/lib%{name}_oracle.so}
-
-
-%files doc
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README doc
-
-
-%changelog
-* Sat Jan 23 2010 Denis Arnaud <den...@m4...> 3.0.0-16
-- Added a missing cstring header include for g++-4.4 compatibility
-
-* Fri Jan 22 2010 Rahul Sundaram <sun...@fe...> - 3.0.0-15
-- Rebuild for Boost soname bump
-
-* Sun Jul 26 2009 Fedora Release Engineering <re...@li...> - 3.0.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat May 09 2009 Denis Arnaud <den...@m4...> 3.0.0-13
-- Introduced distinct dependencies for different distributions
-
-* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-12
-- Removed the dependency on the version of Boost, and on CPPUnit
-
-* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-11
-- Removed the dependency on Latex for documentation delivery
-
-* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-10
-- Burried the Boost Fusion header include for core/test/common-tests.h
-
-* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-9
-- Added a missing cstdio header include for g++-4.4 compatibility
-
-* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-8
-- Added missing cstdio header includes for g++-4.4 compatibility
-
-* Tue May 05 2009 Denis Arnaud <den...@m4...> 3.0.0-7
-- Added a missing cstdio header include for g++-4.4 compatibility
-
-* Sat May 02 2009 Denis Arnaud <den...@m4...> 3.0.0-6
-- Removed the unused build conditionals
-
-* Tue Apr 28 2009 Denis Arnaud <den...@m4...> 3.0.0-5
-- Simplified the conditional build rules within the RPM specification file
-
-* Sat Apr 18 2009 Denis Arnaud <den...@m4...> 3.0.0-4
-- Fixed an issue about OPTFLAGS compilation
-
-* Tue Apr 14 2009 Denis Arnaud <den...@m4...> 3.0.0-3
-- Restarted from pristine version 3.0.0 of upstream (SOCI) project
-
-* Sat Apr 4 2009 Denis Arnaud <den...@m4...> 3.0.0-2
-- Specific RPM for each backend
-
-* Fri Mar 27 2009 Denis Arnaud <den...@m4...> 3.0.0-1
-- First RPM release
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-08 21:35:20
|
Revision: 233
http://opentrep.svn.sourceforge.net/opentrep/?rev=233&view=rev
Author: denis_arnaud
Date: 2011-02-08 21:35:14 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] The RPM specification is no longer generated by configure from an .spec.in template.
Property Changed:
----------------
branches/soci-3.0.0/
Property changes on: branches/soci-3.0.0
___________________________________________________________________
Modified: svn:ignore
- ABOUT-NLS
INSTALL
autom4te.cache
libtool
aclocal.m4
Makefile
Makefile.in
config.log
config.status
configure
soci.spec
soci-config
soci.pc
soci-*.tar.*
+ ABOUT-NLS
INSTALL
autom4te.cache
libtool
aclocal.m4
Makefile
Makefile.in
config.log
config.status
configure
soci-config
soci.pc
soci-*.tar.*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-08 14:02:57
|
Revision: 232
http://opentrep.svn.sourceforge.net/opentrep/?rev=232&view=rev
Author: denis_arnaud
Date: 2011-02-08 14:02:51 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] Fixed a compilation error about non defined default constructor for DB back-ends.
Modified Paths:
--------------
branches/soci-3.0.0/soci/backends/empty/soci-empty.h
branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h
branches/soci-3.0.0/soci/backends/oracle/soci-oracle.h
branches/soci-3.0.0/soci/backends/postgresql/soci-postgresql.h
branches/soci-3.0.0/soci/backends/sqlite3/soci-sqlite3.h
Modified: branches/soci-3.0.0/soci/backends/empty/soci-empty.h
===================================================================
--- branches/soci-3.0.0/soci/backends/empty/soci-empty.h 2011-02-08 10:16:04 UTC (rev 231)
+++ branches/soci-3.0.0/soci/backends/empty/soci-empty.h 2011-02-08 14:02:51 UTC (rev 232)
@@ -28,6 +28,9 @@
#else
# include <soci-backend.h>
#endif
+// STL
+#include <cstddef>
+#include <string>
namespace soci
{
@@ -180,8 +183,8 @@
struct SOCI_EMPTY_DECL empty_backend_factory : backend_factory
{
- virtual empty_session_backend * make_session(
- std::string const &connectString) const;
+ empty_backend_factory() {}
+ empty_session_backend* make_session(std::string const& connectString) const;
};
extern SOCI_EMPTY_DECL empty_backend_factory const empty;
@@ -190,7 +193,7 @@
{
// for dynamic backend loading
-SOCI_EMPTY_DECL backend_factory const * factory_empty();
+SOCI_EMPTY_DECL backend_factory const* factory_empty();
} // extern "C"
Modified: branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h
===================================================================
--- branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h 2011-02-08 10:16:04 UTC (rev 231)
+++ branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h 2011-02-08 14:02:51 UTC (rev 232)
@@ -256,11 +256,9 @@
struct mysql_backend_factory : backend_factory
{
+ mysql_backend_factory() {}
virtual mysql_session_backend * make_session(
std::string const &connectString) const;
-
- mysql_backend_factory() {}
-
};
extern SOCI_MYSQL_DECL mysql_backend_factory const mysql;
@@ -273,6 +271,6 @@
} // extern "C"
-} // namespace SOCI
+} // namespace soci
#endif // SOCI_MYSQL_H_INCLUDED
Modified: branches/soci-3.0.0/soci/backends/oracle/soci-oracle.h
===================================================================
--- branches/soci-3.0.0/soci/backends/oracle/soci-oracle.h 2011-02-08 10:16:04 UTC (rev 231)
+++ branches/soci-3.0.0/soci/backends/oracle/soci-oracle.h 2011-02-08 14:02:51 UTC (rev 232)
@@ -274,6 +274,7 @@
struct oracle_backend_factory : backend_factory
{
+ oracle_backend_factory() {}
virtual oracle_session_backend * make_session(
std::string const &connectString) const;
};
Modified: branches/soci-3.0.0/soci/backends/postgresql/soci-postgresql.h
===================================================================
--- branches/soci-3.0.0/soci/backends/postgresql/soci-postgresql.h 2011-02-08 10:16:04 UTC (rev 231)
+++ branches/soci-3.0.0/soci/backends/postgresql/soci-postgresql.h 2011-02-08 14:02:51 UTC (rev 232)
@@ -246,6 +246,7 @@
struct postgresql_backend_factory : backend_factory
{
+ postgresql_backend_factory() {}
virtual postgresql_session_backend * make_session(
std::string const & connectString) const;
};
Modified: branches/soci-3.0.0/soci/backends/sqlite3/soci-sqlite3.h
===================================================================
--- branches/soci-3.0.0/soci/backends/sqlite3/soci-sqlite3.h 2011-02-08 10:16:04 UTC (rev 231)
+++ branches/soci-3.0.0/soci/backends/sqlite3/soci-sqlite3.h 2011-02-08 14:02:51 UTC (rev 232)
@@ -253,6 +253,7 @@
struct sqlite3_backend_factory : backend_factory
{
+ sqlite3_backend_factory() {}
virtual sqlite3_session_backend * make_session(
std::string const &connectString) const;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-08 10:16:12
|
Revision: 231
http://opentrep.svn.sourceforge.net/opentrep/?rev=231&view=rev
Author: denis_arnaud
Date: 2011-02-08 10:16:04 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] Fixed a missing tab in the top-dir Makefile.am.
Modified Paths:
--------------
branches/soci-3.0.0/Makefile.am
Modified: branches/soci-3.0.0/Makefile.am
===================================================================
--- branches/soci-3.0.0/Makefile.am 2011-02-08 10:14:57 UTC (rev 230)
+++ branches/soci-3.0.0/Makefile.am 2011-02-08 10:16:04 UTC (rev 231)
@@ -45,7 +45,7 @@
snapshot-src:
- $(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
+ $(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
$(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-html-doc-`date +"%Y%m%d"`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-02-08 10:15:04
|
Revision: 230
http://opentrep.svn.sourceforge.net/opentrep/?rev=230&view=rev
Author: denis_arnaud
Date: 2011-02-08 10:14:57 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
[Branch 3.0.0] Fixed a compilation error in MySQL back-end.
Modified Paths:
--------------
branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h
Modified: branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h
===================================================================
--- branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h 2010-11-21 13:23:31 UTC (rev 229)
+++ branches/soci-3.0.0/soci/backends/mysql/soci-mysql.h 2011-02-08 10:14:57 UTC (rev 230)
@@ -258,6 +258,9 @@
{
virtual mysql_session_backend * make_session(
std::string const &connectString) const;
+
+ mysql_backend_factory() {}
+
};
extern SOCI_MYSQL_DECL mysql_backend_factory const mysql;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-11-21 13:23:37
|
Revision: 229
http://opentrep.svn.sourceforge.net/opentrep/?rev=229&view=rev
Author: denis_arnaud
Date: 2010-11-21 13:23:31 +0000 (Sun, 21 Nov 2010)
Log Message:
-----------
[GUI] Added the boot-strap for a Django framework.
Added Paths:
-----------
trunk/opentrep/gui/django/
trunk/opentrep/gui/django/opentrep/
trunk/opentrep/gui/django/opentrep/__init__.py
trunk/opentrep/gui/django/opentrep/manage.py
trunk/opentrep/gui/django/opentrep/settings.py
trunk/opentrep/gui/django/opentrep/urls.py
Added: trunk/opentrep/gui/django/opentrep/__init__.py
===================================================================
Added: trunk/opentrep/gui/django/opentrep/manage.py
===================================================================
--- trunk/opentrep/gui/django/opentrep/manage.py (rev 0)
+++ trunk/opentrep/gui/django/opentrep/manage.py 2010-11-21 13:23:31 UTC (rev 229)
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+ import settings # Assumed to be in the same directory.
+except ImportError:
+ import sys
+ sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+ sys.exit(1)
+
+if __name__ == "__main__":
+ execute_manager(settings)
Property changes on: trunk/opentrep/gui/django/opentrep/manage.py
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/opentrep/gui/django/opentrep/settings.py
===================================================================
--- trunk/opentrep/gui/django/opentrep/settings.py (rev 0)
+++ trunk/opentrep/gui/django/opentrep/settings.py 2010-11-21 13:23:31 UTC (rev 229)
@@ -0,0 +1,96 @@
+# Django settings for opentrep project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+ # ('Your Name', 'you...@do...'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME': '', # Or path to database file if using sqlite3.
+ 'USER': '', # Not used with sqlite3.
+ 'PASSWORD': '', # Not used with sqlite3.
+ 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ }
+}
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'America/Chicago'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale
+USE_L10N = True
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = ''
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/media/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = 'r@s=9_fnba6bm+g_1o94nzj$f^q4mv94$(u4#kkns&l$=#eh%1'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+# 'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.middleware.csrf.CsrfViewMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
+)
+
+ROOT_URLCONF = 'opentrep.urls'
+
+TEMPLATE_DIRS = (
+ # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+)
+
+INSTALLED_APPS = (
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+ 'django.contrib.messages',
+ # Uncomment the next line to enable the admin:
+ # 'django.contrib.admin',
+ # Uncomment the next line to enable admin documentation:
+ # 'django.contrib.admindocs',
+)
Added: trunk/opentrep/gui/django/opentrep/urls.py
===================================================================
--- trunk/opentrep/gui/django/opentrep/urls.py (rev 0)
+++ trunk/opentrep/gui/django/opentrep/urls.py 2010-11-21 13:23:31 UTC (rev 229)
@@ -0,0 +1,16 @@
+from django.conf.urls.defaults import *
+
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
+
+urlpatterns = patterns('',
+ # Example:
+ # (r'^opentrep/', include('opentrep.foo.urls')),
+
+ # Uncomment the admin/doc line below to enable admin documentation:
+ # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+ # Uncomment the next line to enable the admin:
+ # (r'^admin/', include(admin.site.urls)),
+)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-06 10:00:05
|
Revision: 228
http://opentrep.svn.sourceforge.net/opentrep/?rev=228&view=rev
Author: denis_arnaud
Date: 2010-09-06 09:59:59 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
[Batches] Added a command-line option for the search type (it may not be necessary).
Modified Paths:
--------------
trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
trunk/opentrep/opentrep/batches/searcher.cpp
Modified: trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-09-05 18:56:12 UTC (rev 227)
+++ trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-09-06 09:59:59 UTC (rev 228)
@@ -5,5 +5,6 @@
host=localhost
port=3306
dbname=geo_geonames
+type=0
error=3
query="sna francicso rio de janero lso angles reykyavki"
Modified: trunk/opentrep/opentrep/batches/searcher.cpp
===================================================================
--- trunk/opentrep/opentrep/batches/searcher.cpp 2010-09-05 18:56:12 UTC (rev 227)
+++ trunk/opentrep/opentrep/batches/searcher.cpp 2010-09-06 09:59:59 UTC (rev 228)
@@ -38,6 +38,14 @@
const std::string K_OPENTREP_DEFAULT_DB_HOST ("localhost");
const std::string K_OPENTREP_DEFAULT_DB_PORT ("3306");
+/** Default type for the search request.
+ <br>
+ <ul>
+ <li>0 = Full text</li>
+ <li>1 = Coordinates</li>
+ </ul> */
+const unsigned short K_OPENTREP_DEFAULT_SEARCH_TYPE = 0;
+
/** Default error distance for spelling corrections. */
const unsigned short K_OPENTREP_DEFAULT_SPELLING_ERROR_DISTANCE = 3;
@@ -61,7 +69,6 @@
const std::string& lTerm = *tok_iter;
ioWordList.push_back (lTerm);
}
-
}
// //////////////////////////////////////////////////////////////////////
@@ -101,7 +108,7 @@
std::string& ioLogFilename,
std::string& ioDBUser, std::string& ioDBPasswd,
std::string& ioDBHost, std::string& ioDBPort,
- std::string& ioDBDBName) {
+ std::string& ioDBDBName, unsigned short& ioSearchType) {
// Initialise the travel query string, if that one is empty
if (ioQueryString.empty() == true) {
@@ -147,6 +154,9 @@
("dbname,m",
boost::program_options::value< std::string >(&ioDBDBName)->default_value(K_OPENTREP_DEFAULT_DB_DBNAME),
"SQL database name (e.g., opentrep)")
+ ("type,t",
+ boost::program_options::value<unsigned short>(&ioSearchType)->default_value(K_OPENTREP_DEFAULT_SEARCH_TYPE),
+ "Type of search request (0 = full text, 1 = coordinates)")
("query,q",
boost::program_options::value< WordList_T >(&lWordList)->multitoken(),
"Travel query word list (e.g. sna francicso rio de janero lso anglese reykyavki), which sould be located at the end of the command line (otherwise, the other options would be interpreted as part of that travel query word list)")
@@ -233,6 +243,8 @@
std::cout << "SQL database name is: " << ioDBDBName << std::endl;
}
+ std::cout << "The type of search is: " << ioSearchType << std::endl;
+
std::cout << "The spelling error distance is: " << ioSpellingErrorDistance
<< std::endl;
@@ -245,6 +257,7 @@
// /////////////// M A I N /////////////////
int main (int argc, char* argv[]) {
+
try {
/*
@@ -282,7 +295,10 @@
std::string lDBHost;
std::string lDBPort;
std::string lDBDBName;
-
+
+ // Type of search
+ unsigned short lSearchType;
+
// Xapian spelling error distance
unsigned short lSpellingErrorDistance;
@@ -290,7 +306,8 @@
const int lOptionParserStatus =
readConfiguration (argc, argv, lSpellingErrorDistance, lTravelQuery,
lXapianDatabaseName, lLogFilename,
- lDBUser, lDBPasswd, lDBHost, lDBPort, lDBDBName);
+ lDBUser, lDBPasswd, lDBHost, lDBPort, lDBDBName,
+ lSearchType);
if (lOptionParserStatus == K_OPENTREP_EARLY_RETURN_STATUS) {
return 0;
@@ -310,45 +327,51 @@
OPENTREP::OPENTREP_Service opentrepService (logOutputFile, lDBParams,
lXapianDatabaseName);
- // Query the Xapian database (index)
- OPENTREP::WordList_T lNonMatchedWordList;
- OPENTREP::LocationList_T lLocationList;
- const OPENTREP::NbOfMatches_T nbOfMatches =
- opentrepService.interpretTravelRequest (lTravelQuery, lLocationList,
- lNonMatchedWordList);
+ if (lSearchType == 0) {
+ // Query the Xapian database (index)
+ OPENTREP::WordList_T lNonMatchedWordList;
+ OPENTREP::LocationList_T lLocationList;
+ const OPENTREP::NbOfMatches_T nbOfMatches =
+ opentrepService.interpretTravelRequest (lTravelQuery, lLocationList,
+ lNonMatchedWordList);
- std::cout << nbOfMatches << " (geographical) location(s) have been found "
- << "matching your query (`" << lTravelQuery << "'). "
- << lNonMatchedWordList.size() << " words were left unmatched."
- << std::endl;
+ std::cout << nbOfMatches << " (geographical) location(s) have been found "
+ << "matching your query (`" << lTravelQuery << "'). "
+ << lNonMatchedWordList.size() << " words were left unmatched."
+ << std::endl;
- if (nbOfMatches != 0) {
- OPENTREP::NbOfMatches_T idx = 1;
- for (OPENTREP::LocationList_T::const_iterator itLocation =
- lLocationList.begin();
- itLocation != lLocationList.end(); ++itLocation, ++idx) {
- const OPENTREP::Location& lLocation = *itLocation;
- std::cout << " [" << idx << "]: " << lLocation << std::endl;
+ if (nbOfMatches != 0) {
+ OPENTREP::NbOfMatches_T idx = 1;
+ for (OPENTREP::LocationList_T::const_iterator itLocation =
+ lLocationList.begin();
+ itLocation != lLocationList.end(); ++itLocation, ++idx) {
+ const OPENTREP::Location& lLocation = *itLocation;
+ std::cout << " [" << idx << "]: " << lLocation << std::endl;
+ }
}
- }
- if (lNonMatchedWordList.empty() == false) {
- std::cout << "List of unmatched words:" << std::endl;
+ if (lNonMatchedWordList.empty() == false) {
+ std::cout << "List of unmatched words:" << std::endl;
+
+ OPENTREP::NbOfMatches_T idx = 1;
+ for (OPENTREP::WordList_T::const_iterator itWord =
+ lNonMatchedWordList.begin();
+ itWord != lNonMatchedWordList.end(); ++itWord, ++idx) {
+ const OPENTREP::Word_T& lWord = *itWord;
+ std::cout << " [" << idx << "]: " << lWord << std::endl;
+ }
+ }
- OPENTREP::NbOfMatches_T idx = 1;
- for (OPENTREP::WordList_T::const_iterator itWord =
- lNonMatchedWordList.begin();
- itWord != lNonMatchedWordList.end(); ++itWord, ++idx) {
- const OPENTREP::Word_T& lWord = *itWord;
- std::cout << " [" << idx << "]: " << lWord << std::endl;
- }
+ } else {
+ std::cout << "Finding the airports closest to: " << lTravelQuery
+ << std::endl;
}
// Close the Log outputFile
logOutputFile.close();
} catch (const OPENTREP::RootException& otexp) {
- std::cerr << "Standard exception: " << otexp.what() << std::endl;
+ std::cerr << "OpenTREP exception: " << otexp.what() << std::endl;
return -1;
} catch (const std::exception& stde) {
@@ -358,6 +381,6 @@
} catch (...) {
return -1;
}
-
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-05 18:56:18
|
Revision: 227
http://opentrep.svn.sourceforge.net/opentrep/?rev=227&view=rev
Author: denis_arnaud
Date: 2010-09-05 18:56:12 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
[Dev] Added a SQL request for getting closest places to some given coordinates (there is still some work to do).
Modified Paths:
--------------
trunk/opentrep/opentrep/Location.hpp
trunk/opentrep/opentrep/bom/Place.hpp
trunk/opentrep/opentrep/command/DBManager.cpp
trunk/opentrep/opentrep/command/DBManager.hpp
trunk/opentrep/opentrep/command/IndexBuilder.cpp
Modified: trunk/opentrep/opentrep/Location.hpp
===================================================================
--- trunk/opentrep/opentrep/Location.hpp 2010-09-05 16:25:14 UTC (rev 226)
+++ trunk/opentrep/opentrep/Location.hpp 2010-09-05 18:56:12 UTC (rev 227)
@@ -5,8 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STL
-#include <istream>
-#include <ostream>
+#include <iosfwd>
#include <string>
#include <list>
// OpenTrep
Modified: trunk/opentrep/opentrep/bom/Place.hpp
===================================================================
--- trunk/opentrep/opentrep/bom/Place.hpp 2010-09-05 16:25:14 UTC (rev 226)
+++ trunk/opentrep/opentrep/bom/Place.hpp 2010-09-05 18:56:12 UTC (rev 227)
@@ -5,8 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STL
-#include <istream>
-#include <ostream>
+#include <iosfwd>
#include <string>
#include <map>
// OpenTrep Bom
Modified: trunk/opentrep/opentrep/command/DBManager.cpp
===================================================================
--- trunk/opentrep/opentrep/command/DBManager.cpp 2010-09-05 16:25:14 UTC (rev 226)
+++ trunk/opentrep/opentrep/command/DBManager.cpp 2010-09-05 18:56:12 UTC (rev 227)
@@ -1,15 +1,14 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// C
-#include <assert.h>
+// STL
+#include <cassert>
// SOCI
#include <soci/core/soci.h>
#include <soci/backends/mysql/soci-mysql.h>
// OpenTrep
#include <opentrep/bom/World.hpp>
#include <opentrep/bom/Place.hpp>
-#include <opentrep/factory/FacWorld.hpp>
#include <opentrep/factory/FacPlace.hpp>
#include <opentrep/dbadaptor/DbaPlace.hpp>
#include <opentrep/command/DBManager.hpp>
@@ -18,9 +17,10 @@
namespace OPENTREP {
// //////////////////////////////////////////////////////////////////////
- void DBManager::prepareSelectStatement (soci::session& ioSociSession,
- soci::statement& ioSelectStatement,
- Place& ioPlace) {
+ void DBManager::
+ prepareSelectFromCodeStatement (soci::session& ioSociSession,
+ soci::statement& ioSelectStatement,
+ Place& ioPlace) {
try {
@@ -60,6 +60,78 @@
// //////////////////////////////////////////////////////////////////////
void DBManager::
+ prepareSelectFromCoordStatement (soci::session& ioSociSession,
+ soci::statement& ioSelectStatement,
+ const double& iLatitude,
+ const double& iLongitude) {
+
+ try {
+
+ // Instanciate a SQL statement (no request is performed at that stage)
+ /**
+ select rpd.code AS code, city_code, xapian_docid, is_airport, is_city,
+ is_main, is_commercial, state_code, country_code, region_code,
+ continent_code, time_zone_grp, longitude, latitude, language_code,
+ classical_name, extended_name, alternate_name1, alternate_name2,
+ alternate_name3, alternate_name4, alternate_name5, alternate_name6,
+ alternate_name7, alternate_name8, alternate_name9, alternate_name10
+ from ref_place_details rpd, ref_place_names rpn
+ where rpd.code = iPlaceCode
+ and rpn.code = rpd.code;
+
+ select (airpop.tpax)/1000 as 'popularity',
+ places.code as 'airport_code', places.code as 'city_code',
+ places.longitude as 'longitude', places.latitude as 'latitude'
+ from airport_popularity AS airpop, ref_place_details AS places
+ WHERE places.longitude >= ${PL_LON_LOWER}
+ AND places.longitude <= ${PL_LON_UPPER}
+ AND places.latitude >= ${PL_LAT_LOWER}
+ AND places.latitude <= ${PL_LAT_UPPER}
+ AND airpop.airport_code = places.code
+ AND places.is_city = 'y'
+ AND names.code = places.code
+ ORDER BY airpop.tpax DESC
+ */
+ Place& lPlace = FacPlace::instance().create();
+ const double K_ERROR = 2.0;
+ const double lLowerBoundLatitude = iLatitude - K_ERROR;
+ const double lUpperBoundLatitude = iLatitude + K_ERROR;
+ const double lLowerBoundLongitude = iLongitude - K_ERROR;
+ const double lUpperBoundLongitude = iLongitude + K_ERROR;
+
+ ioSelectStatement =
+ (ioSociSession.prepare
+ << "select rpd.code AS code, city_code, xapian_docid, is_airport, "
+ << "is_city, is_main, is_commercial, state_code, country_code, "
+ << "region_code, continent_code, time_zone_grp, longitude, latitude, "
+ << "language_code, classical_name, extended_name, "
+ << "alternate_name1, alternate_name2, alternate_name3, "
+ << "alternate_name4, alternate_name5, alternate_name6, "
+ << "alternate_name7, alternate_name8, alternate_name9, "
+ << "alternate_name10 "
+ << "from ref_place_details rpd, ref_place_names rpn, "
+ << " popularity pop "
+ << "where latitude >= :lower_latitude "
+ << " and latitude <= :upper_latitude "
+ << " and longitude >= :lower_longitude "
+ << " and longitude <= :upper_longitude "
+ << " and rpn.code = rpd.code"
+ << " and pop.airport_code = rpd.code",
+ soci::into (lPlace), soci::use (lLowerBoundLatitude),
+ soci::use (lUpperBoundLatitude), soci::use (lLowerBoundLongitude),
+ soci::use (lUpperBoundLongitude));
+
+ // Execute the SQL query
+ ioSelectStatement.execute();
+
+ } catch (std::exception const& lException) {
+ OPENTREP_LOG_ERROR ("Error: " << lException.what());
+ throw SQLDatabaseException();
+ }
+ }
+
+ // //////////////////////////////////////////////////////////////////////
+ void DBManager::
prepareSelectOnPlaceCodeStatement (soci::session& ioSociSession,
soci::statement& ioSelectStatement,
const std::string& iPlaceCode,
@@ -248,4 +320,22 @@
return oHasRetrievedPlace;
}
+ // //////////////////////////////////////////////////////////////////////
+ bool DBManager::retrieveClosestPlaces (soci::session& ioSociSession,
+ const double& iLatitude,
+ const double& iLongitude,
+ PlaceOrderedList_T& ioPlaceList) {
+ bool oHasRetrievedPlace = false;
+
+ try {
+
+
+ } catch (std::exception const& lException) {
+ OPENTREP_LOG_ERROR ("Error: " << lException.what());
+ throw SQLDatabaseException();
+ }
+
+ return oHasRetrievedPlace;
+ }
+
}
Modified: trunk/opentrep/opentrep/command/DBManager.hpp
===================================================================
--- trunk/opentrep/opentrep/command/DBManager.hpp 2010-09-05 16:25:14 UTC (rev 226)
+++ trunk/opentrep/opentrep/command/DBManager.hpp 2010-09-05 18:56:12 UTC (rev 227)
@@ -6,6 +6,7 @@
// //////////////////////////////////////////////////////////////////////
// OpenTrep
#include <opentrep/OPENTREP_Types.hpp>
+#include <opentrep/bom/PlaceList.hpp>
// Forward declarations
namespace soci {
@@ -15,45 +16,89 @@
namespace OPENTREP {
- // Forward declarations
- class Place;
-
/** Class building the Business Object Model (BOM) from data retrieved
from the database. */
class DBManager {
public:
/** Update the Xapian document ID field of the database row
- corresponding to the given Place object. */
+ corresponding to the given Place object.
+ @param soci::session& SOCI session handler.
+ @param const Place& The place to be updated. */
static void updatePlaceInDB (soci::session&, const Place&);
/** Retrieve, from the (MySQL) database, the row corresponding to
the given place code (e.g., 'sfo' for San Francisco Intl
airport), and fill the given Place object with that retrieved
- data. */
+ data.
+ @param soci::session& SOCI session handler.
+ @param const std::string& The code of the place to be retrieved.
+ @param Place& The object corresponding to the place to be retrieved.
+ It has to be given empty, and is filled by the method. */
static bool retrievePlace (soci::session&, const std::string& iPlaceCode,
Place&);
+ /** Retrieve, from the (MySQL) database, the row corresponding to
+ the given place code (e.g., 'sfo' for San Francisco Intl
+ airport), and fill the given Place object with that retrieved
+ data.
+ @param soci::session& SOCI session handler.
+ @param const std::double& The latitude of the place to be retrieved.
+ @param const std::double& The longitude of the place to be retrieved.
+ @param PlaceOrderedList_T& The list corresponding to the places to be
+ retrieved. It has to be given empty, and is filled by the
+ method. */
+ static bool retrieveClosestPlaces (soci::session&, const double& iLatitude,
+ const double& iLongitude,
+ PlaceOrderedList_T&);
+
public:
- /** Prepare (parse and put in cache) the SQL statement. */
- static void prepareSelectStatement (soci::session&, soci::statement&,
- Place&);
+ /** Prepare (parse and put in cache) the SQL statement.
+ @param soci::session& SOCI session handler.
+ @param soci::statement& SOCI SQL statement handler.
+ @param Place& The object corresponding to the place to be retrieved.
+ It has to be given empty, and is filled by the method. */
+ static void prepareSelectFromCodeStatement (soci::session&,
+ soci::statement&, Place&);
+ /** Prepare (parse and put in cache) the SQL statement.
+ @param soci::session& SOCI session handler.
+ @param soci::statement& SOCI SQL statement handler.
+ @param Place& The object corresponding to the place to be retrieved.
+ It has to be given empty, and is filled by the method. */
+ static void prepareSelectFromCoordStatement (soci::session&,
+ soci::statement&,
+ const double& iLatitude,
+ const double& iLongitude);
+
/** Iterate on the SQL statement.
<br>The SQL has to be already prepared.
- @parameter const bool Tells whether the Place object should be reset. */
+ @param soci::statement& SOCI SQL statement handler.
+ @param Place& The object corresponding to the place to be retrieved.
+ It has to be given empty, and is filled by the method.
+ @param const bool Tells whether the Place object should be reset. */
static bool iterateOnStatement (soci::statement&, Place&,
const bool iShouldDoReset);
private:
- /** Prepare (parse and put in cache) the SQL statement. */
+ /** Prepare (parse and put in cache) the SQL statement.
+ @param soci::session& SOCI session handler.
+ @param soci::statement& SOCI SQL statement handler.
+ @param const std::string& The code of the place to be retrieved.
+ @param Place& The object corresponding to the place to be retrieved.
+ It has to be given empty, and is filled by the method. */
static void prepareSelectOnPlaceCodeStatement(soci::session&,
soci::statement&,
const std::string& iPlaceCode,
Place&);
- /** Prepare (parse and put in cache) the SQL statement. */
+ /** Prepare (parse and put in cache) the SQL statement.
+ @param soci::session& SOCI session handler.
+ @param soci::statement& SOCI SQL statement handler.
+ @param const XapianDocID_T& The code of the place to be retrieved.
+ @param Place& The object corresponding to the place to be retrieved.
+ It has to be given empty, and is filled by the method. */
static void prepareSelectOnDocIDStatement (soci::session&, soci::statement&,
const XapianDocID_T&, Place&);
Modified: trunk/opentrep/opentrep/command/IndexBuilder.cpp
===================================================================
--- trunk/opentrep/opentrep/command/IndexBuilder.cpp 2010-09-05 16:25:14 UTC (rev 226)
+++ trunk/opentrep/opentrep/command/IndexBuilder.cpp 2010-09-05 18:56:12 UTC (rev 227)
@@ -154,8 +154,8 @@
// Prepare and execute the select statement
soci::statement lSelectStatement (ioSociSession);
- DBManager::prepareSelectStatement (ioSociSession, lSelectStatement,
- lPlace);
+ DBManager::prepareSelectFromCodeStatement (ioSociSession,
+ lSelectStatement, lPlace);
// Create the Xapian database (index)
Xapian::WritableDatabase lDatabase (iTravelDatabaseName,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-05 16:25:20
|
Revision: 226
http://opentrep.svn.sourceforge.net/opentrep/?rev=226&view=rev
Author: denis_arnaud
Date: 2010-09-05 16:25:14 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
[Data] OpenTREP data management is now handled by OpenGeo++.
Removed Paths:
-------------
trunk/opentrep/db.old/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-05 16:23:16
|
Revision: 225
http://opentrep.svn.sourceforge.net/opentrep/?rev=225&view=rev
Author: denis_arnaud
Date: 2010-09-05 16:23:10 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
[Data] The default database is now geo_geonames (from the OpenGeo++ project).
Modified Paths:
--------------
trunk/opentrep/opentrep/batches/indexer.cpp
trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
trunk/opentrep/opentrep/batches/searcher.cpp
Modified: trunk/opentrep/opentrep/batches/indexer.cpp
===================================================================
--- trunk/opentrep/opentrep/batches/indexer.cpp 2010-09-05 16:06:23 UTC (rev 224)
+++ trunk/opentrep/opentrep/batches/indexer.cpp 2010-09-05 16:23:10 UTC (rev 225)
@@ -27,9 +27,9 @@
const std::string K_OPENTREP_DEFAULT_DATABSE_FILEPATH("/tmp/opentrep/traveldb");
/** Default name and location for the Xapian database. */
-const std::string K_OPENTREP_DEFAULT_DB_USER ("opentrep");
-const std::string K_OPENTREP_DEFAULT_DB_PASSWD ("opentrep");
-const std::string K_OPENTREP_DEFAULT_DB_DBNAME ("trep_opentrep");
+const std::string K_OPENTREP_DEFAULT_DB_USER ("geo");
+const std::string K_OPENTREP_DEFAULT_DB_PASSWD ("geo");
+const std::string K_OPENTREP_DEFAULT_DB_DBNAME ("geo_geonames");
const std::string K_OPENTREP_DEFAULT_DB_HOST ("localhost");
const std::string K_OPENTREP_DEFAULT_DB_PORT ("3306");
Modified: trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2010-09-05 16:06:23 UTC (rev 224)
+++ trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2010-09-05 16:23:10 UTC (rev 225)
@@ -1,7 +1,7 @@
database=/home/www/webapps/opentrep/trep/traveldb
log=opentrep_indexer.log
-user=opentrep
-passwd=opentrep
+user=geo
+passwd=geo
host=localhost
port=3306
-dbname=trep_opentrep
+dbname=geo_geonames
Modified: trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-09-05 16:06:23 UTC (rev 224)
+++ trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-09-05 16:23:10 UTC (rev 225)
@@ -1,9 +1,9 @@
database=/home/www/webapps/opentrep/trep/traveldb
log=opentrep_searcher.log
-user=opentrep
-passwd=opentrep
+user=geo
+passwd=geo
host=localhost
port=3306
-dbname=trep_opentrep
+dbname=geo_geonames
error=3
query="sna francicso rio de janero lso angles reykyavki"
Modified: trunk/opentrep/opentrep/batches/searcher.cpp
===================================================================
--- trunk/opentrep/opentrep/batches/searcher.cpp 2010-09-05 16:06:23 UTC (rev 224)
+++ trunk/opentrep/opentrep/batches/searcher.cpp 2010-09-05 16:23:10 UTC (rev 225)
@@ -32,9 +32,9 @@
const std::string K_OPENTREP_DEFAULT_QUERY_STRING ("sna francicso rio de janero lso angles reykyavki");
/** Default name and location for the Xapian database. */
-const std::string K_OPENTREP_DEFAULT_DB_USER ("opentrep");
-const std::string K_OPENTREP_DEFAULT_DB_PASSWD ("opentrep");
-const std::string K_OPENTREP_DEFAULT_DB_DBNAME ("trep_opentrep");
+const std::string K_OPENTREP_DEFAULT_DB_USER ("geo");
+const std::string K_OPENTREP_DEFAULT_DB_PASSWD ("geo");
+const std::string K_OPENTREP_DEFAULT_DB_DBNAME ("geo_geonames");
const std::string K_OPENTREP_DEFAULT_DB_HOST ("localhost");
const std::string K_OPENTREP_DEFAULT_DB_PORT ("3306");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-05 16:06:29
|
Revision: 224
http://opentrep.svn.sourceforge.net/opentrep/?rev=224&view=rev
Author: denis_arnaud
Date: 2010-09-05 16:06:23 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
[Data] Data management is now handled by OpenGeo++.
Modified Paths:
--------------
trunk/opentrep/configure.ac
Property Changed:
----------------
trunk/opentrep/
Property changes on: trunk/opentrep
___________________________________________________________________
Modified: svn:externals
- config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit
db https://opengeopp.svn.sourceforge.net/svnroot/opengeopp/trunk/opengeopp/refdata/trep
Modified: trunk/opentrep/configure.ac
===================================================================
--- trunk/opentrep/configure.ac 2010-09-05 14:37:45 UTC (rev 223)
+++ trunk/opentrep/configure.ac 2010-09-05 16:06:23 UTC (rev 224)
@@ -287,9 +287,6 @@
po/Makefile.in
db/Makefile
db/admin/Makefile
- db/maintenance/Makefile
- db/maintenance/tables/Makefile
- db/data/Makefile
gui/Makefile
gui/icons/Makefile
gui/psp/Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-05 14:37:51
|
Revision: 223
http://opentrep.svn.sourceforge.net/opentrep/?rev=223&view=rev
Author: denis_arnaud
Date: 2010-09-05 14:37:45 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
[Data] Moved the db sub-directory.
Added Paths:
-----------
trunk/opentrep/db.old/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-05 14:37:31
|
Revision: 222
http://opentrep.svn.sourceforge.net/opentrep/?rev=222&view=rev
Author: denis_arnaud
Date: 2010-09-05 14:37:25 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
[Data] Moved the db sub-directory.
Removed Paths:
-------------
trunk/opentrep/db/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-04 16:43:05
|
Revision: 221
http://opentrep.svn.sourceforge.net/opentrep/?rev=221&view=rev
Author: denis_arnaud
Date: 2010-09-04 16:42:52 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
[Dev] Improved the robustness: the path given to the Xapian database is now checked for existence.
Modified Paths:
--------------
trunk/opentrep/configure.ac
trunk/opentrep/opentrep/OPENTREP_Types.hpp
trunk/opentrep/opentrep/basic/Makefile.am
trunk/opentrep/opentrep/batches/indexer.cpp
trunk/opentrep/opentrep/batches/searcher.cpp
trunk/opentrep/opentrep/bom/Makefile.am
trunk/opentrep/opentrep/command/Makefile.am
trunk/opentrep/opentrep/core/Makefile.am
trunk/opentrep/opentrep/dbadaptor/Makefile.am
trunk/opentrep/opentrep/factory/Makefile.am
trunk/opentrep/opentrep/service/Makefile.am
trunk/opentrep/opentrep/service/OPENTREP_Service.cpp
trunk/opentrep/opentrep/service/OPENTREP_ServiceContext.cpp
trunk/opentrep/opentrep/service/sources.mk
Added Paths:
-----------
trunk/opentrep/opentrep/service/ServiceUtilities.cpp
trunk/opentrep/opentrep/service/ServiceUtilities.hpp
Modified: trunk/opentrep/configure.ac
===================================================================
--- trunk/opentrep/configure.ac 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/configure.ac 2010-09-04 16:42:52 UTC (rev 221)
@@ -15,7 +15,7 @@
AC_SUBST(RPM_RELEASE)
# Shared library versioning
-GENERIC_LIBRARY_VERSION="0:4:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
@@ -148,6 +148,7 @@
AC_SUBST(BOOST_DATE_TIME_LIB)
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
AC_SUBST(BOOST_FILESYSTEM_LIB)
+AC_SUBST(BOOST_SYSTEM_LIB)
AC_SUBST(BOOST_THREAD_LIB)
AC_SUBST(BOOST_PYTHON_LIB)
#AC_SUBST(BOOST_ASIO_LIB)
@@ -357,6 +358,7 @@
o BOOST_DT_LIB .... : ${BOOST_DATE_TIME_LIB}
o BOOST_PO_LIB .... : ${BOOST_PROGRAM_OPTIONS_LIB}
o BOOST_FS_LIB .... : ${BOOST_FILESYSTEM_LIB}
+ o BOOST_SYS_LIB ... : ${BOOST_SYSTEM_LIB}
o BOOST_THRD_LIB .. : ${BOOST_THREAD_LIB}
o BOOST_PY_LIB .... : ${BOOST_PYTHON_LIB}
o BOOST_ASIO_LIB .. : ${BOOST_ASIO_LIB}
Modified: trunk/opentrep/opentrep/OPENTREP_Types.hpp
===================================================================
--- trunk/opentrep/opentrep/OPENTREP_Types.hpp 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/OPENTREP_Types.hpp 2010-09-04 16:42:52 UTC (rev 221)
@@ -45,6 +45,9 @@
class XapianTravelDatabaseEmptyException : public XapianException {
};
+ class XapianTravelDatabaseWrongPathnameException : public XapianException {
+ };
+
class XapianTravelDatabaseNotInSyncWithSQLDatabaseException : public XapianException {
};
Modified: trunk/opentrep/opentrep/basic/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/basic/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/basic/Makefile.am 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,11 +1,13 @@
-## basic sub-directory
+## opentrep/basic sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbas.la
+#
+noinst_LTLIBRARIES = libopentrepbas.la
-libbas_la_SOURCES= $(bas_h_sources) $(bas_cc_sources)
-libbas_la_CXXFLAGS =
+libopentrepbas_la_SOURCES = $(bas_h_sources) $(bas_cc_sources)
+libopentrepbas_la_CXXFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/basic
#pkginclude_HEADERS = $(bas_h_sources)
Modified: trunk/opentrep/opentrep/batches/indexer.cpp
===================================================================
--- trunk/opentrep/opentrep/batches/indexer.cpp 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/batches/indexer.cpp 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,6 +1,5 @@
-// C
-#include <assert.h>
// STL
+#include <cassert>
#include <iostream>
#include <sstream>
#include <fstream>
@@ -168,6 +167,7 @@
// /////////////// M A I N /////////////////
int main (int argc, char* argv[]) {
+
try {
// Output log File
@@ -220,7 +220,7 @@
//
std::cout << lNbOfEntries << " entries have been processed" << std::endl;
-
+
} catch (const OPENTREP::RootException& otexp) {
std::cerr << "Standard exception: " << otexp.what() << std::endl;
return -1;
@@ -232,6 +232,6 @@
} catch (...) {
return -1;
}
-
+
return 0;
}
Modified: trunk/opentrep/opentrep/batches/searcher.cpp
===================================================================
--- trunk/opentrep/opentrep/batches/searcher.cpp 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/batches/searcher.cpp 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,6 +1,5 @@
-// C
-#include <assert.h>
// STL
+#include <cassert>
#include <iostream>
#include <sstream>
#include <fstream>
Modified: trunk/opentrep/opentrep/bom/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/bom/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/bom/Makefile.am 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,12 +1,14 @@
-## bom sub-directory
+## opentrep/bom sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbom.la
+#
+noinst_LTLIBRARIES= libopentrepbom.la
-libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources)
-libbom_la_CXXFLAGS = $(GSL_CFLAGS)
-libbom_la_LDFLAGS = $(GSL_LIBS)
+libopentrepbom_la_SOURCES = $(bom_h_sources) $(bom_cc_sources)
+libopentrepbom_la_CXXFLAGS = $(GSL_CFLAGS)
+libopentrepbom_la_LDFLAGS = $(GSL_LIBS)
+#
#pkgincludedir = $(includedir)/@PACKAGE@/bom
#pkginclude_HEADERS = $(bom_h_sources)
Modified: trunk/opentrep/opentrep/command/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/command/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/command/Makefile.am 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,12 +1,15 @@
-## command sub-directory
+## opentrep/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libcmd.la
+#
+noinst_LTLIBRARIES = libopentrepcmd.la
-libcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources)
-libcmd_la_CXXFLAGS = $(SOCI_CFLAGS) $(XAPIAN_CFLAGS) $(MYSQL_CFLAGS)
-libcmd_la_LDFLAGS = $(SOCI_LIBS) $(XAPIAN_LIBS) $(MYSQL_LIBS)
+libopentrepcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources)
+libopentrepcmd_la_CXXFLAGS = $(SOCI_CFLAGS) $(XAPIAN_CFLAGS) \
+ $(MYSQL_CFLAGS) $(BOOST_CFLAGS)
+libopentrepcmd_la_LDFLAGS = $(SOCI_LIBS) $(XAPIAN_LIBS) $(MYSQL_LIBS)
+#
#pkgincludedir = $(includedir)/@PACKAGE@/command
#pkginclude_HEADERS = $(cmd_h_sources)
Modified: trunk/opentrep/opentrep/core/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/core/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/core/Makefile.am 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,3 +1,4 @@
+## opentrep/core sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -13,17 +14,17 @@
lib@PACKAGE@_la_SOURCES = $(service_h_sources) $(service_cc_sources)
lib@PACKAGE@_la_LIBADD = \
- $(top_builddir)/@PACKAGE@/basic/libbas.la \
- $(top_builddir)/@PACKAGE@/bom/libbom.la \
- $(top_builddir)/@PACKAGE@/factory/libfac.la \
- $(top_builddir)/@PACKAGE@/dbadaptor/libdba.la \
- $(top_builddir)/@PACKAGE@/command/libcmd.la \
- $(top_builddir)/@PACKAGE@/service/libsvc.la
+ $(top_builddir)/@PACKAGE@/basic/libopentrepbas.la \
+ $(top_builddir)/@PACKAGE@/bom/libopentrepbom.la \
+ $(top_builddir)/@PACKAGE@/factory/libopentrepfac.la \
+ $(top_builddir)/@PACKAGE@/dbadaptor/libopentrepdba.la \
+ $(top_builddir)/@PACKAGE@/command/libopentrepcmd.la \
+ $(top_builddir)/@PACKAGE@/service/libopentrepsvc.la
lib@PACKAGE@_la_LDFLAGS = \
$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(SOCI_LIBS) -version-info $(GENERIC_LIBRARY_VERSION)
+ $(BOOST_FILESYSTEM_LIB) $(SOCI_LIBS) \
+ -version-info $(GENERIC_LIBRARY_VERSION)
# Header files
pkginclude_HEADERS = $(service_h_sources)
nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
-
Modified: trunk/opentrep/opentrep/dbadaptor/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/dbadaptor/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/dbadaptor/Makefile.am 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,12 +1,14 @@
-## dba sub-directory
+## opentrep/dbadaptor sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libdba.la
+#
+noinst_LTLIBRARIES = libopentrepdba.la
-libdba_la_SOURCES= $(dba_h_sources) $(dba_cc_sources)
-libdba_la_CXXFLAGS = $(CXXFLAGS_OPT) $(SOCI_CFLAGS)
-libdba_la_LIBADD = $(SOCI_LIBS)
+libopentrepdba_la_SOURCES= $(dba_h_sources) $(dba_cc_sources)
+libopentrepdba_la_CXXFLAGS = $(SOCI_CFLAGS)
+libopentrepdba_la_LIBADD = $(SOCI_LIBS)
+#
#pkgincludedir = $(includedir)/@PACKAGE@/dba
#pkginclude_HEADERS = $(dba_h_sources)
Modified: trunk/opentrep/opentrep/factory/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/factory/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/factory/Makefile.am 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,11 +1,13 @@
-## factory sub-directory
+## opentrep/factory sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libfac.la
+#
+noinst_LTLIBRARIES = libopentrepfac.la
-libfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources)
-libfac_la_CXXFLAGS =
+libopentrepfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources)
+libopentrepfac_la_CXXFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/factory
#pkginclude_HEADERS = $(fac_h_sources)
Modified: trunk/opentrep/opentrep/service/Makefile.am
===================================================================
--- trunk/opentrep/opentrep/service/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/service/Makefile.am 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,11 +1,14 @@
-## command sub-directory
+## opentrep/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libsvc.la
+#
+noinst_LTLIBRARIES = libopentrepsvc.la
-libsvc_la_SOURCES= $(svc_h_sources) $(svc_cc_sources)
-libsvc_la_CXXFLAGS = $(SOCI_CFLAGS)
+libopentrepsvc_la_SOURCES = $(svc_h_sources) $(svc_cc_sources)
+libopentrepsvc_la_CXXFLAGS = $(SOCI_CFLAGS) $(BOOST_CFLAGS)
+libopentrepsvc_la_LDFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/service
#pkginclude_HEADERS = $(svc_h_sources)
Modified: trunk/opentrep/opentrep/service/OPENTREP_Service.cpp
===================================================================
--- trunk/opentrep/opentrep/service/OPENTREP_Service.cpp 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/service/OPENTREP_Service.cpp 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,7 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// C
+// STL
#include <cassert>
// Boost
#include <boost/date_time/gregorian/gregorian.hpp>
@@ -16,6 +16,7 @@
#include <opentrep/command/RequestInterpreter.hpp>
#include <opentrep/factory/FacOpenTrepServiceContext.hpp>
#include <opentrep/service/OPENTREP_ServiceContext.hpp>
+#include <opentrep/service/ServiceUtilities.hpp>
#include <opentrep/service/Logger.hpp>
#include <opentrep/OPENTREP_Service.hpp>
@@ -62,9 +63,16 @@
// Check that the Xapian travel database is not empty
if (iTravelDatabaseName.empty() == true) {
OPENTREP_LOG_ERROR ("The filepath for the Xapian travel database is "
- << "empty.");
- throw XapianTravelDatabaseEmptyException();
+ << "not specified.");
+ throw XapianTravelDatabaseWrongPathnameException();
}
+
+ if (ServiceUtilities::isDirectory (iTravelDatabaseName) == false) {
+ OPENTREP_LOG_ERROR ("The filepath for the Xapian travel database ('"
+ << iTravelDatabaseName << "') does "
+ << "not correspond to a directory.");
+ throw XapianTravelDatabaseWrongPathnameException();
+ }
// Check that the parameters for the SQL database are not empty
if (iDBParams.check() == false) {
Modified: trunk/opentrep/opentrep/service/OPENTREP_ServiceContext.cpp
===================================================================
--- trunk/opentrep/opentrep/service/OPENTREP_ServiceContext.cpp 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/service/OPENTREP_ServiceContext.cpp 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,10 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// C
-#include <assert.h>
// STL
-#include <iostream>
+#include <cassert>
#include <sstream>
// OpenTrep
#include <opentrep/basic/BasConst_OPENTREP_Service.hpp>
Added: trunk/opentrep/opentrep/service/ServiceUtilities.cpp
===================================================================
--- trunk/opentrep/opentrep/service/ServiceUtilities.cpp (rev 0)
+++ trunk/opentrep/opentrep/service/ServiceUtilities.cpp 2010-09-04 16:42:52 UTC (rev 221)
@@ -0,0 +1,34 @@
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <cassert>
+// Boost::Filesystem
+#include <boost/filesystem.hpp>
+// OpenTREP
+#include <opentrep/service/Logger.hpp>
+#include <opentrep/service/ServiceUtilities.hpp>
+
+namespace OPENTREP {
+
+ // //////////////////////////////////////////////////////////////////////
+ bool ServiceUtilities::isDirectory (const std::string& iPath) {
+ bool oIsDirectory = false;
+
+ if (boost::filesystem::exists (iPath) == true) {
+
+ if (boost::filesystem::is_directory (iPath) == true) {
+ oIsDirectory = true;
+
+ } else {
+ OPENTREP_LOG_ERROR (iPath << " exists, but is not a directory");
+ }
+
+ } else {
+ OPENTREP_LOG_ERROR (iPath << " does not exist");
+ }
+
+ return oIsDirectory;
+ }
+
+}
Added: trunk/opentrep/opentrep/service/ServiceUtilities.hpp
===================================================================
--- trunk/opentrep/opentrep/service/ServiceUtilities.hpp (rev 0)
+++ trunk/opentrep/opentrep/service/ServiceUtilities.hpp 2010-09-04 16:42:52 UTC (rev 221)
@@ -0,0 +1,22 @@
+#ifndef __OPENTREP_SVC_SERVICEUTILITIES_HPP
+#define __OPENTREP_SVC_SERVICEUTILITIES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+
+namespace OPENTREP {
+
+ /** Class wrapping some utility functions. */
+ class ServiceUtilities {
+ public:
+ /** States whether the path given as parameter exists and is a directory.
+ @param const std::string& Path to be tested for existence.
+ @return bool Whether or not the path corresponds to a directory. */
+ static bool isDirectory (const std::string& iPath);
+ };
+
+}
+#endif // __OPENTREP_SVC_SERVICEUTILITIES_HPP
Modified: trunk/opentrep/opentrep/service/sources.mk
===================================================================
--- trunk/opentrep/opentrep/service/sources.mk 2010-09-04 15:51:55 UTC (rev 220)
+++ trunk/opentrep/opentrep/service/sources.mk 2010-09-04 16:42:52 UTC (rev 221)
@@ -1,7 +1,11 @@
-svc_h_sources = $(top_srcdir)/opentrep/service/ServiceAbstract.hpp \
- $(top_srcdir)/opentrep/service/OPENTREP_ServiceContext.hpp \
- $(top_srcdir)/opentrep/service/Logger.hpp
-svc_cc_sources = $(top_srcdir)/opentrep/service/ServiceAbstract.cpp \
- $(top_srcdir)/opentrep/service/OPENTREP_ServiceContext.cpp \
- $(top_srcdir)/opentrep/service/Logger.cpp \
- $(top_srcdir)/opentrep/service/OPENTREP_Service.cpp
+svc_h_sources = \
+ $(top_srcdir)/opentrep/service/ServiceAbstract.hpp \
+ $(top_srcdir)/opentrep/service/OPENTREP_ServiceContext.hpp \
+ $(top_srcdir)/opentrep/service/ServiceUtilities.hpp \
+ $(top_srcdir)/opentrep/service/Logger.hpp
+svc_cc_sources = \
+ $(top_srcdir)/opentrep/service/ServiceAbstract.cpp \
+ $(top_srcdir)/opentrep/service/OPENTREP_ServiceContext.cpp \
+ $(top_srcdir)/opentrep/service/ServiceUtilities.cpp \
+ $(top_srcdir)/opentrep/service/Logger.cpp \
+ $(top_srcdir)/opentrep/service/OPENTREP_Service.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-04 15:52:02
|
Revision: 220
http://opentrep.svn.sourceforge.net/opentrep/?rev=220&view=rev
Author: denis_arnaud
Date: 2010-09-04 15:51:55 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
[Test] Fixed linking error in test.
Modified Paths:
--------------
trunk/opentrep/test/Makefile.am
Modified: trunk/opentrep/test/Makefile.am
===================================================================
--- trunk/opentrep/test/Makefile.am 2010-08-20 10:50:14 UTC (rev 219)
+++ trunk/opentrep/test/Makefile.am 2010-09-04 15:51:55 UTC (rev 220)
@@ -17,9 +17,8 @@
IndexBuildingTestSuite_SOURCES = IndexBuildingTestSuite.hpp \
IndexBuildingTestSuite.cpp
IndexBuildingTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
-IndexBuildingTestSuite_LDADD = \
- $(top_builddir)/extracppunit/libextracc-extracppunit.la
+IndexBuildingTestSuite_LDADD =
IndexBuildingTestSuite_LDFLAGS = \
- $(BOOST_LIBS) $(SOCI_LIBS) $(XAPIAN_LIBS) $(CPPUNIT_LIBS) \
- $(top_builddir)/@PACKAGE@/lib@PACKAGE@.la
-
+ $(BOOST_LIBS) $(SOCI_LIBS) $(XAPIAN_LIBS) $(CPPUNIT_LIBS) \
+ $(top_builddir)/extracppunit/libextracc-extracppunit.la \
+ $(top_builddir)/@PACKAGE@/core/lib@PACKAGE@.la
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-08-20 10:50:20
|
Revision: 219
http://opentrep.svn.sourceforge.net/opentrep/?rev=219&view=rev
Author: denis_arnaud
Date: 2010-08-20 10:50:14 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
[Build] Added a missing tab in the Makefile.
Modified Paths:
--------------
trunk/opentrep/Makefile.am
Modified: trunk/opentrep/Makefile.am
===================================================================
--- trunk/opentrep/Makefile.am 2010-07-22 18:59:06 UTC (rev 218)
+++ trunk/opentrep/Makefile.am 2010-08-20 10:50:14 UTC (rev 219)
@@ -51,7 +51,7 @@
snapshot-src:
- $(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
+ $(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
$(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-html-doc-`date +"%Y%m%d"`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-22 18:59:13
|
Revision: 218
http://opentrep.svn.sourceforge.net/opentrep/?rev=218&view=rev
Author: denis_arnaud
Date: 2010-07-22 18:59:06 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
[Structure] Removed the wsdlpull directory (now in the WSDLPull project).
Removed Paths:
-------------
branches/wsdlpull-1.23/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-22 18:57:32
|
Revision: 217
http://opentrep.svn.sourceforge.net/opentrep/?rev=217&view=rev
Author: denis_arnaud
Date: 2010-07-22 18:57:26 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
[Structure] Removed the wsdlpull directory (now in the WSDLPull project).
Removed Paths:
-------------
trunk/wsdlpull/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-06-25 15:11:30
|
Revision: 216
http://opentrep.svn.sourceforge.net/opentrep/?rev=216&view=rev
Author: denis_arnaud
Date: 2010-06-25 15:11:23 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
[Doc] Updated the TODO list with date parsing format.
Modified Paths:
--------------
trunk/opentrep/TODO
Modified: trunk/opentrep/TODO
===================================================================
--- trunk/opentrep/TODO 2010-03-06 15:50:56 UTC (rev 215)
+++ trunk/opentrep/TODO 2010-06-25 15:11:23 UTC (rev 216)
@@ -1,6 +1,10 @@
Todo list for the OpenTrep project
----------------------------------
+* [25/06/2010] For date parsing, RememberTheMilk (RTM) gathers on a page
+ all the formats supported by its parser:
+ http://www.rememberthemilk.com/help/answers/basics/dateformat.rtm
+
* [06/09/2009] Add the data type (e.g., "GEO", "TIM", "AIR", "PAX")
in front of the Xapian document data (when indexing).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-03-06 15:51:06
|
Revision: 215
http://opentrep.svn.sourceforge.net/opentrep/?rev=215&view=rev
Author: denis_arnaud
Date: 2010-03-06 15:50:56 +0000 (Sat, 06 Mar 2010)
Log Message:
-----------
[DB] Gave more weight to Athens and Berlin.
Modified Paths:
--------------
trunk/opentrep/db/data/ref_place_names.csv
trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
trunk/opentrep/opentrep/python/pyopentrep.py
Modified: trunk/opentrep/db/data/ref_place_names.csv
===================================================================
--- trunk/opentrep/db/data/ref_place_names.csv 2010-03-06 15:04:19 UTC (rev 214)
+++ trunk/opentrep/db/data/ref_place_names.csv 2010-03-06 15:50:56 UTC (rev 215)
@@ -418,7 +418,7 @@
en,ate,antlers,antlers/ok/us
en,atf,ambato,ambato/ec:chachoan
en,atg,attock,attock/pk
-en,ath,athens,athens/gr:int e venizelosc
+en,ath,athens,athens/gr:int e venizelosc,athens
en,ati,artigas,artigas/uy
en,atj,antsirabe,antsirabe/mg
en,atk,atqasuk,atqasuk/ak/us
@@ -658,7 +658,7 @@
en,beo,newcastle beo,newcastle/ns/au:belmont
en,bep,bellary,bellary/in
en,beq,bury st edmunds,bury st edmunds/gb:honington
-en,ber,berlin,berlin/de
+en,ber,berlin,berlin/de,berlin
en,bes,brest,brest/fr:guipavas
en,bet,bethel airport,bethel/ak/us:bethel airport
en,beu,bedourie,bedourie/ql/au
Modified: trunk/opentrep/opentrep/batches/opentrep_indexer.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2010-03-06 15:04:19 UTC (rev 214)
+++ trunk/opentrep/opentrep/batches/opentrep_indexer.cfg 2010-03-06 15:50:56 UTC (rev 215)
@@ -1,4 +1,4 @@
-database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
+database=/home/www/webapps/opentrep/trep/traveldb
log=opentrep_indexer.log
user=opentrep
passwd=opentrep
Modified: trunk/opentrep/opentrep/batches/opentrep_searcher.cfg
===================================================================
--- trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-03-06 15:04:19 UTC (rev 214)
+++ trunk/opentrep/opentrep/batches/opentrep_searcher.cfg 2010-03-06 15:50:56 UTC (rev 215)
@@ -1,4 +1,4 @@
-database=/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb
+database=/home/www/webapps/opentrep/trep/traveldb
log=opentrep_searcher.log
user=opentrep
passwd=opentrep
Modified: trunk/opentrep/opentrep/python/pyopentrep.py
===================================================================
--- trunk/opentrep/opentrep/python/pyopentrep.py 2010-03-06 15:04:19 UTC (rev 214)
+++ trunk/opentrep/opentrep/python/pyopentrep.py 2010-03-06 15:50:56 UTC (rev 215)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import sys, getopt
-sys.path.append('.libs')
+sys.path.append('/home/www/webapps/opentrep/trep/lib')
# Default search string
defaultSearchString = 'sna francicso rio de janero lso angles reykyavki'
@@ -52,7 +52,7 @@
# Initialise the OpenTrep C++ library
import libpyopentrep
openTrepLibrary = libpyopentrep.OpenTrepSearcher()
-openTrepLibrary.init('/home/sim/deliveries/opentrep-99.99.99/share/opentrep/traveldb', 'pyopentrep.log', 'opentrep', 'opentrep', 'localhost', '3306', 'trep_opentrep')
+openTrepLibrary.init('/home/www/webapps/opentrep/trep/traveldb', 'pyopentrep.log', 'opentrep', 'opentrep', 'localhost', '3306', 'trep_opentrep')
# If no search string was supplied as arguments of the command-line,
# ask the user for some
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
