Improve reports Wikipedia and Preprocess Text

biolab · Jul 20, 2018 · 803033a · 803033a
1 parent 87a9252
commit 803033a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/orangecontrib/text/preprocess/preprocess.py b/orangecontrib/text/preprocess/preprocess.py
@@ -132,13 +132,17 @@ def __str__(self):
 
     def report(self):
         return (
-            ('Transformers', ', '.join(str(tr) for tr in self.transformers)),
-            ('Tokenizer', str(self.tokenizer)),
-            ('Normalizer', str(self.normalizer)),
-            ('Filters', ', '.join(str(f) for f in self.filters)),
-            ('Ngrams range', str(self.ngrams_range)),
-            ('Frequency filter', str(self.freq_filter)),
-            ('Pos tagger', str(self.pos_tagger)),
+            ('Transformers', ', '.join(str(tr) for tr in self.transformers)
+            if self.transformers else None),
+            ('Tokenizer', str(self.tokenizer) if self.tokenizer else None),
+            ('Normalizer', str(self.normalizer) if self.normalizer else None),
+            ('Filters', ', '.join(str(f) for f in self.filters) if
+            self.filters else None),
+            ('Ngrams range', str(self.ngrams_range) if self.ngrams_range else
+            None),
+            ('Frequency filter', str(self.freq_filter) if self.freq_filter
+            else None),
+            ('Pos tagger', str(self.pos_tagger) if self.pos_tagger else None),
         )
 
 

diff --git a/orangecontrib/text/widgets/owwikipedia.py b/orangecontrib/text/widgets/owwikipedia.py
@@ -6,8 +6,8 @@
 from Orange.widgets.widget import OWWidget, Msg, Output
 from orangecontrib.text.corpus import Corpus
 from orangecontrib.text.language_codes import lang2code, code2lang
-from orangecontrib.text.widgets.utils import ComboBox, ListEdit, CheckListLayout, asynchronous, \
-    QSize
+from orangecontrib.text.widgets.utils import ComboBox, ListEdit, CheckListLayout, asynchronous
+
 from orangecontrib.text.wikipedia import WikipediaAPI
 
 
@@ -54,10 +54,11 @@ def __init__(self, *args, **kwargs):
         layout.setSpacing(7)
 
         row = 0
-        query_edit = ListEdit(self, 'query_list', "Each line represents a "
+        self.query_edit = ListEdit(self, 'query_list', "Each line represents a "
                                                   "separate query.", 100, self)
         layout.addWidget(QLabel('Query word list:'), row, 0, 1, self.label_width)
-        layout.addWidget(query_edit, row, self.label_width, 1, self.widgets_width)
+        layout.addWidget(self.query_edit, row, self.label_width, 1,
+                         self.widgets_width)
 
         # Language
         row += 1
@@ -134,7 +135,7 @@ def set_text_features(self):
     def send_report(self):
         if self.result:
             items = (('Language', code2lang[self.language]),
-                     ('Query', self.query_list),
+                     ('Query', self.query_edit.toPlainText()),
                      ('Articles count', len(self.result)))
             self.report_items('Query', items)