From 7f6f9d66998fb434377bc76f8c51d364babac0b6 Mon Sep 17 00:00:00 2001 From: kevin <1141706615@qq.com> Date: Sun, 19 Mar 2017 23:37:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project_match/src/main/java/com/ossean/GetSynonyms.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/project_match/src/main/java/com/ossean/GetSynonyms.java b/project_match/src/main/java/com/ossean/GetSynonyms.java index 4dd44b818..594ba5b07 100644 --- a/project_match/src/main/java/com/ossean/GetSynonyms.java +++ b/project_match/src/main/java/com/ossean/GetSynonyms.java @@ -48,7 +48,7 @@ public class GetSynonyms{ @Resource private PlatformProjectDao paltformDao; - private static String gatherProjectsTableName ="gather_projects_tmp";//TableName.gatherProjectsTableName; + private static String gatherProjectsTableName = TableName.gatherProjectsTableName; private static String synonymsTableName = TableName.synonymsTableName; private static String pointerTableName = TableName.pointerTableName; private static int batchSize = 1000; @@ -267,8 +267,8 @@ public class GetSynonyms{ //freecode项目抽取结果中只有创建时间可以利用，创建时间较早的认为比较可信 DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - List time1 = paltformDao.getTime("gather_projects", "extracted_time", model1.getUrl_md5()); - List time2 = paltformDao.getTime("gather_projects", "extracted_time",model2.getUrl_md5()); + List time1 = paltformDao.getTime("freecode_project ", "extracted_time", model1.getUrl_md5()); + List time2 = paltformDao.getTime("freecode_project ", "extracted_time",model2.getUrl_md5()); if(time1!=null && time2!=null) try { Date dt1 = df1.parse(time1.get(0)); @@ -708,6 +708,7 @@ public class GetSynonyms{ { for(String name:linkNameResult){ //be动词前不包括项目类型，且和项目名不相同 + if(bracket != null && !bracket.equals("")) if(!keywords.contains(name.toLowerCase().trim()) && !name.toLowerCase().trim().equals(model.getName().toLowerCase().trim()) && !name.toLowerCase().trim().equals(projectNameWithoutComName.toLowerCase().trim())){ //这里的prjName是完整的name From 7d0df885cccd2b31e1770e3c8b481be3642efa7e Mon Sep 17 00:00:00 2001 From: kevin <1141706615@qq.com> Date: Mon, 20 Mar 2017 00:03:36 +0800 Subject: [PATCH 2/3] modify github_tmp to github --- .../src/main/java/com/ossean/GetSynonyms.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/project_match/src/main/java/com/ossean/GetSynonyms.java b/project_match/src/main/java/com/ossean/GetSynonyms.java index 6fe9e62ea..cc2d9711b 100644 --- a/project_match/src/main/java/com/ossean/GetSynonyms.java +++ b/project_match/src/main/java/com/ossean/GetSynonyms.java @@ -48,10 +48,7 @@ public class GetSynonyms{ @Resource private PlatformProjectDao paltformDao; -<<<<<<< HEAD -======= ->>>>>>> bd2d35aba440af111af5020aa31f5d6462c1ea51 - private static String gatherProjectsTableName =TableName.gatherProjectsTableName;//TableName.gatherProjectsTableName; + private static String gatherProjectsTableName =TableName.gatherProjectsTableName; private static String synonymsTableName = TableName.synonymsTableName; private static String pointerTableName = TableName.pointerTableName; private static int batchSize = 1000; @@ -254,8 +251,8 @@ public class GetSynonyms{ } if(communityValue1 == 1) { - List hot1 = paltformDao.getHotValue("github_tmp","forks",model1.getUrl_md5()); - List hot2 = paltformDao.getHotValue("github_tmp","forks",model2.getUrl_md5()); + List hot1 = paltformDao.getHotValue("github","forks",model1.getUrl_md5()); + List hot2 = paltformDao.getHotValue("github","forks",model2.getUrl_md5()); if(hot1.size()>0 && hot2.size()>0) return hot1.get(0) > hot2.get(0) ? model1:model2; else @@ -375,7 +372,7 @@ public class GetSynonyms{ { //github项目名称中有斜杠，提取斜杠后内容做为别名 String subName = getSubName(prjName); - if(subName != null) + if(subName != null && !subName.equals("")) { SynonymMap.put(subName, 1); } @@ -711,7 +708,7 @@ public class GetSynonyms{ { for(String name:linkNameResult){ //be动词前不包括项目类型，且和项目名不相同 - if(bracket != null && !bracket.equals("")) + if(bracket != null && !bracket.equals("")) if(!keywords.contains(name.toLowerCase().trim()) && !name.toLowerCase().trim().equals(model.getName().toLowerCase().trim()) && !name.toLowerCase().trim().equals(projectNameWithoutComName.toLowerCase().trim())){ //这里的prjName是完整的name @@ -747,10 +744,13 @@ public class GetSynonyms{ private String getSubName(String prjName) { // TODO Auto-generated method stub String SubName = prjName; - if(prjName.indexOf('/') == -1) - return SubName; - else - SubName = prjName.substring(prjName.indexOf('/') + 1); + if(!prjName.equals("")) + { + if(prjName.indexOf('/') == -1) + return SubName; + else + SubName = prjName.substring(prjName.indexOf('/') + 1); + } return SubName; } From 6de7f9615751c47265585f4e2bb966434821a87c Mon Sep 17 00:00:00 2001 From: kevin <1141706615@qq.com> Date: Mon, 20 Mar 2017 08:33:04 +0800 Subject: [PATCH 3/3] improved --- project_match/src/main/java/com/ossean/GetSynonyms.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project_match/src/main/java/com/ossean/GetSynonyms.java b/project_match/src/main/java/com/ossean/GetSynonyms.java index cc2d9711b..d64a82737 100644 --- a/project_match/src/main/java/com/ossean/GetSynonyms.java +++ b/project_match/src/main/java/com/ossean/GetSynonyms.java @@ -89,6 +89,7 @@ public class GetSynonyms{ { //当多个项目具有相同别名的时候，选出最适合的那个项目，并将其余项目的该别名所对应的flag置0 synonymMap = synonymsFilter(synonymMap,synonymsTableName,model); + //System.out.println("dealing with project:" + model.getId()); } catch(Exception e) { @@ -708,13 +709,14 @@ public class GetSynonyms{ { for(String name:linkNameResult){ //be动词前不包括项目类型，且和项目名不相同 - if(bracket != null && !bracket.equals("")) + if(!keywords.contains(name.toLowerCase().trim()) && !name.toLowerCase().trim().equals(model.getName().toLowerCase().trim()) && !name.toLowerCase().trim().equals(projectNameWithoutComName.toLowerCase().trim())){ //这里的prjName是完整的name if(model.getName().toLowerCase().indexOf(name.toLowerCase()) != -1){ String withoutShortDash = RemoveShortDash(name); - if(name.toLowerCase().equals(bracket.toLowerCase()) || name.toLowerCase().equals(withoutShortDash)) + if((bracket != null && !bracket.equals("")) && (name.toLowerCase().equals(bracket.toLowerCase()) || name.toLowerCase().equals(withoutShortDash)) + ) synonymsList.add(name); else {