Merge branch 'totrtale_multiproc' of /home/git/repositories/kt/mothra

workflows/nlp/library.py

@@ -9,7 +9,8 @@ import re
 import itertools
 import subprocess
 
-webservices_totrtale_url = "http://vihar.ijs.si:8104"
+webservices_totrtale_url = "http://172.20.0.154/totrtale"
+webservice_def_ex_url = "http://172.20.0.154/definition"
 
 def merge_sentences(input_dict):
     """
@@ -441,7 +442,7 @@ def nlp_term_extraction2(input_dict):
     '''
     Term extraction from totrtale annotations.
     '''
-    ws_url = "http://vihar.ijs.si:8081/call"
+    ws_url = webservice_def_ex_url + "/call"
     annotations = input_dict['annotations']
     lang = input_dict['lang']
     stop_list_checkbox = input_dict["stop_list"] == "true"
@@ -518,10 +519,14 @@ def nlp_def_extraction_patterns2(input_dict):
     lang = input_dict['lang']
     pattern = input_dict['pattern']
 
+    if lang == "sl" and pattern == "begin_allvar":
+        raise Exception("Pattern begin_allvar is not supported for slovene language.")
+
+
     if '<TEI xmlns="http://www.tei-c.org/ns/1.0">' in annotations:
         annotations = TEItoTab(annotations)
 
-    ws_url = "http://vihar.ijs.si:8081/patDefSent"
+    ws_url = webservice_def_ex_url + "/patDefSent"
     params = {"corpus":annotations,
               "pattern":pattern,
               "lang":lang}
@@ -576,7 +581,7 @@ def nlp_def_extraction_terms2(input_dict):
     if '<TEI xmlns="http://www.tei-c.org/ns/1.0">' in annotations:
         annotations = TEItoTab(annotations)
 
-    ws_url = "http://vihar.ijs.si:8081/termDefSent"
+    ws_url = webservice_def_ex_url + "/termDefSent"
     params = {"corpus":annotations,
               "candidates":term_candidates,
               "lang":lang,
@@ -618,7 +623,7 @@ def nlp_def_extraction_wnet2(input_dict):
     if '<TEI xmlns="http://www.tei-c.org/ns/1.0">' in annotations:
         annotations = TEItoTab(annotations)
 
-    ws_url = "http://vihar.ijs.si:8081/wnetDefSent"
+    ws_url = webservice_def_ex_url + "/wnetDefSent"
     params = {"corpus":annotations,
               "lang":lang}
     response = post(ws_url, params=params)

workflows/nlp/package_data/widgets/09d72ebd-2eaf-47f6-95e0-2f2ed0c51ea2.json

@@ -147,7 +147,7 @@
     "model": "workflows.abstractinput", 
     "fields": {
       "widget": "09d72ebd-2eaf-47f6-95e0-2f2ed0c51ea2", 
-      "name": "Nominatives", 
+      "name": "Nominatives (only for Slovene)", 
       "short_name": "nom", 
       "default": "0", 
       "description": "", 

workflows/nlp/package_data/widgets/f3e3b0c7-39e1-4e7e-ba94-514d13864823.json

@@ -28,7 +28,7 @@
     "model": "workflows.abstractinput", 
     "fields": {
       "widget": "f3e3b0c7-39e1-4e7e-ba94-514d13864823", 
-      "name": "Pre-defined patterns", 
+      "name": "Predefined patterns", 
       "short_name": "pat", 
       "default": "begin_novar", 
       "description": "Pre-defined patterns", 
@@ -37,7 +37,7 @@
       "parameter_type": "select", 
       "variable": "pattern", 
       "parameter": true, 
-      "order": 1, 
+      "order": 3, 
       "uid": "687262b9-e21f-4279-8a72-e017b5ed9e72"
     }
   }, 
@@ -71,7 +71,7 @@
       "parameter_type": "select", 
       "variable": "lang", 
       "parameter": true, 
-      "order": 1, 
+      "order": 2, 
       "uid": "dcfab65d-8fe9-4b8f-b2c5-fe3a93274453"
     }
   }, 
@@ -108,7 +108,7 @@
   {
     "model": "workflows.abstractoption", 
     "fields": {
-      "name": "Begin allvar", 
+      "name": "Begin allvar (only for English)", 
       "uid": "5c6c3598-8a05-4918-9c38-992202d16fc9", 
       "value": "begin_allvar", 
       "abstract_input": "687262b9-e21f-4279-8a72-e017b5ed9e72"