Merge branch 'advanced_persistence' of code.communitydata.cc:mediawiki_dump_tools...

[mediawiki_dump_tools.git] / wikiq

diff --git a/wikiq b/wikiq
index dc9d772a24f6c2b0c42d43b8708ba883b790c14c..a2a11fac72651c77381af71a56e3f246c90dedf3 100755 (executable)
--- a/wikiq
+++ b/wikiq
@@ -3,7 +3,7 @@
 # original wikiq headers are: title articleid revid date_time anon
 # editor editor_id minor text_size text_entropy text_md5 reversion
 # additions_size deletions_size
 # original wikiq headers are: title articleid revid date_time anon
 # editor editor_id minor text_size text_entropy text_md5 reversion
 # additions_size deletions_size

-import pdb
+

 import argparse
 import sys
 import os, os.path
 import argparse
 import sys
 import os, os.path


@@ -184,7 +184,7 @@ class WikiqParser():
 
             # skip namespaces not in the filter
             if self.namespace_filter is not None:
 
             # skip namespaces not in the filter
             if self.namespace_filter is not None:

-                if namespace in self.namespace_filter:
+                if namespace not in self.namespace_filter:

                     continue
 
             rev_detector = mwreverts.Detector()
                     continue
 
             rev_detector = mwreverts.Detector()


@@ -386,7 +386,9 @@ parser.add_argument('-p', '--persistence', dest="persist", default=None, const='
 parser.add_argument('-u', '--url-encode', dest="urlencode", action="store_true",
                     help="Output url encoded text strings. This works around some data issues like newlines in editor names. In the future it may be used to output other text data.")
 
 parser.add_argument('-u', '--url-encode', dest="urlencode", action="store_true",
                     help="Output url encoded text strings. This works around some data issues like newlines in editor names. In the future it may be used to output other text data.")
 

-parser.add_argument('-ns', '--namespace-filter', dest="namespace_filter", type=str, help="Comma-seperate list of namespaces numbers to include", default=None)
+parser.add_argument('-n', '--namespace-include', dest="namespace_filter", type=int, action='append',
+                    help="Id number of namspace to include.")
+

 
 
 args = parser.parse_args()
 
 
 args = parser.parse_args()


@@ -403,7 +405,7 @@ else:
     persist = PersistMethod.sequence
 
 if args.namespace_filter is not None:
     persist = PersistMethod.sequence
 
 if args.namespace_filter is not None:

-    namespaces = [int(ns) for ns in args.namespace_filter.split(',')]
+    namespaces = args.namespace_filter

 else:
     namespaces = None
 
 else:
     namespaces = None
 


@@ -425,12 +427,11 @@ if len(args.dumpfiles) > 0:
             filename = os.path.join(output_dir, os.path.basename(filename))
             output_file = open_output_file(filename)
 
             filename = os.path.join(output_dir, os.path.basename(filename))
             output_file = open_output_file(filename)
 

-            wikiq = WikiqParser(input_file, output_file, 
-                                collapse_user=args.collapse_user,
-                                persist=persist,
-                                urlencode=args.urlencode,
-                                namespaces = namespaces)
-
+        wikiq = WikiqParser(input_file, output_file, 
+                            collapse_user=args.collapse_user,
+                            persist=persist,
+                            urlencode=args.urlencode,
+                            namespaces = namespaces)

 
         wikiq.process()
 
 
         wikiq.process()