From 1fddd74c41c3fbd552b822f91723aaee22bdf239 Mon Sep 17 00:00:00 2001
From: amir-zeldes <amir.zeldes@georgetown.edu>
Date: Thu, 20 Jun 2019 22:05:39 -0400
Subject: [PATCH] update freqs interface

---
 entry.cgi                 |  7 ++---
 utils/make_lemma_table.py | 55 +++++++++++++++++++++++++--------------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/entry.cgi b/entry.cgi
index f843518..d279c0b 100755
--- a/entry.cgi
+++ b/entry.cgi
@@ -207,7 +207,7 @@ def related(related_entries):
 
 
 def get_freqs(item):
-	item = item.replace("-","")#.replace("⸗".encode("utf8"),"")
+	item = item.replace("-","").replace("⸗".decode("utf8"),"")
 	output = "<ul>\n"
 	if platform.system() == 'Linux':
 		con = lite.connect('alpha_kyima_rc1.db')
@@ -227,7 +227,7 @@ def get_freqs(item):
 			output += "<li>Word form frequency per 10,000: "+str(freq)+" (# "+str(rank)+")</li>\n"
 		else:
 			output += "<li>Not found as word form in ANNIS</li>\n"
-		sql = "SELECT lemma_freq, lemma_rank FROM lemmas WHERE word = ?;"
+		sql = "SELECT lemma_freq, lemma_rank FROM lemmas WHERE lemma = ?;"
 		cur.execute(sql, (item,))
 		res = cur.fetchone()
 		if res is not None:
@@ -240,7 +240,8 @@ def get_freqs(item):
 
 
 def get_collocs(word, cursor):
-	thresh = 15
+	word = word.replace("-","")
+	thresh = 10
 	sql = "SELECT * from collocates WHERE lemma=? and not collocate in ('ⲡ','ⲛ','ⲧ','ⲟⲩ') and assoc > ? ORDER BY assoc DESC LIMIT 20"
 	rows = cursor.execute(sql,(word,thresh)).fetchall()
 	return rows
diff --git a/utils/make_lemma_table.py b/utils/make_lemma_table.py
index 7356530..275ae97 100644
--- a/utils/make_lemma_table.py
+++ b/utils/make_lemma_table.py
@@ -15,7 +15,7 @@
 from math import log
 from six import iteritems
 
-corpora = ["shenoute.eagerness", "shenoute.fox", "shenoute.a22", "shenoute.abraham.our.father", "shenoute.dirt",
+corpora = ["shenoute.eagerness", "shenoute.fox", "shenoute.a22", "shenoute.abraham", "shenoute.dirt",
 		   "apophthegmata.patrum", "sahidica.nt", "sahidic.ot", "pseudo.theophilus", "martyrdom.victor",
 		   "johannes.canons",
 		   "besa.letters", "sahidica.mark", "sahidica.1corinthians", "doc.papyri"]
@@ -114,7 +114,11 @@ def get_freqs(url, corpora, use_cache=False):
 
 		if use_cache:
 			sys.stderr.write("! Retrieving data from CACHE!\n")
-			text_content = io.open("cache_freqs.xml",encoding="utf8").read()
+			if index == 0:
+				text_content = io.open("cache_freqs_norm.xml",encoding="utf8").read()
+			else:
+				text_content = io.open("cache_freqs_lemma.xml",encoding="utf8").read()
+
 		else:
 			field = fields[index]
 			query = escape(query)
@@ -218,27 +222,40 @@ def update_db(row_list,table="lemmas"):
 parser.add_argument("-l","--lemma_list",action="store",dest="lemma_list",default="C:\\TreeTagger\\bin\\coptic\\copt_lemma_lex.tab")
 parser.add_argument("-u","--url",action="store",dest="url",default="https://corpling.uis.georgetown.edu/")
 parser.add_argument("-o","--outmode",action="store",dest="outmode",default="db")
+parser.add_argument("-c","--use_cache",action="store_true",help="activate cache - read data from tt_collocs.tab and cache_freqs.xml")
 
 
 options = parser.parse_args()
 
 # Get collocation information
 cooc_pool = 0
-try:
-	collocate_freqs = defaultdict(lambda: defaultdict(int))
-	colloc_lines = io.open("colloc_data.tab",encoding="utf8").readlines()
-	for i, line in enumerate(colloc_lines):
-		if i > 0:
-			line = line.strip()
-			if line.count("\t") == 2:
-				node, collocate, freq = line.strip().split("\t")
-				freq = int(freq)
-				cooc_pool += freq #* 2
-				if freq > 5:
-					collocate_freqs[node][collocate] += freq
-					collocate_freqs[collocate][node] += freq
-except Exception as e:
+collocate_freqs = defaultdict(lambda: defaultdict(int))
+
+# Check if cached file is available and create it if not
+if not os.path.isfile("tt_collocs.tab") or not options.use_cache:
+	sys.stderr.write('o Cache data unavailable - retrieving collocations from ANNIS\n')
 	colloc_data = get_collocations(options.url,corpora)
+	out_cache = []
+	for key, val in iteritems(colloc_data):
+		if "||" in key:
+			w1, w2 = key.split("||")
+			out_cache.append("\t".join([w1,w2,str(val)]))
+	with io.open("tt_collocs.tab",'w',encoding="utf8",newline="\n") as f:
+		f.write("\n".join(out_cache) +"\n")
+else:
+	sys.stderr.write('o Using cached tt_collocs.tab\n')
+
+colloc_lines = io.open("tt_collocs.tab",encoding="utf8").readlines()
+for i, line in enumerate(colloc_lines):
+	if i > 0:
+		line = line.strip()
+		if line.count("\t") == 2:
+			node, collocate, freq = line.strip().split("\t")
+			freq = int(freq)
+			cooc_pool += freq #* 2
+			if freq > 5:
+				collocate_freqs[node][collocate] += freq
+				#collocate_freqs[collocate][node] += freq
 
 
 # Get lemmas from TT dict
@@ -246,7 +263,7 @@ def update_db(row_list,table="lemmas"):
 lemma_list = read_lemmas(options.lemma_list)
 
 
-norm_counts, lemma_counts = get_freqs(options.url,corpora, use_cache=True)
+norm_counts, lemma_counts = get_freqs(options.url,corpora, use_cache=options.use_cache)
 
 total = float(sum(norm_counts.values()))
 norm_freqs = {}
@@ -260,9 +277,9 @@ def update_db(row_list,table="lemmas"):
 	lemma_freqs[lemma] = freq
 
 norm_freqs_as_list = [[val,key] for key,val in iteritems(norm_freqs)]
-add_rank(norm_freqs_as_list)
+norm_freqs_as_list = add_rank(norm_freqs_as_list)
 lemma_freqs_as_list = [[val,key] for key,val in iteritems(lemma_freqs)]
-add_rank(lemma_freqs_as_list)
+lemma_freqs_as_list = add_rank(lemma_freqs_as_list)
 
 norm_data = {}
 lemma_data = {}