r7195 - in /branches/upstream/libwordnet-querydata-perl/current: ChangeLog META.yml Makefile.PL QueryData.pm README test.pl
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Mon Aug 27 21:48:59 UTC 2007
Author: gregoa-guest
Date: Mon Aug 27 21:48:59 2007
New Revision: 7195
URL: http://svn.debian.org/wsvn/?sc=1&rev=7195
Log:
[svn-upgrade] Integrating new upstream version, libwordnet-querydata-perl (1.46)
Modified:
branches/upstream/libwordnet-querydata-perl/current/ChangeLog
branches/upstream/libwordnet-querydata-perl/current/META.yml
branches/upstream/libwordnet-querydata-perl/current/Makefile.PL
branches/upstream/libwordnet-querydata-perl/current/QueryData.pm
branches/upstream/libwordnet-querydata-perl/current/README
branches/upstream/libwordnet-querydata-perl/current/test.pl
Modified: branches/upstream/libwordnet-querydata-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/branches/upstream/libwordnet-querydata-perl/current/ChangeLog?rev=7195&op=diff
==============================================================================
--- branches/upstream/libwordnet-querydata-perl/current/ChangeLog (original)
+++ branches/upstream/libwordnet-querydata-perl/current/ChangeLog Mon Aug 27 21:48:59 2007
@@ -1,3 +1,11 @@
+2007-05-06 Jason Rennie
+
+ * release 1.46
+ * QueryData.pm (version): removed (Invalid as of WN 3.0)
+ * test.pm: remove tests for pre-3.0 WN; update tests for WN 3.0
+ * README, QueryData.pm: update documentation of WN version to 3.0
+ * Makefile.PL: update default WN paths
+
2006-10-16 Jason Rennie
* release 1.45
@@ -26,7 +34,7 @@
* release 1.42
-2005-10-05 Hugh S. Myers
+2006-10-05 Hugh S. Myers
* QueryData.pm (offset): return undef if anything is undefined
Modified: branches/upstream/libwordnet-querydata-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libwordnet-querydata-perl/current/META.yml?rev=7195&op=diff
==============================================================================
--- branches/upstream/libwordnet-querydata-perl/current/META.yml (original)
+++ branches/upstream/libwordnet-querydata-perl/current/META.yml Mon Aug 27 21:48:59 2007
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: WordNet-QueryData
-version: 1.45
+version: 1.46
version_from: QueryData.pm
installdirs: site
requires:
Modified: branches/upstream/libwordnet-querydata-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libwordnet-querydata-perl/current/Makefile.PL?rev=7195&op=diff
==============================================================================
--- branches/upstream/libwordnet-querydata-perl/current/Makefile.PL (original)
+++ branches/upstream/libwordnet-querydata-perl/current/Makefile.PL Mon Aug 27 21:48:59 2007
@@ -5,7 +5,7 @@
# $wnHomePC). These need to be synchronized. I need to import those
# variables from QueryData.pm.
-die "*** Please set the WNHOME environment variable to the location of your\n*** WordNet installation. QueryData.pm will not work otherwise.\n*** Alternatively, you can make the installation in the default\n*** location, C:\\Program Files\\WordNet\\2.0 on Windows, or /usr/local/WordNet-2.0 on unix.\n" unless exists $ENV{WNHOME} or -d "C:\\Program Files\\WordNet\\2.0" or -d "/usr/local/WordNet-2.0";
+die "*** Please set the WNHOME environment variable to the location of your\n*** WordNet installation. QueryData.pm will not work otherwise.\n*** Alternatively, you can make the installation in the default\n*** location, C:\\Program Files\\WordNet\\3.0 on Windows, or /usr/local/WordNet-3.0 on unix.\n" unless exists $ENV{WNHOME} or -d "C:\\Program Files\\WordNet\\3.0" or -d "/usr/local/WordNet-3.0";
WriteMakefile(
'dist' => { 'COMPRESS' => 'gzip', 'SUFFIX' => '.gz', },
Modified: branches/upstream/libwordnet-querydata-perl/current/QueryData.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libwordnet-querydata-perl/current/QueryData.pm?rev=7195&op=diff
==============================================================================
--- branches/upstream/libwordnet-querydata-perl/current/QueryData.pm (original)
+++ branches/upstream/libwordnet-querydata-perl/current/QueryData.pm Mon Aug 27 21:48:59 2007
@@ -9,7 +9,7 @@
# This module is free software; you can redistribute it and/or modify
# it under the same terms as Perl itself.
-# $Id: QueryData.pm,v 1.45 2006/10/17 02:34:08 jrennie Exp $
+# $Id: QueryData.pm,v 1.46 2007/05/07 01:08:31 jrennie Exp $
####### manual page & loadIndex ##########
@@ -42,7 +42,7 @@
@EXPORT = qw();
# Allows these functions to be used without qualification
@EXPORT_OK = qw();
- $VERSION = do { my @r=(q$Revision: 1.45 $=~/\d+/g); sprintf "%d."."%02d"x$#r, at r };
+ $VERSION = do { my @r=(q$Revision: 1.46 $=~/\d+/g); sprintf "%d."."%02d"x$#r, at r };
}
#############################
@@ -203,8 +203,8 @@
my @indexFile = ("", "index.noun", "index.verb", "index.adj", "index.adv");
my @dataFile = ("", "data.noun", "data.verb", "data.adj", "data.adv");
-my $wnHomeUnix = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "/usr/local/WordNet-2.1";
-my $wnHomePC = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "C:\\Program Files\\WordNet\\2.1";
+my $wnHomeUnix = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "/usr/local/WordNet-3.0";
+my $wnHomePC = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "C:\\Program Files\\WordNet\\3.0";
my $wnPrefixUnix = defined($ENV{"WNSEARCHDIR"}) ? $ENV{"WNSEARCHDIR"} : "$wnHomeUnix/dict";
my $wnPrefixPC = defined($ENV{"WNSEARCHDIR"}) ? $ENV{"WNSEARCHDIR"} : "$wnHomePC\\dict";
@@ -215,7 +215,8 @@
###############
# report WordNet version
-sub version { my $self = shift; return $self->{version}; }
+# Invalid way of identifying version as of WordNet 3.0
+#sub version { my $self = shift; return $self->{version}; }
# report WordNet data dir -- Sid (05/01/2003)
sub dataPath { my $self = shift; return $self->{wnpath}; }
@@ -974,7 +975,7 @@
WNSEARCHDIR. If WNSEARCHDIR is set, QueryData looks for WordNet data
files there. Otherwise, QueryData looks for WordNet data files in
WNHOME/dict (WNHOME\dict on a PC). If WNHOME is not set, it defaults
-to "/usr/local/WordNet-2.1" on Unix and "C:\Program Files\WordNet\2.1"
+to "/usr/local/WordNet-3.0" on Unix and "C:\Program Files\WordNet\3.0"
on a PC. Normally, all you have to do is to set the WNHOME variable
to the location where you unpacked your WordNet distribution. The
database files are normally unpacked to the "dict" subdirectory.
Modified: branches/upstream/libwordnet-querydata-perl/current/README
URL: http://svn.debian.org/wsvn/branches/upstream/libwordnet-querydata-perl/current/README?rev=7195&op=diff
==============================================================================
--- branches/upstream/libwordnet-querydata-perl/current/README (original)
+++ branches/upstream/libwordnet-querydata-perl/current/README Mon Aug 27 21:48:59 2007
@@ -14,7 +14,7 @@
-------------
- Perl5
-- WordNet Database Package version 2.1
+- WordNet Database Package version 3.0
DOCUMENTATION
-------------
@@ -31,7 +31,7 @@
This assumes that perl was installed to the default location (C:\perl).
- 0) Make sure that you have installed WordNet to C:\Program Files\WordNet\2.1
+ 0) Make sure that you have installed WordNet to C:\Program Files\WordNet\3.0
1) Unpack the WordNet QueryData distribution
2) Create the directory C:\perl\site\lib\WordNet
3) Copy QueryData.pm to C:\perl\site\lib\WordNet
Modified: branches/upstream/libwordnet-querydata-perl/current/test.pl
URL: http://svn.debian.org/wsvn/branches/upstream/libwordnet-querydata-perl/current/test.pl?rev=7195&op=diff
==============================================================================
--- branches/upstream/libwordnet-querydata-perl/current/test.pl (original)
+++ branches/upstream/libwordnet-querydata-perl/current/test.pl Mon Aug 27 21:48:59 2007
@@ -2,12 +2,11 @@
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl test.pl'
-# $Id: test.pl,v 1.39 2006/10/17 02:37:42 jrennie Exp $
+# $Id: test.pl,v 1.40 2007/05/07 01:08:31 jrennie Exp $
my $i = 1;
BEGIN {
$| = 1;
- print "v2.0: 1..54\nv2.1: 1..54\n";
}
END { print "not ok 1\n" unless $loaded; }
use WordNet::QueryData;
@@ -23,8 +22,8 @@
my $wn = WordNet::QueryData->new;
#my $wn = WordNet::QueryData->new("/scratch/jrennie/WordNet-2.1/dict");
-my $ver = $wn->version();
-print "Found WordNet database version $ver\n";
+#my $ver = $wn->version();
+#print "Found WordNet database version $ver\n";
#print join("\n",$wn->listAllWords('n'));
@@ -42,7 +41,7 @@
? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
scalar $wn->querySense ("rabbit#n") == 3
? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-scalar $wn->querySense ("rabbit#n#1", "hypo") == 6
+scalar $wn->querySense ("rabbit#n#1", "hypo") == 7
? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
# check that underscore is added, syntactic marker is removed
@@ -137,7 +136,7 @@
# frequency() tests
$wn->frequency('thirteenth#a#1') == 1
? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-$wn->frequency('night#n#2') == 217
+$wn->frequency('night#n#1') == 163
? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
$wn->frequency('cnn#n#1') == 0
? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
@@ -147,34 +146,15 @@
$foo[1] == 2
? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-if ($ver eq "2.0")
-{
- ($wn->queryWord('person#n#1', 'deri'))[0] eq 'personify#v#3'
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- ($wn->querySense('acropetal#a#1', 'dmnc'))[0] eq 'botany#n#1'
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- #print scalar $wn->offset("0#n#1"), "\n";
- scalar $wn->offset("0#n#1") == 12967124
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- scalar $wn->listAllWords("noun") == 114648
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- #print $wn->offset("child#n#1"), "\n";
- $wn->offset("child#n#1") == 9284669
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- my ($foo) = $wn->querySense ("cat#n#1", "glos");
- ($foo eq "feline mammal usually having thick soft fur and being unable to roar; domestic cats; wildcats ") ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-} elsif ($ver eq "2.1")
-{
- ($wn->queryWord('person#n#1', 'deri'))[0] eq 'personhood#n#1'
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- ($wn->querySense('acropetal#a#1', 'dmnc'))[0] eq 'botany#n#2'
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- scalar $wn->offset("0#n#1") == 13561555
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- scalar $wn->listAllWords("noun") == 117097
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- $wn->offset("child#n#1") == 9771320
- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
- my ($foo) = $wn->querySense ("cat#n#1", "glos");
- ($foo eq "feline mammal usually having thick soft fur and no ability to roar: domestic cats; wildcats ") ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-}
+($wn->queryWord('person#n#1', 'deri'))[0] eq 'personhood#n#1'
+ ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+($wn->querySense('acropetal#a#1', 'dmnc'))[0] eq 'botany#n#2'
+ ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+scalar $wn->offset("0#n#1") == 13742358
+ ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+scalar $wn->listAllWords("noun") == 117798
+ ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+$wn->offset("child#n#1") == 9917593
+ ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+my ($foo) = $wn->querySense ("cat#n#1", "glos");
+($foo eq "feline mammal usually having thick soft fur and no ability to roar: domestic cats; wildcats ") ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
More information about the Pkg-perl-cvs-commits
mailing list