made changes necessary to build a static version

[wikiq] / wikiq.cpp

diff --git a/wikiq.cpp b/wikiq.cpp
index 57d97fa98def696ba549db07f6402c147a6b1834..e8ca4d280c174d5d458983a75f66d722b3ebd903 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> wp_namespace_res;
     vector<string> regex_names;
     map<string, string> revision_md5; // used for detecting reversions
 
@@ -246,6 +247,22 @@ write_row(revisionData *data)
         ++pos;
     }
 
+    // skip this if the wp_namespace is not in the proscribed list of
+    // namespaces
+    bool wp_namespace_found = false;
+    if (!data->wp_namespace_res.empty()) {
+        for (vector<pcrecpp::RE>::iterator r = data->wp_namespace_res.begin(); r != data->wp_namespace_res.end(); ++r) {
+            pcrecpp::RE& wp_namespace_re = *r;
+            if (wp_namespace_re.PartialMatch(data->title)) {
+                wp_namespace_found = true;
+                break;
+            }
+        }
+        if (!wp_namespace_found) {
+            return;
+        }
+    }
+
     //vector<string> additions;
     //vector<string> deletions;
     string additions;
@@ -254,7 +271,9 @@ write_row(revisionData *data)
     vector<bool> regex_matches_adds;
     vector<bool> regex_matches_dels;
 
-    if (!data->last_text_tokens.empty()) {
+    if (data->last_text_tokens.empty()) {
+        additions = data->text;
+    } else {
         // do the diff
         
         dtl::Diff< string, vector<string> > d(data->last_text_tokens, text_tokens);
@@ -274,25 +293,22 @@ write_row(revisionData *data)
                 break;
             }
         }
-
-        if (!additions.empty()) {
-            //cout << "ADD: " << additions << endl;
-            for (vector<pcrecpp::RE>::iterator r = data->regexes.begin(); r != data->regexes.end(); ++r) {
-                pcrecpp::RE& regex = *r;
-                regex_matches_adds.push_back(regex.PartialMatch(additions));
-            }
+    }
+    
+    if (!additions.empty()) {
+        //cout << "ADD: " << additions << endl;
+        for (vector<pcrecpp::RE>::iterator r = data->regexes.begin(); r != data->regexes.end(); ++r) {
+            pcrecpp::RE& regex = *r;
+            regex_matches_adds.push_back(regex.PartialMatch(additions));
         }
+    }
 
-        if (!deletions.empty()) {
-            //cout << "DEL: " << deletions << endl;
-            for (vector<pcrecpp::RE>::iterator r = data->regexes.begin(); r != data->regexes.end(); ++r) {
-                pcrecpp::RE& regex = *r;
-                regex_matches_dels.push_back(regex.PartialMatch(deletions));
-            }
+    if (!deletions.empty()) {
+        //cout << "DEL: " << deletions << endl;
+        for (vector<pcrecpp::RE>::iterator r = data->regexes.begin(); r != data->regexes.end(); ++r) {
+            pcrecpp::RE& regex = *r;
+            regex_matches_dels.push_back(regex.PartialMatch(deletions));
         }
-
-        // apply regex to the diff
-
     }
 
     data->last_text_tokens = text_tokens;
@@ -489,9 +505,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   regex(es) to check title against as a way of limiting output to specific namespaces" << 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
@@ -522,13 +539,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':
@@ -545,6 +562,9 @@ main(int argc, char *argv[])
                 print_usage(argv);
                 exit(0);
                 break;
+            case 't':
+                data.wp_namespace_res.push_back(pcrecpp::RE(optarg, pcrecpp::UTF8()));
+                break;
         }
 
     if (dry_run) { // lets us print initialization options