r40814 - in /trunk/libsearch-xapian-perl: Changes META.yml README XS/Document.xs Xapian.pm debian/changelog debian/control debian/copyright debian/patches/test_pod_coverage_with_separate_env_var.patch t/03podcoverage.t

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Mon Jul 27 03:38:01 UTC 2009


Author: jawnsy-guest
Date: Mon Jul 27 03:37:55 2009
New Revision: 40814

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40814
Log:
* New upstream release
  + Add handling of C++ exceptions from methods of Document
* Forward the coverage test patch upstream and note it
* Added myself to Uploaders and Copyright
* Minor fixes to the control description
* Updated copyright years on everything

Modified:
    trunk/libsearch-xapian-perl/Changes
    trunk/libsearch-xapian-perl/META.yml
    trunk/libsearch-xapian-perl/README
    trunk/libsearch-xapian-perl/XS/Document.xs
    trunk/libsearch-xapian-perl/Xapian.pm
    trunk/libsearch-xapian-perl/debian/changelog
    trunk/libsearch-xapian-perl/debian/control
    trunk/libsearch-xapian-perl/debian/copyright
    trunk/libsearch-xapian-perl/debian/patches/test_pod_coverage_with_separate_env_var.patch
    trunk/libsearch-xapian-perl/t/03podcoverage.t

Modified: trunk/libsearch-xapian-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/Changes?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/Changes (original)
+++ trunk/libsearch-xapian-perl/Changes Mon Jul 27 03:37:55 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: trunk/libsearch-xapian-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/META.yml?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/META.yml (original)
+++ trunk/libsearch-xapian-perl/META.yml Mon Jul 27 03:37:55 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: trunk/libsearch-xapian-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/README?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/README (original)
+++ trunk/libsearch-xapian-perl/README Mon Jul 27 03:37:55 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: trunk/libsearch-xapian-perl/XS/Document.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/XS/Document.xs?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/XS/Document.xs (original)
+++ trunk/libsearch-xapian-perl/XS/Document.xs Mon Jul 27 03:37:55 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: trunk/libsearch-xapian-perl/Xapian.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/Xapian.pm?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/Xapian.pm (original)
+++ trunk/libsearch-xapian-perl/Xapian.pm Mon Jul 27 03:37:55 2009
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.0.13.1';
+our $VERSION = '1.0.14.0';
 
 use Exporter 'import';
 

Modified: trunk/libsearch-xapian-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/debian/changelog?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/changelog (original)
+++ trunk/libsearch-xapian-perl/debian/changelog Mon Jul 27 03:37:55 2009
@@ -1,3 +1,14 @@
+libsearch-xapian-perl (1.0.14.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    + Add handling of C++ exceptions from methods of Document
+  * Forward the coverage test patch upstream and note it
+  * Added myself to Uploaders and Copyright
+  * Minor fixes to the control description
+  * Updated copyright years on everything
+
+ -- Jonathan Yu <frequency at cpan.org>  Sun, 26 Jul 2009 19:21:16 -0400
+
 libsearch-xapian-perl (1.0.13.1-1) unstable; urgency=low
 
   [ Ryan Niebur ]

Modified: trunk/libsearch-xapian-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/debian/control?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/control (original)
+++ trunk/libsearch-xapian-perl/debian/control Mon Jul 27 03:37:55 2009
@@ -4,12 +4,10 @@
 Build-Depends: debhelper (>= 7.0.50), perl (>= 5.8.0-7), libtest-pod-perl,
  libxapian-dev (>= 1.0.13), quilt (>= 0.46-7)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Frank Lichtenheld <djpig at debian.org>,
- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
- Damyan Ivanov <dmn at debian.org>,
- gregor herrmann <gregoa at debian.org>,
- Jose Luis Rivas <ghostbar38 at gmail.com>,
- Ryan Niebur <ryanryan52 at gmail.com>
+Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
+ Frank Lichtenheld <djpig at debian.org>, Jose Luis Rivas <ghostbar38 at gmail.com>,
+ Damyan Ivanov <dmn at debian.org>, gregor herrmann <gregoa at debian.org>,
+ Ryan Niebur <ryanryan52 at gmail.com>, Jonathan Yu <frequency at cpan.org>
 Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsearch-xapian-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libsearch-xapian-perl/
@@ -19,13 +17,14 @@
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Suggests: xapian-doc
-Description: Perl bindings for the Xapian C++ search library
- This package provides Perl bindings for Xapian.
+Description: Perl bindings for the Xapian search library
+ Search::Xapian provides Perl bindings for the Xapian Open Source Search
+ Engine library.
  .
- The Xapian search engine library is a highly adaptable toolkit to allow
+ The Xapian search engine library is a highly adaptable toolkit which allows
  developers to easily add advanced indexing and search facilities to their own
- applications.  It implements the probabilistic model of information retrieval,
+ applications. It implements the probabilistic model of information retrieval,
  and provides facilities for performing ranked free-text searches, relevance
  feedback, phrase searching, boolean searching, stemming, and simultaneous
- update and searching.  It is highly scalable, and is capable of working with
+ update and searching. It is highly scalable and is capable of working with
  collections containing hundreds of millions of documents.

Modified: trunk/libsearch-xapian-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/debian/copyright?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/copyright (original)
+++ trunk/libsearch-xapian-perl/debian/copyright Mon Jul 27 03:37:55 2009
@@ -1,27 +1,28 @@
 Format-Specification:
     http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Alex Bowley <kilinrax at cpan.org>
+Upstream-Maintainer: Olly Betts <olly at survex.com>
 Upstream-Source: http://search.cpan.org/dist/Search-Xapian/
 Upstream-Name: Search-Xapian
 
 Files: *
-Copyright: (c) 2002,2003 Alex Bowley. All rights reserved.
-           (c) 2003,2004,2005,2006,2007,2008,2009 Olly Betts. All rights reserved.
+Copyright: 2003-2009, Olly Betts <olly at survex.com>
+ 2002-2003 Alex Bowley <kilinrax at cpan.org>
 License-Alias: Perl
 License: Artistic | GPL-1+
 
 Files: examples/simple*
-Copyright: (C) 2003 James Aylett
- (C) 2004,2007,2009 Olly Betts
+Copyright: 2003, James Aylett <james at tartarus.org>
+ 2004, 2007, 2009, Olly Betts <olly at survex.com>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2006, 2007, 2008, Frank Lichtenheld <djpig at debian.org>
- 2007, 2008, Damyan Ivanov <dmn at debian.org>
+Copyright: 2009, Jonathan Yu <frequency at cpan.org>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
+ 2008, Jose Luis Rivas <ghostbar38 at gmail.com>
+ 2007-2009, gregor herrmann <gregoa at debian.org>
+ 2007-2008, Damyan Ivanov <dmn at debian.org>
+ 2006-2008, Frank Lichtenheld <djpig at debian.org>
  2007, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
- 2008, Jose Luis Rivas <ghostbar38 at gmail.com>
- 2009, Ryan Niebur <ryanryan52 at gmail.com>
- 2007, 2009, gregor herrmann <gregoa at debian.org>
 License: Artistic | GPL-1+
 
 License: Artistic

Modified: trunk/libsearch-xapian-perl/debian/patches/test_pod_coverage_with_separate_env_var.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/debian/patches/test_pod_coverage_with_separate_env_var.patch?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/patches/test_pod_coverage_with_separate_env_var.patch (original)
+++ trunk/libsearch-xapian-perl/debian/patches/test_pod_coverage_with_separate_env_var.patch Mon Jul 27 03:37:55 2009
@@ -1,5 +1,8 @@
-so that we test the pod but not the pod coverage
-
+Description: Test the pod but not the pod coverage
+Origin: vendor
+Bug-CPAN: https://rt.cpan.org/Ticket/Display.html?id=48221
+Forwarded: yes
+Author: Frank Lichtenheld <djpig at debian.org>
 --- a/t/03podcoverage.t
 +++ b/t/03podcoverage.t
 @@ -2,6 +2,6 @@ use Test::More;

Modified: trunk/libsearch-xapian-perl/t/03podcoverage.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/t/03podcoverage.t?rev=40814&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/t/03podcoverage.t (original)
+++ trunk/libsearch-xapian-perl/t/03podcoverage.t Mon Jul 27 03:37:55 2009
@@ -2,6 +2,6 @@
 
 eval "use Test::Pod::Coverage 1.04";
 plan skip_all => 'Test::Pod::Coverage 1.04 required' if $@;
-plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
+plan skip_all => 'set TEST_POD_COVERAGE to enable this test' unless $ENV{TEST_POD_COVERAGE};
 
 all_pod_coverage_ok({also_private => [qr/[^\d][0123]$/]});




More information about the Pkg-perl-cvs-commits mailing list