X-Git-Url: https://projects.mako.cc/source/wikiq/blobdiff_plain/c41704df5969d350317465fabdfa3012150073db..21341e70f9d509aeaaf0cb6a39caf56d704dc838:/wikiq.cpp

diff --git a/wikiq.cpp b/wikiq.cpp
index ea82f3a..ad9ac48 100644
--- a/wikiq.cpp
+++ b/wikiq.cpp
@@ -11,7 +11,6 @@
 #include <stdlib.h>
 #include "expat.h"
 #include <getopt.h>
-#include "disorder.h"
 #include "md5.h"
 #include "dtl/dtl.hpp"
 #include <vector>
@@ -345,7 +344,6 @@ write_row(revisionData *data)
         << data->editorid << "\t"
         << ((data->minor) ? "TRUE" : "FALSE") << "\t"
         << (unsigned int) data->text_size << "\t"
-        << shannon_H(data->text, data->text_size) << "\t"
         << md5_hex_output << "\t"
         << reverted_to << "\t"
         << (int) additions.size() << "\t"
@@ -530,7 +528,7 @@ void print_usage(char* argv[]) {
          << endl
          << "options:" << endl
          << "  -v   verbose mode prints text and comments after each line of tab separated data" << endl
-         << "  -n   name of the following regex for contet (e.g. -n name -r \"...\")" << endl
+         << "  -n   name of the following regex for content (e.g. -n name -r \"...\")" << endl
          << "  -r   regex to check against content of the revision" << endl
          << "  -N   name of the following regex for diffs (e.g. -N name -R \"...\")" << endl
          << "  -R   regex to check against diffs (i.e., additions and deletions)" << endl
@@ -540,14 +538,15 @@ void print_usage(char* argv[]) {
          << "a tab-separated stream of revisions on standard out:" << endl
          << endl
          << "title, articleid, revid, timestamp, anon, editor, editorid, minor," << endl
-         << "text_length, text_entropy, text_md5, reversion, additions_size, deletions_size" << endl
+         << "text_length, text_md5, reversion, additions_size, deletions_size" << endl
          << ".... and additional fields for each regex executed against add/delete diffs" << endl
          << endl
          << "Boolean fields are TRUE/FALSE except in the case of reversion, which is blank" << endl
          << "unless the article is a revert to a previous revision, in which case, it" << endl
          << "contains the revision ID of the revision which was reverted to." << endl
          << endl
-         << "author: Erik Garrison <erik@hypervolu.me>" << endl;
+         << "authors: Erik Garrison <erik@hypervolu.me>" << endl
+         << "         Benjamin Mako Hill <mako@atdot.cc>" << endl;
 }
 
 
@@ -642,7 +641,6 @@ main(int argc, char *argv[])
         << "editor_id" << "\t"
         << "minor" << "\t"
         << "text_size" << "\t"
-        << "text_entropy" << "\t"
         << "text_md5" << "\t"
         << "reversion" << "\t"
         << "additions_size" << "\t"