From: andreaz Date: Sat, 25 Jul 2009 19:53:07 +0000 (+0200) Subject: Changed the project's name. X-Git-Tag: 0.1.0~9 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=ec4fe51a1efc9afdd4e2f1d6750037724c816737;p=libgdaex Changed the project's name. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3364fb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +INSTALL +Makefile +Makefile.in +aclocal.m4 +autom4te.cache/ +config.guess +config.h +config.h.in~ +config.log +config.status +config.sub +configure +depcomp +docs/Makefile +docs/Makefile.in +docs/reference/Makefile +docs/reference/Makefile.in +docs/reference/version.xml +gtk-doc.make +install-sh +libgdaex.pc +libtool +ltmain.sh +m4/ +missing +src/.deps/ +src/Makefile +src/Makefile.in +stamp-h1 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..602bfc9 --- /dev/null +++ b/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/Makefile.am b/Makefile.am index a4e8fbd..90f32ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,9 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc SUBDIRS = src docs -EXTRA_DIST = libgdaobj.pc.in +ACLOCAL_AMFLAGS = -I m4 + +EXTRA_DIST = libgdaex.pc.in pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgdaobj.pc +pkgconfig_DATA = libgdaex.pc diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..bc00245 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,98 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir +PROJECT=libgdaex +TEST_TYPE=-f +FILE=configure.ac + +DIE=0 + +have_libtool=false +if libtoolize --version < /dev/null > /dev/null 2>&1 ; then + libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + case $libtool_version in + 2.*) + have_libtool=true + ;; + esac +fi +if $have_libtool ; then : ; else + echo + echo "You must have libtool >= 2 installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" + DIE=1 +fi + +(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have gtk-doc installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" + DIE=1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" + DIE=1 +} + +if automake --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE=automake + ACLOCAL=aclocal +else + echo + echo "You must have automake 1.7.x installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" + DIE=1 +fi + +if test "$DIE" -eq 1; then + exit 1 +fi + +test $TEST_TYPE $FILE || { + echo "You must run this script in the top-level $PROJECT directory" + exit 1 +} + +if test -z "$AUTOGEN_SUBDIR_MODE"; then + if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." + fi +fi + +rm -rf autom4te.cache + +# README and INSTALL are required by automake, but may be deleted by clean +# up rules. to get automake to work, simply touch these here, they will be +# regenerated from their corresponding *.in files by ./configure anyway. +touch README INSTALL + +$ACLOCAL || exit $? + +libtoolize --force || exit $? +gtkdocize || exit $? + +autoheader || exit $? + +$AUTOMAKE --add-missing || exit $? +autoconf || exit $? +cd $ORIGDIR || exit $? + +if test -z "$AUTOGEN_SUBDIR_MODE"; then + $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? + + echo + echo "Now type 'make' to compile $PROJECT." +fi diff --git a/config.h.in b/config.h.in index 7f52201..71452cc 100644 --- a/config.h.in +++ b/config.h.in @@ -36,6 +36,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE diff --git a/config.h.in~ b/config.h.in~ deleted file mode 100644 index 7f52201..0000000 --- a/config.h.in~ +++ /dev/null @@ -1,64 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const diff --git a/configure.ac b/configure.ac index 9780547..61aa707 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libgdaobj], [0.0.2], [azagli@libero.it]) -AC_CONFIG_SRCDIR([src/gdaobj.c]) +AC_INIT([libgdaex], [0.1.0], [azagli@libero.it]) +AC_CONFIG_SRCDIR([src/gdaex.c]) AM_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE @@ -13,6 +13,8 @@ AC_LIBTOOL_WIN32_DLL AC_CANONICAL_SYSTEM +AC_CONFIG_MACRO_DIR([m4]) + # Checks for programs. AC_PROG_CXX AC_PROG_CC @@ -25,10 +27,10 @@ AC_PROG_LIBTOOL GTK_DOC_CHECK(1.0) # Checks for libraries. -PKG_CHECK_MODULES(GDAOBJ, [libgda >= 1.2.0]) +PKG_CHECK_MODULES(GDAEX, [libgda-4.0 >= 4]) -AC_SUBST(GDAOBJ_CFLAGS) -AC_SUBST(GDAOBJ_LIBS) +AC_SUBST(GDAEX_CFLAGS) +AC_SUBST(GDAEX_LIBS) # Checks for header files. AC_HEADER_STDC @@ -41,7 +43,7 @@ AC_C_CONST AC_CHECK_FUNCS([strchr strcasecmp]) AC_CONFIG_FILES([ - libgdaobj.pc + libgdaex.pc Makefile src/Makefile docs/Makefile diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 63eaa8a..bee8c6e 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -DOC_MODULE=libgdaoj +DOC_MODULE=libgdaex # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -67,8 +67,8 @@ expand_content_files= # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir)/src $(GDAOBJ_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libgdaobj.la $(GDAOBJ_LIBS) +INCLUDES=-I$(top_srcdir)/src $(GDAEX_CFLAGS) +GTKDOC_LIBS=$(top_builddir)/src/libgdaex.la $(GDAEX_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/libgdaex.pc.in b/libgdaex.pc.in new file mode 100644 index 0000000..b18ca85 --- /dev/null +++ b/libgdaex.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: A libgda's "subclass" +Version: @PACKAGE_VERSION@ +Requires: libgda +Libs: -L${libdir} -lgdaobj +Cflags: -I${includedir} diff --git a/libgdaobj.pc.in b/libgdaobj.pc.in deleted file mode 100644 index b18ca85..0000000 --- a/libgdaobj.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@ -Description: A libgda's "subclass" -Version: @PACKAGE_VERSION@ -Requires: libgda -Libs: -L${libdir} -lgdaobj -Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index 0e22032..85940a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,12 @@ AM_CPPFLAGS = -I$(top_srcdir) \ - $(GDAOBJ_CFLAGS) + $(GDAEX_CFLAGS) -LIBS = $(GDAOBJ_LIBS) +LIBS = $(GDAEX_LIBS) -lib_LTLIBRARIES = libgdaobj.la +lib_LTLIBRARIES = libgdaex.la -libgdaobj_la_SOURCES = gdaobj.c +libgdaex_la_SOURCES = gdaex.c -libgdaobj_la_LDFLAGS = -no-undefined +libgdaex_la_LDFLAGS = -no-undefined -include_HEADERS = libgdaobj.h +include_HEADERS = libgdaex.h diff --git a/src/gdaex.c b/src/gdaex.c new file mode 100644 index 0000000..71753ee --- /dev/null +++ b/src/gdaex.c @@ -0,0 +1,888 @@ +/* + * gdaex.c + * + * Copyright (C) 2005-2009 Andrea Zagli + * + * This file is part of libgdaex. + * + * libgdaobj is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libgdaobj is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with libgdaobj; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include + +#include "libgdaex.h" + +static void gdao_class_init (GdaOClass *klass); +static void gdao_init (GdaO *gdao); + +static void gdao_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gdao_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void get_errors (GdaConnection *connection); + +#define GDAO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GDAO, GdaOPrivate)) + +typedef struct _GdaOPrivate GdaOPrivate; +struct _GdaOPrivate + { + GdaClient *gda_client; + GdaConnection *gda_conn; + GdaTransaction *gda_trans; + }; + +GType +gdao_get_type (void) +{ + static GType gdao_type = 0; + + if (!gdao_type) + { + static const GTypeInfo gdao_info = + { + sizeof (GdaOClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gdao_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GdaO), + 0, /* n_preallocs */ + (GInstanceInitFunc) gdao_init, + NULL + }; + + gdao_type = g_type_register_static (G_TYPE_OBJECT, "GdaO", + &gdao_info, 0); + } + + return gdao_type; +} + +static void +gdao_class_init (GdaOClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (GdaOPrivate)); + + object_class->set_property = gdao_set_property; + object_class->get_property = gdao_get_property; +} + +static void +gdao_init (GdaO *gdao) +{ + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + priv->gda_trans = NULL; +} + +static GdaO +*gdao_new_ (GdaClient *gda_client) +{ + GdaO *gdao = GDAO (g_object_new (gdao_get_type (), NULL)); + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + if (gda_client == NULL) + { + /* create a new GdaClient */ + priv->gda_client = gda_client_new (); + if (priv->gda_client == NULL) + { + g_warning ("Unable to create a libgda's client."); + return NULL; + } + } + else + { + priv->gda_client = gda_client; + } + + return gdao; +} + +/** + * gdao_new: + * @gda_client: a #GdaClient object. If it's %NULL, it will be created a new one. + * @datasource: GDA data source name to connect to. + * @username: user name to use to connect. + * @password: password for @username. + * + * If @username and @password are both NULL or empty, it will be used those + * defined into datasource. + * + * Return value: the newly created #GdaO. + */ +GdaO +*gdao_new (GdaClient *gda_client, + const gchar *datasource, + const gchar *username, + const gchar *password) +{ + GdaO *gdao; + GdaOPrivate *priv; + + if (datasource == NULL || strcmp (g_strstrip (g_strdup (datasource)), "") == 0) + { + /* TO DO */ + g_warning ("datasource must not be empty."); + return NULL; + } + + gdao = gdao_new_ (gda_client); + if (gdao == NULL) + { + /* TO DO */ + return NULL; + } + + priv = GDAO_GET_PRIVATE (gdao); + + /* open database connection */ + priv->gda_conn = gda_client_open_connection (priv->gda_client, + datasource, + username, + password, + 0); + if (priv->gda_conn == NULL) + { + g_warning ("Unable to create the connection."); + return NULL; + } + + return gdao; +} + +/** + * gdao_new_from_string: + * @gda_client: a #GdaClient object. If it's %NULL, it will be created a new one. + * @provider_id: the provider id. + * @cnc_string: the connection string. + * + * Return value: the newly created #GdaO. + */ +GdaO +*gdao_new_from_string (GdaClient *gda_client, + const gchar *provider_id, + const gchar *cnc_string) +{ + GdaO *gdao; + GdaOPrivate *priv; + + if (provider_id == NULL || strcmp (g_strstrip (g_strdup (provider_id)), "") == 0) + { + /* TO DO */ + g_warning ("provider_id must not be empty."); + return NULL; + } + + if (cnc_string == NULL || strcmp (g_strstrip (g_strdup (cnc_string)), "") == 0) + { + /* TO DO */ + g_warning ("cnc_string must not be empty."); + return NULL; + } + + gdao = gdao_new_ (gda_client); + if (gdao == NULL) + { + /* TO DO */ + return NULL; + } + + priv = GDAO_GET_PRIVATE (gdao); + + /* open database connection */ + priv->gda_conn = gda_client_open_connection_from_string (priv->gda_client, + provider_id, + cnc_string, + 0); + if (priv->gda_conn == NULL) + { + g_warning ("Unable to create the connection.\n" + "provider_id: %s\tcnc_string: %s\n", + provider_id, cnc_string); + return NULL; + } + + return gdao; +} + +/** + * gdao_new_from_connection: + * @conn: a #GdaConnection. + * + * Returns a #GdaO from an existing #GdaConnection. + * + * Return value: the newly created #GdaO. + */ +GdaO +*gdao_new_from_connection (GdaConnection *conn) +{ + GdaO *gdao; + + if (conn == NULL) return NULL; + + gdao = gdao_new_ (gda_connection_get_client (conn)); + + return gdao; +} + +/** + * gdao_get_gdaclient: + * @gdao: a #GdaO object. + * + * Return value: the #GdaClient associated to the #GdaO. + */ +const GdaClient +*gdao_get_gdaclient (GdaO *gdao) +{ + if (gdao == NULL) + { + return NULL; + } + else + { + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + return priv->gda_client; + } +} + +/** + * gdao_get_gdaconnection: + * @gdao: a #GdaO object. + * + * Return value: the #GdaConnection associated to the #GdaO. + */ +const GdaConnection +*gdao_get_gdaconnection (GdaO *gdao) +{ + if (gdao == NULL) + { + return NULL; + } + else + { + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + return priv->gda_conn; + } +} + +/** + * gdao_get_provider: + * @gdao: a #GdaO object. + * + * Return value: the provider id associated to the #GdaO. + */ +const gchar +*gdao_get_provider (GdaO *gdao) +{ + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + return gda_connection_get_provider (priv->gda_conn); +} + +/** + * gdao_query: + * @gdao: a #GdaO object. + * @sql: the sql text. + * + * Execute a selection query (SELECT). + * + * Return value: a #GdaDataModel, or NULL if query fails. + */ +GdaDataModel +*gdao_query (GdaO *gdao, const gchar *sql) +{ + if (gdao == NULL) return NULL; + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + GdaCommand *gda_comm = gda_command_new (sql, GDA_COMMAND_TYPE_SQL, GDA_COMMAND_OPTION_STOP_ON_ERRORS); + GdaDataModel *dm = gda_connection_execute_single_command (priv->gda_conn, gda_comm, NULL); + + if (dm == NULL) + { + g_fprintf (stderr, "SQL: %s\n", sql); + get_errors (priv->gda_conn); + } + + gda_command_free (gda_comm); + + return dm; +} + +/* TO DO - define as macro */ +/* TO DO - catch error for gda_data_model_get_column_position */ +/** + * return the field_name's GdaValue as gchar (stringify) + */ +gchar +*gdao_data_model_get_field_value_stringify_at (GdaDataModel *data_model, + gint row, + const gchar *field_name) +{ + gchar *value = ""; + gint col; + + col = gda_data_model_get_column_position (data_model, field_name); + + if (col >= 0) + { + value = gdao_data_model_get_value_stringify_at (data_model, row, col); + } + + return value; +} + +/* TO DO - define as macro */ +/* TO DO - catch error for gda_data_model_get_column_position */ +/** + * return the field_name's GdaValue as gint + */ +gint +gdao_data_model_get_field_value_integer_at (GdaDataModel *data_model, + gint row, + const gchar *field_name) +{ + gint value = 0; + gint col; + + col = gda_data_model_get_column_position (data_model, field_name); + + if (col >= 0) + { + value = gdao_data_model_get_value_integer_at (data_model, row, col); + } + + return value; +} + +/* TO DO - define as macro */ +/* TO DO - catch error for gda_data_model_get_column_position */ +/** + * return the field_name's GdaValue as gfloat + */ +gfloat +gdao_data_model_get_field_value_float_at (GdaDataModel *data_model, + gint row, + const gchar *field_name) +{ + gfloat value = 0.0f; + gint col; + + col = gda_data_model_get_column_position (data_model, field_name); + + if (col >= 0) + { + value = gdao_data_model_get_value_float_at (data_model, row, col); + } + + return value; +} + +/* TO DO - define as macro */ +/* TO DO - catch error for gda_data_model_get_column_position */ +/** + * return the field_name's GdaValue as gdouble + */ +gdouble +gdao_data_model_get_field_value_double_at (GdaDataModel *data_model, + gint row, + const gchar *field_name) +{ + gdouble value = 0.0; + gint col; + + col = gda_data_model_get_column_position (data_model, field_name); + + if (col >= 0) + { + value = gdao_data_model_get_value_double_at (data_model, row, col); + } + + return value; +} + +/* TO DO - define as macro */ +/* TO DO - catch error for gda_data_model_get_column_position */ +/** + * return the field_name's GdaValue as gboolean + */ +gboolean +gdao_data_model_get_field_value_boolean_at (GdaDataModel *data_model, + gint row, + const gchar *field_name) +{ + gboolean value = FALSE; + gint col; + + col = gda_data_model_get_column_position (data_model, field_name); + + if (col >= 0) + { + value = gdao_data_model_get_value_boolean_at (data_model, row, col); + } + + return value; +} + +/* TO DO - define as macro */ +/* TO DO - catch error for gda_data_model_get_column_position */ +/** + * return the field_name's GdaValue as GDate + */ +GDate +*gdao_data_model_get_field_value_gdate_at (GdaDataModel *data_model, + gint row, + const gchar *field_name) +{ + GDate *value = NULL; + gint col; + + col = gda_data_model_get_column_position (data_model, field_name); + + if (col >= 0) + { + value = gdao_data_model_get_value_gdate_at (data_model, row, col); + } + + return value; +} + +/** + * gdao_data_model_get_value_stringify_at: + * @data_model: a #GdaDataModel object. + * @row: row number. + * @col: col number. + * + * Return value: the #GdaValue as #gchar (stringify). + */ +gchar +*gdao_data_model_get_value_stringify_at (GdaDataModel *data_model, gint row, gint col) +{ + gchar *ret = ""; + + GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); + if (!gda_value_is_null (v)) + { + ret = g_strdup (gda_value_stringify (v)); + } + + return ret; +} + +/** + * gdao_data_model_get_value_integer_at: + * @data_model: a #GdaDataModel object. + * @row: row number. + * @col: col number. + * + * Return value: the #GdaValue as #gint. + */ +gint +gdao_data_model_get_value_integer_at (GdaDataModel *data_model, gint row, gint col) +{ + gint ret = 0; + + GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); + if (v == NULL) + { + /* TO DO */ + /* trap errors */ + } + else if (!gda_value_is_null (v)) + { + if (gda_value_isa (v, GDA_VALUE_TYPE_INTEGER)) + { + ret = gda_value_get_integer (v); + } + else + { + ret = atol (gda_value_stringify (v)); + } + } + + return ret; +} + +/** + * gdao_data_model_get_value_float_at: + * @data_model: a #GdaDataModel object. + * @row: row number. + * @col: col number. + * + * Return value: the #GdaValue as #gfloat. + */ +gfloat +gdao_data_model_get_value_float_at (GdaDataModel *data_model, gint row, gint col) +{ + gfloat ret = 0.0f; + + GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); + if (!gda_value_is_null (v)) + { + ret = gda_value_get_single (v); + } + + return ret; +} + +/** + * gdao_data_model_get_value_double_at: + * @data_model: a #GdaDataModel object. + * @row: row number. + * @col: col number. + * + * Return value: the #GdaValue as #gdouble. + */ +gdouble +gdao_data_model_get_value_double_at (GdaDataModel *data_model, gint row, gint col) +{ + gdouble ret = 0.0; + + GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); + if (!gda_value_is_null (v)) + { + ret = gda_value_get_double (v); + } + + return ret; +} + +/** + * gdao_data_model_get_value_boolean_at: + * @data_model: a #GdaDataModel object. + * @row: row number. + * @col: col number. + * + * Return value: the #GdaValue as #gboolean. + */ +gboolean +gdao_data_model_get_value_boolean_at (GdaDataModel *data_model, gint row, gint col) +{ + gboolean ret = FALSE; + + GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); + if (v == NULL) + { + /* TO DO */ + /* trap errors */ + } + else if (!gda_value_is_null (v)) + { + if (gda_value_isa (v, GDA_VALUE_TYPE_BOOLEAN)) + { + ret = gda_value_get_boolean (v); + } + else + { + gchar *vstr = g_strstrip (gda_value_stringify (v)); + if (strcasecmp (vstr, "true") == 0 || + strcasecmp (vstr, "t") == 0 || + strcasecmp (vstr, "yes") == 0 || + strcasecmp (vstr, "y") == 0 || + atol (vstr) != 0) + { + ret = TRUE; + } + } + } + + return ret; +} + +/** + * gdao_data_model_get_value_gdate_at: + * @data_model: a #GdaDataModel object. + * @row: row number. + * @col: col number. + * + * Return value: the #GdaValue as #GDate. + */ +GDate +*gdao_data_model_get_value_gdate_at (GdaDataModel *data_model, gint row, gint col) +{ + GDate *ret = NULL; + const GdaDate *gdadate; + + GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); + if (!gda_value_is_null (v)) + { + gdadate = gda_value_get_date (v); + if (g_date_valid_dmy ((GDateDay)gdadate->day, (GDateMonth)gdadate->month, (GDateYear)gdadate->year)) + { + ret = g_date_new_dmy ((GDateDay)gdadate->day, (GDateMonth)gdadate->month, (GDateYear)gdadate->year); + } + } + + return ret; +} + +/** + * gdao_begin: + * @gdao: a #GdaO object. + * + * Begin a new transaction. + */ +gboolean +gdao_begin (GdaO *gdao) +{ + if (gdao == NULL) return FALSE; + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + priv->gda_trans = gda_transaction_new ("gdao"); + gda_transaction_set_isolation_level (priv->gda_trans, + GDA_TRANSACTION_ISOLATION_SERIALIZABLE); + + return gda_connection_begin_transaction (priv->gda_conn, priv->gda_trans); +} + +/** + * gdao_execute: + * @gdao: a #GdaO object. + * @sql: the sql text. + * + * Execute a command query (INSERT, UPDATE, DELETE). + * + * Return value: number of records affected by the query execution. + */ +gint +gdao_execute (GdaO *gdao, const gchar *sql) +{ + GdaCommand *gda_comm; + gint nrecs; + + if (gdao == NULL) return -1; + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + gda_comm = gda_command_new (sql, GDA_COMMAND_TYPE_SQL, GDA_COMMAND_OPTION_STOP_ON_ERRORS); + if (priv->gda_trans != NULL) + { + gda_command_set_transaction (gda_comm, priv->gda_trans); + } + nrecs = gda_connection_execute_non_query (priv->gda_conn, gda_comm, NULL); + + if (nrecs == -1) + { + g_fprintf (stderr, "SQL: %s\n", sql); + get_errors (priv->gda_conn); + } + + gda_command_free (gda_comm); + + return nrecs; +} + +/** + * gdao_commit: + * @gdao: a #GdaO object. + * + * Commit a transaction. + */ +gboolean +gdao_commit (GdaO *gdao) +{ + gboolean ret; + + if (gdao == NULL) return FALSE; + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + if (priv->gda_trans == NULL) + { + ret = FALSE; + } + else + { + ret = gda_connection_commit_transaction (priv->gda_conn, priv->gda_trans); + g_object_unref (priv->gda_trans); + priv->gda_trans = NULL; + } + + return ret; +} + +/** + * gdao_rollback: + * @gdao: a #GdaO object. + * + * Rollback a transaction. + */ +gboolean +gdao_rollback (GdaO *gdao) +{ + gboolean ret; + + if (gdao == NULL) return FALSE; + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + if (priv->gda_trans == NULL) + { + ret = FALSE; + } + else + { + ret = gda_connection_rollback_transaction (priv->gda_conn, priv->gda_trans); + g_object_unref (priv->gda_trans); + priv->gda_trans = NULL; + } + + return ret; +} + +/* TO DO */ +void +gdao_free (GdaO *gdao) +{ + if (gdao == NULL) return; + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + /* close connection */ + if (gda_connection_is_open (priv->gda_conn)) + { + gda_connection_close (priv->gda_conn); + } + + /*g_free (gdao);*/ +} + +/* UTILITY'S FUNCTIONS */ +/** + * gdao_strescape: + * @source: a string to escape. + * @exceptions: a string of characters not to escape in @source. + * + * As g_strescape(), but it escapes also '. + */ +gchar +*gdao_strescape (const gchar *source, const gchar *exceptions) +{ + gchar *ret = "", *nsource; + gint l = strlen (source); + + if (source == NULL || l == 0) return ""; + + nsource = g_strescape (g_strstrip (g_strdup (source)), exceptions); + + /* escape di ' */ + if (strchr (nsource, '\'') != NULL) + { + while (*nsource) + { + if (*nsource == '\'') + { + ret = g_strconcat (ret, "'", g_strdup_printf ("%c", *nsource), NULL); + } + else + { + ret = g_strconcat (ret, g_strdup_printf ("%c", *nsource), NULL); + } + + *nsource++; + } + + return g_strdup (ret); + } + else + { + return g_strdup (nsource); + } +} + +/** + * gdao_get_chr_quoting: + * @gdao: a #GdaO object. + * + */ +gchar +gdao_get_chr_quoting (GdaO *gdao) +{ + gchar chr = '\"'; + + const gchar *provider = gdao_get_provider (gdao); + + if (strcmp (provider, "MySQL") == 0) + { + chr = '`'; + } + + return chr; +} + +/* PRIVATE */ +static void +get_errors (GdaConnection *connection) +{ + GList *list; + GList *node; + GdaError *error; + + list = (GList *) gda_connection_get_errors (connection); + + for (node = g_list_first (list); node != NULL; node = g_list_next (node)) + { + error = (GdaError *) node->data; + g_fprintf (stderr, "Error no: %d\t", gda_error_get_number (error)); + g_fprintf (stderr, "desc: %s\t", gda_error_get_description (error)); + g_fprintf (stderr, "source: %s\t", gda_error_get_source (error)); + g_fprintf (stderr, "sqlstate: %s\n", gda_error_get_sqlstate (error)); + } +} + +static void +gdao_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + GdaO *gdao = GDAO (object); + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +gdao_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + GdaO *gdao = GDAO (object); + + GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} diff --git a/src/gdaobj.c b/src/gdaobj.c deleted file mode 100644 index bb258f8..0000000 --- a/src/gdaobj.c +++ /dev/null @@ -1,888 +0,0 @@ -/* - * gdaobj.c - * - * Copyright (C) 2005-2006 Andrea Zagli - * - * This file is part of libgdaobj. - * - * libgdaobj is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * libgdaobj is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with libgdaobj; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H - #include -#endif - -#include - -#include "libgdaobj.h" - -static void gdao_class_init (GdaOClass *klass); -static void gdao_init (GdaO *gdao); - -static void gdao_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); -static void gdao_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); - -static void get_errors (GdaConnection *connection); - -#define GDAO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GDAO, GdaOPrivate)) - -typedef struct _GdaOPrivate GdaOPrivate; -struct _GdaOPrivate - { - GdaClient *gda_client; - GdaConnection *gda_conn; - GdaTransaction *gda_trans; - }; - -GType -gdao_get_type (void) -{ - static GType gdao_type = 0; - - if (!gdao_type) - { - static const GTypeInfo gdao_info = - { - sizeof (GdaOClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gdao_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GdaO), - 0, /* n_preallocs */ - (GInstanceInitFunc) gdao_init, - NULL - }; - - gdao_type = g_type_register_static (G_TYPE_OBJECT, "GdaO", - &gdao_info, 0); - } - - return gdao_type; -} - -static void -gdao_class_init (GdaOClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (object_class, sizeof (GdaOPrivate)); - - object_class->set_property = gdao_set_property; - object_class->get_property = gdao_get_property; -} - -static void -gdao_init (GdaO *gdao) -{ - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - priv->gda_trans = NULL; -} - -static GdaO -*gdao_new_ (GdaClient *gda_client) -{ - GdaO *gdao = GDAO (g_object_new (gdao_get_type (), NULL)); - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - if (gda_client == NULL) - { - /* create a new GdaClient */ - priv->gda_client = gda_client_new (); - if (priv->gda_client == NULL) - { - g_warning ("Unable to create a libgda's client."); - return NULL; - } - } - else - { - priv->gda_client = gda_client; - } - - return gdao; -} - -/** - * gdao_new: - * @gda_client: a #GdaClient object. If it's %NULL, it will be created a new one. - * @datasource: GDA data source name to connect to. - * @username: user name to use to connect. - * @password: password for @username. - * - * If @username and @password are both NULL or empty, it will be used those - * defined into datasource. - * - * Return value: the newly created #GdaO. - */ -GdaO -*gdao_new (GdaClient *gda_client, - const gchar *datasource, - const gchar *username, - const gchar *password) -{ - GdaO *gdao; - GdaOPrivate *priv; - - if (datasource == NULL || strcmp (g_strstrip (g_strdup (datasource)), "") == 0) - { - /* TO DO */ - g_warning ("datasource must not be empty."); - return NULL; - } - - gdao = gdao_new_ (gda_client); - if (gdao == NULL) - { - /* TO DO */ - return NULL; - } - - priv = GDAO_GET_PRIVATE (gdao); - - /* open database connection */ - priv->gda_conn = gda_client_open_connection (priv->gda_client, - datasource, - username, - password, - 0); - if (priv->gda_conn == NULL) - { - g_warning ("Unable to create the connection."); - return NULL; - } - - return gdao; -} - -/** - * gdao_new_from_string: - * @gda_client: a #GdaClient object. If it's %NULL, it will be created a new one. - * @provider_id: the provider id. - * @cnc_string: the connection string. - * - * Return value: the newly created #GdaO. - */ -GdaO -*gdao_new_from_string (GdaClient *gda_client, - const gchar *provider_id, - const gchar *cnc_string) -{ - GdaO *gdao; - GdaOPrivate *priv; - - if (provider_id == NULL || strcmp (g_strstrip (g_strdup (provider_id)), "") == 0) - { - /* TO DO */ - g_warning ("provider_id must not be empty."); - return NULL; - } - - if (cnc_string == NULL || strcmp (g_strstrip (g_strdup (cnc_string)), "") == 0) - { - /* TO DO */ - g_warning ("cnc_string must not be empty."); - return NULL; - } - - gdao = gdao_new_ (gda_client); - if (gdao == NULL) - { - /* TO DO */ - return NULL; - } - - priv = GDAO_GET_PRIVATE (gdao); - - /* open database connection */ - priv->gda_conn = gda_client_open_connection_from_string (priv->gda_client, - provider_id, - cnc_string, - 0); - if (priv->gda_conn == NULL) - { - g_warning ("Unable to create the connection.\n" - "provider_id: %s\tcnc_string: %s\n", - provider_id, cnc_string); - return NULL; - } - - return gdao; -} - -/** - * gdao_new_from_connection: - * @conn: a #GdaConnection. - * - * Returns a #GdaO from an existing #GdaConnection. - * - * Return value: the newly created #GdaO. - */ -GdaO -*gdao_new_from_connection (GdaConnection *conn) -{ - GdaO *gdao; - - if (conn == NULL) return NULL; - - gdao = gdao_new_ (gda_connection_get_client (conn)); - - return gdao; -} - -/** - * gdao_get_gdaclient: - * @gdao: a #GdaO object. - * - * Return value: the #GdaClient associated to the #GdaO. - */ -const GdaClient -*gdao_get_gdaclient (GdaO *gdao) -{ - if (gdao == NULL) - { - return NULL; - } - else - { - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - return priv->gda_client; - } -} - -/** - * gdao_get_gdaconnection: - * @gdao: a #GdaO object. - * - * Return value: the #GdaConnection associated to the #GdaO. - */ -const GdaConnection -*gdao_get_gdaconnection (GdaO *gdao) -{ - if (gdao == NULL) - { - return NULL; - } - else - { - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - return priv->gda_conn; - } -} - -/** - * gdao_get_provider: - * @gdao: a #GdaO object. - * - * Return value: the provider id associated to the #GdaO. - */ -const gchar -*gdao_get_provider (GdaO *gdao) -{ - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - return gda_connection_get_provider (priv->gda_conn); -} - -/** - * gdao_query: - * @gdao: a #GdaO object. - * @sql: the sql text. - * - * Execute a selection query (SELECT). - * - * Return value: a #GdaDataModel, or NULL if query fails. - */ -GdaDataModel -*gdao_query (GdaO *gdao, const gchar *sql) -{ - if (gdao == NULL) return NULL; - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - GdaCommand *gda_comm = gda_command_new (sql, GDA_COMMAND_TYPE_SQL, GDA_COMMAND_OPTION_STOP_ON_ERRORS); - GdaDataModel *dm = gda_connection_execute_single_command (priv->gda_conn, gda_comm, NULL); - - if (dm == NULL) - { - g_fprintf (stderr, "SQL: %s\n", sql); - get_errors (priv->gda_conn); - } - - gda_command_free (gda_comm); - - return dm; -} - -/* TO DO - define as macro */ -/* TO DO - catch error for gda_data_model_get_column_position */ -/** - * return the field_name's GdaValue as gchar (stringify) - */ -gchar -*gdao_data_model_get_field_value_stringify_at (GdaDataModel *data_model, - gint row, - const gchar *field_name) -{ - gchar *value = ""; - gint col; - - col = gda_data_model_get_column_position (data_model, field_name); - - if (col >= 0) - { - value = gdao_data_model_get_value_stringify_at (data_model, row, col); - } - - return value; -} - -/* TO DO - define as macro */ -/* TO DO - catch error for gda_data_model_get_column_position */ -/** - * return the field_name's GdaValue as gint - */ -gint -gdao_data_model_get_field_value_integer_at (GdaDataModel *data_model, - gint row, - const gchar *field_name) -{ - gint value = 0; - gint col; - - col = gda_data_model_get_column_position (data_model, field_name); - - if (col >= 0) - { - value = gdao_data_model_get_value_integer_at (data_model, row, col); - } - - return value; -} - -/* TO DO - define as macro */ -/* TO DO - catch error for gda_data_model_get_column_position */ -/** - * return the field_name's GdaValue as gfloat - */ -gfloat -gdao_data_model_get_field_value_float_at (GdaDataModel *data_model, - gint row, - const gchar *field_name) -{ - gfloat value = 0.0f; - gint col; - - col = gda_data_model_get_column_position (data_model, field_name); - - if (col >= 0) - { - value = gdao_data_model_get_value_float_at (data_model, row, col); - } - - return value; -} - -/* TO DO - define as macro */ -/* TO DO - catch error for gda_data_model_get_column_position */ -/** - * return the field_name's GdaValue as gdouble - */ -gdouble -gdao_data_model_get_field_value_double_at (GdaDataModel *data_model, - gint row, - const gchar *field_name) -{ - gdouble value = 0.0; - gint col; - - col = gda_data_model_get_column_position (data_model, field_name); - - if (col >= 0) - { - value = gdao_data_model_get_value_double_at (data_model, row, col); - } - - return value; -} - -/* TO DO - define as macro */ -/* TO DO - catch error for gda_data_model_get_column_position */ -/** - * return the field_name's GdaValue as gboolean - */ -gboolean -gdao_data_model_get_field_value_boolean_at (GdaDataModel *data_model, - gint row, - const gchar *field_name) -{ - gboolean value = FALSE; - gint col; - - col = gda_data_model_get_column_position (data_model, field_name); - - if (col >= 0) - { - value = gdao_data_model_get_value_boolean_at (data_model, row, col); - } - - return value; -} - -/* TO DO - define as macro */ -/* TO DO - catch error for gda_data_model_get_column_position */ -/** - * return the field_name's GdaValue as GDate - */ -GDate -*gdao_data_model_get_field_value_gdate_at (GdaDataModel *data_model, - gint row, - const gchar *field_name) -{ - GDate *value = NULL; - gint col; - - col = gda_data_model_get_column_position (data_model, field_name); - - if (col >= 0) - { - value = gdao_data_model_get_value_gdate_at (data_model, row, col); - } - - return value; -} - -/** - * gdao_data_model_get_value_stringify_at: - * @data_model: a #GdaDataModel object. - * @row: row number. - * @col: col number. - * - * Return value: the #GdaValue as #gchar (stringify). - */ -gchar -*gdao_data_model_get_value_stringify_at (GdaDataModel *data_model, gint row, gint col) -{ - gchar *ret = ""; - - GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); - if (!gda_value_is_null (v)) - { - ret = g_strdup (gda_value_stringify (v)); - } - - return ret; -} - -/** - * gdao_data_model_get_value_integer_at: - * @data_model: a #GdaDataModel object. - * @row: row number. - * @col: col number. - * - * Return value: the #GdaValue as #gint. - */ -gint -gdao_data_model_get_value_integer_at (GdaDataModel *data_model, gint row, gint col) -{ - gint ret = 0; - - GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); - if (v == NULL) - { - /* TO DO */ - /* trap errors */ - } - else if (!gda_value_is_null (v)) - { - if (gda_value_isa (v, GDA_VALUE_TYPE_INTEGER)) - { - ret = gda_value_get_integer (v); - } - else - { - ret = atol (gda_value_stringify (v)); - } - } - - return ret; -} - -/** - * gdao_data_model_get_value_float_at: - * @data_model: a #GdaDataModel object. - * @row: row number. - * @col: col number. - * - * Return value: the #GdaValue as #gfloat. - */ -gfloat -gdao_data_model_get_value_float_at (GdaDataModel *data_model, gint row, gint col) -{ - gfloat ret = 0.0f; - - GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); - if (!gda_value_is_null (v)) - { - ret = gda_value_get_single (v); - } - - return ret; -} - -/** - * gdao_data_model_get_value_double_at: - * @data_model: a #GdaDataModel object. - * @row: row number. - * @col: col number. - * - * Return value: the #GdaValue as #gdouble. - */ -gdouble -gdao_data_model_get_value_double_at (GdaDataModel *data_model, gint row, gint col) -{ - gdouble ret = 0.0; - - GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); - if (!gda_value_is_null (v)) - { - ret = gda_value_get_double (v); - } - - return ret; -} - -/** - * gdao_data_model_get_value_boolean_at: - * @data_model: a #GdaDataModel object. - * @row: row number. - * @col: col number. - * - * Return value: the #GdaValue as #gboolean. - */ -gboolean -gdao_data_model_get_value_boolean_at (GdaDataModel *data_model, gint row, gint col) -{ - gboolean ret = FALSE; - - GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); - if (v == NULL) - { - /* TO DO */ - /* trap errors */ - } - else if (!gda_value_is_null (v)) - { - if (gda_value_isa (v, GDA_VALUE_TYPE_BOOLEAN)) - { - ret = gda_value_get_boolean (v); - } - else - { - gchar *vstr = g_strstrip (gda_value_stringify (v)); - if (strcasecmp (vstr, "true") == 0 || - strcasecmp (vstr, "t") == 0 || - strcasecmp (vstr, "yes") == 0 || - strcasecmp (vstr, "y") == 0 || - atol (vstr) != 0) - { - ret = TRUE; - } - } - } - - return ret; -} - -/** - * gdao_data_model_get_value_gdate_at: - * @data_model: a #GdaDataModel object. - * @row: row number. - * @col: col number. - * - * Return value: the #GdaValue as #GDate. - */ -GDate -*gdao_data_model_get_value_gdate_at (GdaDataModel *data_model, gint row, gint col) -{ - GDate *ret = NULL; - const GdaDate *gdadate; - - GdaValue *v = (GdaValue *)gda_data_model_get_value_at (data_model, col, row); - if (!gda_value_is_null (v)) - { - gdadate = gda_value_get_date (v); - if (g_date_valid_dmy ((GDateDay)gdadate->day, (GDateMonth)gdadate->month, (GDateYear)gdadate->year)) - { - ret = g_date_new_dmy ((GDateDay)gdadate->day, (GDateMonth)gdadate->month, (GDateYear)gdadate->year); - } - } - - return ret; -} - -/** - * gdao_begin: - * @gdao: a #GdaO object. - * - * Begin a new transaction. - */ -gboolean -gdao_begin (GdaO *gdao) -{ - if (gdao == NULL) return FALSE; - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - priv->gda_trans = gda_transaction_new ("gdao"); - gda_transaction_set_isolation_level (priv->gda_trans, - GDA_TRANSACTION_ISOLATION_SERIALIZABLE); - - return gda_connection_begin_transaction (priv->gda_conn, priv->gda_trans); -} - -/** - * gdao_execute: - * @gdao: a #GdaO object. - * @sql: the sql text. - * - * Execute a command query (INSERT, UPDATE, DELETE). - * - * Return value: number of records affected by the query execution. - */ -gint -gdao_execute (GdaO *gdao, const gchar *sql) -{ - GdaCommand *gda_comm; - gint nrecs; - - if (gdao == NULL) return -1; - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - gda_comm = gda_command_new (sql, GDA_COMMAND_TYPE_SQL, GDA_COMMAND_OPTION_STOP_ON_ERRORS); - if (priv->gda_trans != NULL) - { - gda_command_set_transaction (gda_comm, priv->gda_trans); - } - nrecs = gda_connection_execute_non_query (priv->gda_conn, gda_comm, NULL); - - if (nrecs == -1) - { - g_fprintf (stderr, "SQL: %s\n", sql); - get_errors (priv->gda_conn); - } - - gda_command_free (gda_comm); - - return nrecs; -} - -/** - * gdao_commit: - * @gdao: a #GdaO object. - * - * Commit a transaction. - */ -gboolean -gdao_commit (GdaO *gdao) -{ - gboolean ret; - - if (gdao == NULL) return FALSE; - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - if (priv->gda_trans == NULL) - { - ret = FALSE; - } - else - { - ret = gda_connection_commit_transaction (priv->gda_conn, priv->gda_trans); - g_object_unref (priv->gda_trans); - priv->gda_trans = NULL; - } - - return ret; -} - -/** - * gdao_rollback: - * @gdao: a #GdaO object. - * - * Rollback a transaction. - */ -gboolean -gdao_rollback (GdaO *gdao) -{ - gboolean ret; - - if (gdao == NULL) return FALSE; - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - if (priv->gda_trans == NULL) - { - ret = FALSE; - } - else - { - ret = gda_connection_rollback_transaction (priv->gda_conn, priv->gda_trans); - g_object_unref (priv->gda_trans); - priv->gda_trans = NULL; - } - - return ret; -} - -/* TO DO */ -void -gdao_free (GdaO *gdao) -{ - if (gdao == NULL) return; - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - /* close connection */ - if (gda_connection_is_open (priv->gda_conn)) - { - gda_connection_close (priv->gda_conn); - } - - /*g_free (gdao);*/ -} - -/* UTILITY'S FUNCTIONS */ -/** - * gdao_strescape: - * @source: a string to escape. - * @exceptions: a string of characters not to escape in @source. - * - * As g_strescape(), but it escapes also '. - */ -gchar -*gdao_strescape (const gchar *source, const gchar *exceptions) -{ - gchar *ret = "", *nsource; - gint l = strlen (source); - - if (source == NULL || l == 0) return ""; - - nsource = g_strescape (g_strstrip (g_strdup (source)), exceptions); - - /* escape di ' */ - if (strchr (nsource, '\'') != NULL) - { - while (*nsource) - { - if (*nsource == '\'') - { - ret = g_strconcat (ret, "'", g_strdup_printf ("%c", *nsource), NULL); - } - else - { - ret = g_strconcat (ret, g_strdup_printf ("%c", *nsource), NULL); - } - - *nsource++; - } - - return g_strdup (ret); - } - else - { - return g_strdup (nsource); - } -} - -/** - * gdao_get_chr_quoting: - * @gdao: a #GdaO object. - * - */ -gchar -gdao_get_chr_quoting (GdaO *gdao) -{ - gchar chr = '\"'; - - const gchar *provider = gdao_get_provider (gdao); - - if (strcmp (provider, "MySQL") == 0) - { - chr = '`'; - } - - return chr; -} - -/* PRIVATE */ -static void -get_errors (GdaConnection *connection) -{ - GList *list; - GList *node; - GdaError *error; - - list = (GList *) gda_connection_get_errors (connection); - - for (node = g_list_first (list); node != NULL; node = g_list_next (node)) - { - error = (GdaError *) node->data; - g_fprintf (stderr, "Error no: %d\t", gda_error_get_number (error)); - g_fprintf (stderr, "desc: %s\t", gda_error_get_description (error)); - g_fprintf (stderr, "source: %s\t", gda_error_get_source (error)); - g_fprintf (stderr, "sqlstate: %s\n", gda_error_get_sqlstate (error)); - } -} - -static void -gdao_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) -{ - GdaO *gdao = GDAO (object); - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - switch (property_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -gdao_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) -{ - GdaO *gdao = GDAO (object); - - GdaOPrivate *priv = GDAO_GET_PRIVATE (gdao); - - switch (property_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} diff --git a/src/libgdaex.h b/src/libgdaex.h new file mode 100644 index 0000000..0ca57bd --- /dev/null +++ b/src/libgdaex.h @@ -0,0 +1,127 @@ +/* + * libgdaobj.h + * + * Copyright (C) 2005-2006 Andrea Zagli + * + * This file is part of libgdaobj. + * + * libgdaobj is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libgdaobj is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with libgdaobj; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include +#include +#include + +#ifndef __GDAO_H__ +#define __GDAO_H__ + +G_BEGIN_DECLS + + +#define TYPE_GDAO (gdao_get_type ()) +#define GDAO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GDAO, GdaO)) +#define GDAO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GDAO, GdaOClass)) +#define IS_GDAO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GDAO)) +#define IS_GDAO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GDAO)) +#define GDAO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GDAO, GdaOClass)) + + +typedef struct _GdaO GdaO; +typedef struct _GdaOClass GdaOClass; + +struct _GdaO + { + GObject parent; + }; + +struct _GdaOClass + { + GObjectClass parent_class; + }; + +GType gdao_get_type (void) G_GNUC_CONST; + + +GdaO *gdao_new (GdaClient *gda_client, + const gchar *datasource, + const gchar *username, + const gchar *password); +GdaO *gdao_new_from_string (GdaClient *gda_client, + const gchar *provider_id, + const gchar *cnc_string); +GdaO *gdao_new_from_connection (GdaConnection *conn); + +const GdaClient *gdao_get_gdaclient (GdaO *gdao); +const GdaConnection *gdao_get_gdaconnection (GdaO *gdao); +const gchar *gdao_get_provider (GdaO *gdao); + +GdaDataModel *gdao_query (GdaO *gdao, const gchar *sql); + +gchar *gdao_data_model_get_field_value_stringify_at (GdaDataModel *data_model, + gint row, + const gchar *field_name); +gint gdao_data_model_get_field_value_integer_at (GdaDataModel *data_model, + gint row, + const gchar *field_name); +gfloat gdao_data_model_get_field_value_float_at (GdaDataModel *data_model, + gint row, + const gchar *field_name); +gdouble gdao_data_model_get_field_value_double_at (GdaDataModel *data_model, + gint row, + const gchar *field_name); +gboolean gdao_data_model_get_field_value_boolean_at (GdaDataModel *data_model, + gint row, + const gchar *field_name); +GDate *gdao_data_model_get_field_value_gdate_at (GdaDataModel *data_model, + gint row, + const gchar *field_name); + +gchar *gdao_data_model_get_value_stringify_at (GdaDataModel *data_model, + gint row, + gint col); +gint gdao_data_model_get_value_integer_at (GdaDataModel *data_model, + gint row, + gint col); +gfloat gdao_data_model_get_value_float_at (GdaDataModel *data_model, + gint row, + gint col); +gdouble gdao_data_model_get_value_double_at (GdaDataModel *data_model, + gint row, + gint col); +gboolean gdao_data_model_get_value_boolean_at (GdaDataModel *data_model, + gint row, + gint col); +GDate *gdao_data_model_get_value_gdate_at (GdaDataModel *data_model, + gint row, + gint col); + +gboolean gdao_begin (GdaO *gdao); + +gint gdao_execute (GdaO *gdao, const gchar *sql); + +gboolean gdao_commit (GdaO *gdao); +gboolean gdao_rollback (GdaO *gdao); + +void gdao_free (GdaO *gdao); + +gchar *gdao_strescape (const gchar *source, const gchar *exceptions); + +gchar gdao_get_chr_quoting (GdaO *gdao); + + +G_END_DECLS + +#endif /* __GDAO_H__ */ diff --git a/src/libgdaobj.h b/src/libgdaobj.h deleted file mode 100644 index 0ca57bd..0000000 --- a/src/libgdaobj.h +++ /dev/null @@ -1,127 +0,0 @@ -/* - * libgdaobj.h - * - * Copyright (C) 2005-2006 Andrea Zagli - * - * This file is part of libgdaobj. - * - * libgdaobj is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * libgdaobj is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with libgdaobj; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include -#include -#include - -#ifndef __GDAO_H__ -#define __GDAO_H__ - -G_BEGIN_DECLS - - -#define TYPE_GDAO (gdao_get_type ()) -#define GDAO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GDAO, GdaO)) -#define GDAO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GDAO, GdaOClass)) -#define IS_GDAO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GDAO)) -#define IS_GDAO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GDAO)) -#define GDAO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GDAO, GdaOClass)) - - -typedef struct _GdaO GdaO; -typedef struct _GdaOClass GdaOClass; - -struct _GdaO - { - GObject parent; - }; - -struct _GdaOClass - { - GObjectClass parent_class; - }; - -GType gdao_get_type (void) G_GNUC_CONST; - - -GdaO *gdao_new (GdaClient *gda_client, - const gchar *datasource, - const gchar *username, - const gchar *password); -GdaO *gdao_new_from_string (GdaClient *gda_client, - const gchar *provider_id, - const gchar *cnc_string); -GdaO *gdao_new_from_connection (GdaConnection *conn); - -const GdaClient *gdao_get_gdaclient (GdaO *gdao); -const GdaConnection *gdao_get_gdaconnection (GdaO *gdao); -const gchar *gdao_get_provider (GdaO *gdao); - -GdaDataModel *gdao_query (GdaO *gdao, const gchar *sql); - -gchar *gdao_data_model_get_field_value_stringify_at (GdaDataModel *data_model, - gint row, - const gchar *field_name); -gint gdao_data_model_get_field_value_integer_at (GdaDataModel *data_model, - gint row, - const gchar *field_name); -gfloat gdao_data_model_get_field_value_float_at (GdaDataModel *data_model, - gint row, - const gchar *field_name); -gdouble gdao_data_model_get_field_value_double_at (GdaDataModel *data_model, - gint row, - const gchar *field_name); -gboolean gdao_data_model_get_field_value_boolean_at (GdaDataModel *data_model, - gint row, - const gchar *field_name); -GDate *gdao_data_model_get_field_value_gdate_at (GdaDataModel *data_model, - gint row, - const gchar *field_name); - -gchar *gdao_data_model_get_value_stringify_at (GdaDataModel *data_model, - gint row, - gint col); -gint gdao_data_model_get_value_integer_at (GdaDataModel *data_model, - gint row, - gint col); -gfloat gdao_data_model_get_value_float_at (GdaDataModel *data_model, - gint row, - gint col); -gdouble gdao_data_model_get_value_double_at (GdaDataModel *data_model, - gint row, - gint col); -gboolean gdao_data_model_get_value_boolean_at (GdaDataModel *data_model, - gint row, - gint col); -GDate *gdao_data_model_get_value_gdate_at (GdaDataModel *data_model, - gint row, - gint col); - -gboolean gdao_begin (GdaO *gdao); - -gint gdao_execute (GdaO *gdao, const gchar *sql); - -gboolean gdao_commit (GdaO *gdao); -gboolean gdao_rollback (GdaO *gdao); - -void gdao_free (GdaO *gdao); - -gchar *gdao_strescape (const gchar *source, const gchar *exceptions); - -gchar gdao_get_chr_quoting (GdaO *gdao); - - -G_END_DECLS - -#endif /* __GDAO_H__ */