r40812 - in /branches/upstream/libsearch-xapian-perl/current: Changes META.yml README XS/Document.xs Xapian.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Jul 27 03:20:21 UTC 2009
Author: jawnsy-guest
Date: Mon Jul 27 03:20:14 2009
New Revision: 40812
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40812
Log:
[svn-upgrade] Integrating new upstream version, libsearch-xapian-perl (1.0.14.0)
Modified:
branches/upstream/libsearch-xapian-perl/current/Changes
branches/upstream/libsearch-xapian-perl/current/META.yml
branches/upstream/libsearch-xapian-perl/current/README
branches/upstream/libsearch-xapian-perl/current/XS/Document.xs
branches/upstream/libsearch-xapian-perl/current/Xapian.pm
Modified: branches/upstream/libsearch-xapian-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/Changes?rev=40812&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/Changes (original)
+++ branches/upstream/libsearch-xapian-perl/current/Changes Mon Jul 27 03:20:14 2009
@@ -1,4 +1,8 @@
Revision history for Perl extension Search::Xapian.
+
+1.0.14.0 Tue Jul 21 16:10:19 GMT 2009
+ [Changes contributed by Olly Betts]
+ - Add handling of C++ exceptions from methods of Document (ticket#284).
1.0.13.1 Tue May 26 13:51:18 GMT 2009
[Changes contributed by Olly Betts]
Modified: branches/upstream/libsearch-xapian-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/META.yml?rev=40812&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/META.yml (original)
+++ branches/upstream/libsearch-xapian-perl/current/META.yml Mon Jul 27 03:20:14 2009
@@ -1,13 +1,10 @@
---- #YAML:1.0
-name: Search-Xapian
-version: 1.0.13.1
-abstract: Perl XS frontend to the Xapian C++ search library.
-license: ~
-author:
- - Alex Bowley <xapian-discuss at lists.xapian.org>
-generated_by: ExtUtils::MakeMaker version 6.42
-distribution_type: module
-requires:
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
+name: Search-Xapian
+version: 1.0.14.0
+version_from: Xapian.pm
+installdirs: site
+requires:
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.30_01
Modified: branches/upstream/libsearch-xapian-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/README?rev=40812&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/README (original)
+++ branches/upstream/libsearch-xapian-perl/current/README Mon Jul 27 03:20:14 2009
@@ -1,4 +1,4 @@
-Search::Xapian version 1.0.13.1
+Search::Xapian version 1.0.14.0
===============================
This is Search::Xapian, a Perl XS frontend to the Xapian C++ search library.
Modified: branches/upstream/libsearch-xapian-perl/current/XS/Document.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/XS/Document.xs?rev=40812&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/XS/Document.xs (original)
+++ branches/upstream/libsearch-xapian-perl/current/XS/Document.xs Mon Jul 27 03:20:14 2009
@@ -19,22 +19,48 @@
string
Document::get_value(valueno valno)
+ CODE:
+ try {
+ RETVAL = THIS->get_value(valno);
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
+ OUTPUT:
+ RETVAL
void
Document::add_value(valno, value)
valueno valno
string value
CODE:
- THIS->add_value(valno, value);
+ try {
+ THIS->add_value(valno, value);
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
void
Document::remove_value(valueno valno)
+ CODE:
+ try {
+ THIS->remove_value(valno);
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
void
Document::clear_values()
string
Document::get_data()
+ CODE:
+ try {
+ RETVAL = THIS->get_data();
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
+ OUTPUT:
+ RETVAL
void
Document::set_data(data)
@@ -48,23 +74,30 @@
termpos tpos
termcount wdfinc
CODE:
- /* FIXME: catch exceptions for case where tname is empty? */
- if (items == 4) { /* items includes the hidden this pointer */
- THIS->add_posting(tname, tpos, wdfinc);
- } else {
- THIS->add_posting(tname, tpos);
- }
+ try {
+ if (items == 4) { /* items includes the hidden this pointer */
+ THIS->add_posting(tname, tpos, wdfinc);
+ } else {
+ THIS->add_posting(tname, tpos);
+ }
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
void
Document::add_term(tname, wdfinc = NO_INIT)
string tname
termcount wdfinc
CODE:
- if (items == 3) { /* items includes the hidden this pointer */
- THIS->add_term(tname, wdfinc);
- } else {
- THIS->add_term(tname);
- }
+ try {
+ if (items == 3) { /* items includes the hidden this pointer */
+ THIS->add_term(tname, wdfinc);
+ } else {
+ THIS->add_term(tname);
+ }
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
void
Document::remove_posting(tname, tpos, wdfdec = NO_INIT)
@@ -78,9 +111,8 @@
} else {
THIS->remove_posting(tname, tpos);
}
- }
- catch (const Error &error) {
- croak( "Exception: %s", error.get_msg().c_str() );
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
}
void
@@ -89,9 +121,8 @@
CODE:
try {
THIS->remove_term(tname);
- }
- catch (const Error &error) {
- croak( "Exception: %s", error.get_msg().c_str() );
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
}
void
@@ -99,11 +130,23 @@
termcount
Document::termlist_count()
+ CODE:
+ try {
+ RETVAL = THIS->termlist_count();
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
+ OUTPUT:
+ RETVAL
TermIterator *
Document::termlist_begin()
CODE:
- RETVAL = new TermIterator(THIS->termlist_begin());
+ try {
+ RETVAL = new TermIterator(THIS->termlist_begin());
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
OUTPUT:
RETVAL
@@ -116,11 +159,23 @@
termcount
Document::values_count()
+ CODE:
+ try {
+ RETVAL = THIS->values_count();
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
+ OUTPUT:
+ RETVAL
ValueIterator *
Document::values_begin()
CODE:
- RETVAL = new ValueIterator(THIS->values_begin());
+ try {
+ RETVAL = new ValueIterator(THIS->values_begin());
+ } catch (const Error &error) {
+ croak("Exception: %s", error.get_msg().c_str());
+ }
OUTPUT:
RETVAL
Modified: branches/upstream/libsearch-xapian-perl/current/Xapian.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/Xapian.pm?rev=40812&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/Xapian.pm (original)
+++ branches/upstream/libsearch-xapian-perl/current/Xapian.pm Mon Jul 27 03:20:14 2009
@@ -4,7 +4,7 @@
use strict;
use warnings;
-our $VERSION = '1.0.13.1';
+our $VERSION = '1.0.14.0';
use Exporter 'import';
More information about the Pkg-perl-cvs-commits
mailing list