added support for excel and sqlite. bumped version to 1.3 RC1

Conflicts:
	README
	ninka.pl

5 files changed, 42 insertions, 5 deletions

diff --git a/Changes b/Changes
index 67b9191..f04ac65 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,13 @@
+2015-01-10  dmg  <dmg@uvic.ca>
+
+	* Bumped to version 1.3 RC 1
+
+	* ninka-sqlite.pl, ninka-excel.pl: prepared them for release
+
+	* ninka.pl: fixed bug in finding the path of where ninka was being executed from (reported by Ryan Biesemeyer)
+
+	* Fixed quotes in perl (René bScheibe)
+
 2015-01-05  dmg  <dmg@uvic.ca>
 
 	* filter/criticalword.dict: MIT+no-false-attribs license missing one sentence
diff --git a/README b/README
index cc50b05..0a958c1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-* Contact information. 
+* Contact information.
 
 Any feedback will be appreciated. You can email us at Daniel M. German
 <dmg@uvic.ca> and Yuki Manabe <y-manabe@ist.osaka-u.ac.jp>
@@ -25,6 +25,11 @@ http://turingmachine.org/~dmg/papers/dmg2010ninka.pdf
 If you use Ninka for research purposes, we would appreciate you cite
 the above paper.
 
+* Contributors
+
+- Anthony Kohan for writing the excel and sqlite backends.
+- Armijn Hemel from Tjaldur Software Governance Solutions  for multiple bug reports and suggestions
+
 * License
 
   Except for the directories comments and splitter, Ninka is licensed
diff --git a/lib/Ninka.pm b/lib/Ninka.pm
index 9e1d51d..1816549 100644
--- a/lib/Ninka.pm
+++ b/lib/Ninka.pm
@@ -9,7 +9,7 @@ use Ninka::SentenceExtractor;
 use Ninka::SentenceFilter;
 use Ninka::SentenceTokenizer;
 
-our $VERSION = '1.2';
+our $VERSION = '1.3';
 
 sub process_file {
     my ($input_file, $verbose) = @_;
diff --git a/ninka-excel.pl b/ninka-excel.pl
index c06c830..71adddf 100644..100755
--- a/ninka-excel.pl
+++ b/ninka-excel.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#    Copyright (C) 2014  Anthony Kohan and Daniel M. German
+#    Copyright (C) 2014,2015  Anthony Kohan and Daniel M. German
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License as
@@ -27,8 +27,10 @@ use Spreadsheet::WriteExcel;
 
 
 if(scalar(@ARGV) != 2){
+    print STDERR "Ninka 1.3. sqlite wrapper\n";
+    print STDERR "Processes package file (.tar.gz, zip, jar. etc) and outputs to excel file\n";
     print STDERR "Incorrect number of arguments\n";
-    print STDERR "Correct usage is: perl ninka-wrapper <path to package file> <database name>\n";
+    print STDERR "Correct usage is: $0 <path to package file> <excel-file>\n";
     exit 1;
 }
 
diff --git a/ninka-sqlite.pl b/ninka-sqlite.pl
index 49b7576..65d746a 100644..100755
--- a/ninka-sqlite.pl
+++ b/ninka-sqlite.pl
@@ -1,4 +1,20 @@
 #!/usr/bin/perl
+#
+#    Copyright (C) 2014,2015  Anthony Kohan and Daniel M. German
+#
+#    This program 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.
+#
+#    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 use strict;
 use Switch;
@@ -8,9 +24,13 @@ use File::Find;
 use File::Basename;
 use Scalar::Util qw(looks_like_number);
 
+
+
 if(scalar(@ARGV) != 2){
+    print STDERR "Ninka 1.3. sqlite wrapper\n";
+    print STDERR "Processes package file (.tar.gz, zip, jar. etc) and outputs to sqlite file\n";
     print STDERR "Incorrect number of arguments\n";
-    print STDERR "Correct usage is: perl ninka-wrapper <path to package file> <database name>\n";
+    print STDERR "Correct usage is: $0 <path to package file> <database name>\n";
     exit 1;
 }