Passage au processor Step 1

Killian
1 parent ac1275835c
Showing 2 changed files with 14 additions and 26 deletions Side-by-side Diff
static/js/application.js
webtagger.py
@@ -14,15 +14,16 @@
 		url: "tagger",
 		data: data,
 		success: function(data){
-			data = JSON.parse(data);
+                        //data = JSON.parse(data);
 			result=$('#result');
  
-			_.each(data, function(element, index, list){
-				console.log(element);
-				result.append(_.escape(element["word"])+" ");
-				result.append(_.escape(element["markup"]+" "));
-				result.append(_.escape(element["lemm"]+"\n"));
-			});
+			//_.each(data, function(element, index, list){
+			//	console.log(element);
+			//	result.append(_.escape(element["word"])+" ");
+			//	result.append(_.escape(element["markup"]+" "));
+			//	result.append(_.escape(element["lemm"]+"\n"));
+			//});
+			result.append(_.escape(data));
 			console.log(_.escape(data));
 			console.log("resultat");
 		},
@@ -3,6 +3,7 @@
 import os
 import json
 from flask import Flask, request, render_template
+from processor.LiaTools import *
 app = Flask(__name__)
  
 @app.route("/")
  
  
@@ -11,28 +12,14 @@
  
 @app.route("/tagger",methods=['POST'])
 def cleaner():
+    tagger = Tagger()
     # Receive String from post parametre Raw text ( Json )
     dirtyString= request.json[u'string']
-    # send the String throught LIA_TAGG script  thank's to pipe
+    # send the String throught LIA_TAGG script  thank's to pip
     # lia_clean split a word by line et markup the sentences
-    p=subprocess.Popen([os.environ["LIA_TAGG"]+'/script/lia_clean'],stdin=subprocess.PIPE,stdout=subprocess.PIPE)
-    (cleanString, err) = p.communicate(input=dirtyString.encode('iso8859-1','backslashreplace'))
-    #lia_tagg+lemm tagg words with function and give the lemm for each word
-    p2=subprocess.Popen([os.environ["LIA_TAGG"]+'/script/lia_tagg+lemm','-guess'],stdin=subprocess.PIPE,stdout=subprocess.PIPE)
-    (taggedString,err) =p2.communicate(input=cleanString)
-    # This is used beceause lia_tagg deal with iso8859 only
-    taggedString = taggedString.decode('iso8859').encode("utf8")
-    textTable = taggedString.split('\n')
-    # Creating a dictionary in order to encode it into Json 
-    textDictionary = list()
-    for line in textTable :
-	lineTable =line.split()
-	#print lineTable
-	if lineTable:
-		wordDict=dict([('word',lineTable[0]),('markup',lineTable[1]),('lemm',lineTable[2])])
-		textDictionary.append(wordDict)
-    textJson = json.JSONEncoder().encode(textDictionary) 
-    return textJson
+    cleanString= tagger.clean(dirtyString)
+    taggedString= tagger.tagg(cleanString)
+    return taggedString
 if __name__ == '__main__':
     app.debug = True
     app.run(host='0.0.0.0')
...	...	@@ -14,15 +14,16 @@
14	14	url: "tagger",
15	15	data: data,
16	16	success: function(data){
17		- data = JSON.parse(data);
	17	+ //data = JSON.parse(data);
18	18	result=$('#result');
19	19
20		- _.each(data, function(element, index, list){
21		- console.log(element);
22		- result.append(_.escape(element["word"])+" ");
23		- result.append(_.escape(element["markup"]+" "));
24		- result.append(_.escape(element["lemm"]+"\n"));
25		- });
	20	+ //_.each(data, function(element, index, list){
	21	+ // console.log(element);
	22	+ // result.append(_.escape(element["word"])+" ");
	23	+ // result.append(_.escape(element["markup"]+" "));
	24	+ // result.append(_.escape(element["lemm"]+"\n"));
	25	+ //});
	26	+ result.append(_.escape(data));
26	27	console.log(_.escape(data));
27	28	console.log("resultat");
28	29	},
...	...	@@ -3,6 +3,7 @@
3	3	import os
4	4	import json
5	5	from flask import Flask, request, render_template
	6	+from processor.LiaTools import *
6	7	app = Flask(__name__)
7	8
8	9	@app.route("/")
9	10
10	11
...	...	@@ -11,28 +12,14 @@
11	12
12	13	@app.route("/tagger",methods=['POST'])
13	14	def cleaner():
	15	+ tagger = Tagger()
14	16	# Receive String from post parametre Raw text ( Json )
15	17	dirtyString= request.json[u'string']
16		- # send the String throught LIA_TAGG script thank's to pipe
	18	+ # send the String throught LIA_TAGG script thank's to pip
17	19	# lia_clean split a word by line et markup the sentences
18		- p=subprocess.Popen([os.environ["LIA_TAGG"]+'/script/lia_clean'],stdin=subprocess.PIPE,stdout=subprocess.PIPE)
19		- (cleanString, err) = p.communicate(input=dirtyString.encode('iso8859-1','backslashreplace'))
20		- #lia_tagg+lemm tagg words with function and give the lemm for each word
21		- p2=subprocess.Popen([os.environ["LIA_TAGG"]+'/script/lia_tagg+lemm','-guess'],stdin=subprocess.PIPE,stdout=subprocess.PIPE)
22		- (taggedString,err) =p2.communicate(input=cleanString)
23		- # This is used beceause lia_tagg deal with iso8859 only
24		- taggedString = taggedString.decode('iso8859').encode("utf8")
25		- textTable = taggedString.split('\n')
26		- # Creating a dictionary in order to encode it into Json
27		- textDictionary = list()
28		- for line in textTable :
29		- lineTable =line.split()
30		- #print lineTable
31		- if lineTable:
32		- wordDict=dict([('word',lineTable[0]),('markup',lineTable[1]),('lemm',lineTable[2])])
33		- textDictionary.append(wordDict)
34		- textJson = json.JSONEncoder().encode(textDictionary)
35		- return textJson
	20	+ cleanString= tagger.clean(dirtyString)
	21	+ taggedString= tagger.tagg(cleanString)
	22	+ return taggedString
36	23	if __name__ == '__main__':
37	24	app.debug = True
38	25	app.run(host='0.0.0.0')