renamed variables for title regex

[wikiq] / wikiq.cpp

diff --git a/wikiq.cpp b/wikiq.cpp
index ee10644391969e0517e2c35394d3b65e2db455be..712304779da85c02ecca7ef8369d6cb2ecc5ed1f 100644 (file)
--- a/wikiq.cpp
+++ b/wikiq.cpp
@@ -57,6 +57,7 @@ typedef struct {
     char *text;
     vector<string> last_text_tokens;
     vector<pcrecpp::RE> regexes;
+    vector<pcrecpp::RE> title_regexes;
     vector<string> regex_names;
     map<string, string> revision_md5; // used for detecting reversions
 
@@ -246,6 +247,23 @@ write_row(revisionData *data)
         ++pos;
     }
 
+    // look to see if (a) we've passed in a list of /any/ title_regexes
+    // and (b) if all of the title_regex_matches match
+    // if (a) is true and (b) is not, we return
+    bool any_title_regex_match = false;
+    if (!data->title_regexes.empty()) {
+        for (vector<pcrecpp::RE>::iterator r = data->title_regexes.begin(); r != data->title_regexes.end(); ++r) {
+            pcrecpp::RE& title_regex = *r;
+            if (title_regex.PartialMatch(data->title)) {
+                any_title_regex_match = true;
+                break;
+            }
+        }
+        if (!any_title_regex_match) {
+            return;
+        }
+    }
+
     //vector<string> additions;
     //vector<string> deletions;
     string additions;
@@ -488,9 +506,10 @@ void print_usage(char* argv[]) {
     cerr << "usage: <wikimedia dump xml> | " << argv[0] << "[options]" << endl
          << endl
          << "options:" << endl
-         << "  -t   print text and comments after each line of tab separated data" << endl
-         << "  -n   name of the following regex (e.g. -N name -r \"...\")" << endl
+         << "  -v   verbose mode prints text and comments after each line of tab separated data" << endl
+         << "  -n   name of the following regex (e.g. -n name -r \"...\")" << endl
          << "  -r   regex to check against additions and deletions" << endl
+         << "  -t   parse revisions only from pages whose titles match regex(es)" << endl
          << endl
          << "Takes a wikimedia data dump XML stream on standard in, and produces" << endl
          << "a tab-separated stream of revisions on standard out:" << endl
@@ -521,13 +540,13 @@ main(int argc, char *argv[])
     // the user data struct which is passed to callback functions
     revisionData data;
 
-    while ((c = getopt(argc, argv, "htn:r:")) != -1)
+    while ((c = getopt(argc, argv, "hvn:r:t:")) != -1)
         switch (c)
         {
             case 'd':
                 dry_run = 1;
                 break;
-            case 't':
+            case 'v':
                 output_type = FULL;
                 break;
             case 'n':
@@ -544,6 +563,9 @@ main(int argc, char *argv[])
                 print_usage(argv);
                 exit(0);
                 break;
+            case 't':
+                data.title_regexes.push_back(pcrecpp::RE(optarg, pcrecpp::UTF8()));
+                break;
         }
 
     if (dry_run) { // lets us print initialization options