biblicit 2.2.0 → 2.2.1

data/lib/biblicit/version.rb

@@ -2,6 +2,6 @@
 
 module Biblicit
 
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 
 end

data/parscit/lib/HeaderParse/API/ParserMethods.pm

@@ -17,7 +17,6 @@ package HeaderParse::API::ParserMethods;
 
 use utf8;
 use Data::Dumper;
-use FindBin;
 use HeaderParse::API::NamePatternMatch;
 use HeaderParse::API::MultiClassChunking; #default to use all export by this module
 use HeaderParse::API::LoadInformation;

data/parscit/lib/HeaderParse/Config/API_Config.pm

@@ -12,7 +12,6 @@
 #
 package HeaderParse::Config::API_Config;
 
-use FindBin qw($Bin);
 require Exporter;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
@@ -26,17 +25,15 @@ else {
   $Classifier = "svm_classify5"; # assume on path
 }
 
-my $path;
-BEGIN
-{
-	if ($FindBin::Bin =~ /(.*)/) { $path = $1; }
-}
+use File::Basename;
+my $dir = dirname(__FILE__);
+my $parscitHome = "$dir/../../../";
 
-$Resource_Dir = "$path/../resources/headerParse";
+$Resource_Dir = "$parscitHome/resources/headerParse";
 $Database_Dir = "$Resource_Dir/database/";
 $Data_Dir = "$Resource_Dir/data/";
 $offlineD = "$Resource_Dir/models/";
-$Tmp_Dir = "$path/../tmp";
+$Tmp_Dir = "$parscitHome/tmp";
 
 $nMinHeaderLength = 50;
 $nMaxHeaderLength = 2500;

data/parscit/lib/ParsCit/Config.pm

@@ -15,7 +15,7 @@ $serverPort	= 10555;
 $URI		= 'http://citeseerx.org/algorithms/parscit/wsdl';
 
 ## Tr2crfpp
-## Paths relative to ParsCit root dir ($FindBin::Bin/..)
+## Paths relative to ParsCit root dir
 $tmpDir		= "tmp";
 $dictFile	= "resources/parsCitDict.txt";
 $crf_test = $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "crfpp/crf_test";

data/parscit/lib/ParsCit/Tr2crfpp.pm

@@ -12,25 +12,20 @@ package ParsCit::Tr2crfpp;
 use utf8;
 use strict 'vars';
 
-use FindBin;
 use Encode ();
 
 use ParsCit::Config;
 
-### USER customizable section
-my $tmp_dir		= $ParsCit::Config::tmpDir;
-$tmp_dir		= "$FindBin::Bin/../$tmp_dir";
-
-my $dict_file	= $ParsCit::Config::dictFile;
-$dict_file		= "$FindBin::Bin/../$dict_file";
-
-my $crf_test	= $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$FindBin::Bin/../$ParsCit::Config::crf_test";
+use File::Basename;
+my $dir = dirname(__FILE__);
+my $parscitHome = "$dir/../../";
 
-my $model_file	= $ParsCit::Config::modelFile;
-$model_file		= "$FindBin::Bin/../$model_file";
-
-my $split_model_file	= $ParsCit::Config::splitModelFile;
-$split_model_file		= "$FindBin::Bin/../$split_model_file";
+### USER customizable section
+my $tmp_dir		= "$parscitHome/$ParsCit::Config::tmpDir";
+my $dict_file	= "$parscitHome/$ParsCit::Config::dictFile";
+my $crf_test	= $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$parscitHome/$ParsCit::Config::crf_test";
+my $model_file	= "$parscitHome/$ParsCit::Config::modelFile";
+my $split_model_file	= "$parscitHome/$ParsCit::Config::splitModelFile";
 ### END user customizable section
 
 ###

data/parscit/lib/ParsHed/Config.pm

@@ -4,7 +4,7 @@ $algorithmName		= "ParsHed";
 $algorithmVersion	= "110505";
 
 ## Tr2crfpp
-## Paths relative to ParsCit root dir ($FindBin::Bin/..)
+## Paths relative to ParsCit root dir
 $tmpDir			= "tmp";
 $dictFile		= "resources/parsCitDict.txt";
 $keywordFile	= "resources/parsHed/keywords";

data/parscit/lib/ParsHed/Tr2crfpp.pm

@@ -10,28 +10,31 @@ package ParsHed::Tr2crfpp;
 
 use strict 'vars';
 use utf8;
-use FindBin;
 use ParsHed::Config;
 use Encode ();
 
+use File::Basename;
+my $dir = dirname(__FILE__);
+my $parscitHome = "$dir/../../";
+
 ### USER customizable section
 
 my $tmpDir = $ParsHed::Config::tmpDir;
-$tmpDir = "$FindBin::Bin/../$tmpDir";
+$tmpDir = "$parscitHome/$tmpDir";
 
 my $dictFile = $ParsHed::Config::dictFile;
-$dictFile = "$FindBin::Bin/../$dictFile";
+$dictFile = "$parscitHome/$dictFile";
 
 my $keywordFile = $ParsHed::Config::keywordFile;
-$keywordFile = "$FindBin::Bin/../$keywordFile";
+$keywordFile = "$parscitHome/$keywordFile";
 
 my $bigramFile = $ParsHed::Config::bigramFile;
-$bigramFile = "$FindBin::Bin/../$bigramFile";
+$bigramFile = "$parscitHome/$bigramFile";
 
-my $crf_test = $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$FindBin::Bin/../$ParsHed::Config::crf_test";
+my $crf_test = $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$parscitHome/$ParsHed::Config::crf_test";
 
 my $modelFile = $ParsHed::Config::modelFile;
-$modelFile = "$FindBin::Bin/../$modelFile";
+$modelFile = "$parscitHome/$modelFile";
 
 ### END user customizable section
 

data/parscit/lib/ParsHed/Tr2crfpp_token.pm

@@ -10,22 +10,19 @@ package ParsHed::Tr2crfpp_token;
 
 use strict 'vars';
 use utf8;
-use FindBin;
 use ParsHed::Config;
 use Encode ();
 
 ### USER customizable section
 
-my $tmpDir = $ParsHed::Config::tmpDir;
-$tmpDir = "$FindBin::Bin/../$tmpDir";
+use File::Basename;
+my $dir = dirname(__FILE__);
+my $parscitHome = "$dir/../../";
 
-my $dictFile = $ParsHed::Config::dictFile;
-$dictFile = "$FindBin::Bin/../$dictFile";
-
-my $crf_test = $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$FindBin::Bin/../$ParsHed::Config::crf_test";
-
-my $modelFile = $ParsHed::Config::oldModelFile;
-$modelFile = "$FindBin::Bin/../$modelFile";
+my $tmpDir = "$parscitHome/$ParsHed::Config::tmpDir";
+my $dictFile = "$parscitHome/$ParsHed::Config::dictFile";
+my $crf_test = $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$parscitHome/$ParsHed::Config::crf_test";
+my $modelFile = "$parscitHome/$ParsHed::Config::oldModelFile";
 
 ### END user customizable section
 

data/parscit/lib/SectLabel/AAMatching.pm

@@ -21,10 +21,14 @@ use	Class::Struct;
 use SectLabel::Config;
 use ParsCit::PostProcess;
 
+use File::Basename;
+my $dir = dirname(__FILE__);
+my $parscitHome = "$dir/../../";
+
 # Dictionary
 my %dict = ();
 # CRF++
-my $crft = $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$FindBin::Bin/../$SectLabel::Config::crf_test";
+my $crft = $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$parscitHome/$SectLabel::Config::crf_test";
 
 # Matching features of each author, including
 # Signals
@@ -77,7 +81,7 @@ sub AAMatching
 	my $aff_lines	= Omni::Traversal::OmniCollector($doc, $aff_addrs, $need_object);
 	
 	# Dictionary
-	ReadDict($FindBin::Bin . "/../" . $SectLabel::Config::dictFile);
+	ReadDict($parscitHome . $SectLabel::Config::dictFile);
 
 	# Authors
 	my ($aut_features, $aut_rc_features) = AuthorFeatureExtraction($aut_lines, $aut_addrs);

data/parscit/lib/SectLabel/Config.pm

@@ -5,7 +5,7 @@ $algorithmVersion	= "110505";
 
 ###
 # Tr2crfpp
-# Paths relative to SectLabel root dir ($FindBin::Bin/..)
+# Paths relative to SectLabel root dir
 ###
 $tmpDir			= "tmp";
 $dictFile		= "resources/parsCitDict.txt";

data/parscit/lib/SectLabel/Controller.pm

@@ -17,7 +17,9 @@ require 'dumpvar.pl';
 use strict;
 
 # Dependencies
-use FindBin;
+use File::Basename;
+my $dir = dirname(__FILE__);
+my $parscitHome = "$dir/../../";
 
 # Local libraries
 use SectLabel::Config;
@@ -25,7 +27,7 @@ use SectLabel::Tr2crfpp;
 use SectLabel::PostProcess;
 use CSXUtil::SafeText qw(cleanXML);
 
-my $generic_sect_path = $FindBin::Bin . "/sectLabel/genericSectExtract.rb";
+my $generic_sect_path = $parscitHome . "bin/sectLabel/genericSectExtract.rb";
 
 ###
 # Main API method for generating an XML document including all

data/parscit/lib/SectLabel/Tr2crfpp.pm

@@ -13,14 +13,16 @@ use utf8;
 use strict 'vars';
 
 # Dependencies
-use FindBin;
 use Encode ();
+use File::Basename;
+my $dir = dirname(__FILE__);
+my $parscitHome = "$dir/../../";
 
 # Local libraries
 use SectLabel::Config;
 
 ### USER customizable section
-my $crf_test	= $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$FindBin::Bin/../$SectLabel::Config::crf_test";
+my $crf_test	= $ENV{'CRFPP_HOME'} ? "$ENV{'CRFPP_HOME'}/bin/crf_test" : "$parscitHome/$SectLabel::Config::crf_test";
 ### END user customizable section
 
 my %dict		= ();

metadata

@@ -2,14 +2,14 @@
 name: biblicit
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - David Judd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -435,7 +435,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -1273271501522024016
+      hash: 782848681955337634
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -1273271501522024016
+      hash: 782848681955337634
       version: '0'
   none: false
 requirements: