From d5d1c0d5916b4e864f340f381bb5235eda1f30c9 Mon Sep 17 00:00:00 2001 From: fixminer Date: Sun, 16 Aug 2020 19:03:26 +0200 Subject: [PATCH] FIX: pjname bug --- python/abstractPatch.py | 8 +++++--- python/sprinferIndex.py | 10 ++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/python/abstractPatch.py b/python/abstractPatch.py index c6b7a99..e731007 100644 --- a/python/abstractPatch.py +++ b/python/abstractPatch.py @@ -191,16 +191,18 @@ def clusterCore(clusterPath, level, match, pairsPath, root, s,action ,token=''): parallelRun(dumpFilesCore,workList) # for wl in workList: # dumpFilesCore(wl) - # dumpFilesCore(('hive_d65d5c_96c1dc_ql#src#gen#protobuf#gen-java#org#apache#hadoop#hive#ql#io#orc#OrcProto.txt_31', 'ReturnStatement', 'tokens', '/Users/anil.koyuncu/projects/richedit-all/enhancedASTDiff/python/data/tokens', '3', '1', '0', 10)) + # dumpFilesCore(('linux_71cd79_37905ae1_drivers#staging#rtl88192u#ieee80211_softmac.c.txt_0', 'block_content', 'actions', '/Users/anilkoyuncu/projects/fixminer-data/actions', '36', '', '', 4)) def dumpFilesCore(t): try: dumpFile, root, level, clusterPath, s, action, token, idx = t - project, _ ,fileName = re.split('_[0-9a-f]{6}', dumpFile) - prev, rev = re.findall('[0-9a-f]{6}', dumpFile) + project, _ ,fileName = re.split('_[0-9a-f]{6,40}', dumpFile) + prev, rev = re.findall('_[0-9a-f]{6,40}', dumpFile) + prev = prev.replace('_','') + rev = rev.replace('_','') fileName, hunk = fileName.split('.txt_') # split = dumpFile.split('_') # project = split[0] diff --git a/python/sprinferIndex.py b/python/sprinferIndex.py index 0d59f5b..ed7d507 100644 --- a/python/sprinferIndex.py +++ b/python/sprinferIndex.py @@ -78,8 +78,14 @@ def indexCore(): if len(members) > 1: lines = [] for member in members: - project, _, fileName = re.split('_[0-9a-f]{6}', member) - prev, rev = re.findall('[0-9a-f]{6}', member) + # project, _, fileName = re.split('_[0-9a-f]{6}', member) + # prev, rev = re.findall('[0-9a-f]{6}', member) + + project, _, fileName = re.split('_[0-9a-f]{6,40}', member) + prev, rev = re.findall('_[0-9a-f]{6,40}', member) + + prev = prev.replace('_', '') + rev = rev.replace('_', '') # fileName, hunk = fileName.split('.txt_') # split = dumpFile.split('_')