From: <jbo...@li...> - 2006-03-27 13:12:53
|
Author: aron.gombas Date: 2006-03-27 08:12:45 -0500 (Mon, 27 Mar 2006) New Revision: 3253 Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraWebCrawlingServiceImpl.java trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java Log: More standard names Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraWebCrawlingServiceImpl.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraWebCrawlingServiceImpl.java 2006-03-27 10:06:19 UTC (rev 3252) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraWebCrawlingServiceImpl.java 2006-03-27 13:12:45 UTC (rev 3253) @@ -58,7 +58,7 @@ disconnect(url); // run XQueries - String queryProject = + String queryProjects = "for " + "$d in //table " + "where " + @@ -71,11 +71,11 @@ "{ data(fn:normalize-space(fn:string-join($d/following-sibling::table/child::tr/child::td/child::p[1]/text(), ''))) }|" + "{ data($d/following-sibling::table/child::tr/child::td/child::p[1]/child::a[1]) }" + "</dummy>"; - List resultProject = WebCrawlingUtils.runXQuery(dom, queryProject); - if(resultProject.size() < 1) - throw new IllegalStateException(String.format("Couldn't find JIRA project properties (%d) at \"%s\"", resultProject.size(), url)); + List resultProjects = WebCrawlingUtils.runXQuery(dom, queryProjects); + if(resultProjects.size() < 1) + throw new IllegalStateException(String.format("Couldn't find JIRA project properties (%d) at \"%s\"", resultProjects.size(), url)); - String queryIssueStatus = + String queryIssueStatuses = "for " + "$d in //tr " + "where " + @@ -87,9 +87,9 @@ "{ data(fn:substring-after(fn:substring-after($d/child::td[2]/child::a[1]/@href, 'status'), '=')) }|" +// TODO should grab the next number after "status" "{ data(fn:normalize-space(fn:string-join($d/child::td[3]/text(), ''))) }" + "</dummy>"; - List resultIssueStatus = WebCrawlingUtils.runXQuery(dom, queryIssueStatus); + List resultIssueStatuses = WebCrawlingUtils.runXQuery(dom, queryIssueStatuses); - String queryIssuePriority = + String queryIssuePriorities = "for " + "$d in //tr " + "where " + @@ -101,9 +101,9 @@ "{ data(fn:substring(fn:substring-after(fn:substring-after($d/child::td[2]/child::a[1]/@href, 'priority'), '='), 1, 1)) }|" +// TODO not appropriate, because priority is hardwired to a single character "{ data(fn:normalize-space(fn:string-join($d/child::td[3]/text(), ''))) }" + "</dummy>"; - List resultIssuePriority = WebCrawlingUtils.runXQuery(dom, queryIssuePriority); + List resultIssuePriorities = WebCrawlingUtils.runXQuery(dom, queryIssuePriorities); - String queryIssueAssignee = + String queryIssueAssignees = "for " + "$d in //tr " + "where " + @@ -115,10 +115,10 @@ "{ data(fn:normalize-space($d/child::td[1]/child::a[1]/text())) }|" + "{ data(fn:normalize-space(fn:string-join($d/child::td[2]/text(), ''))) }" + "</dummy>"; - List resultIssueAssignee = WebCrawlingUtils.runXQuery(dom, queryIssueAssignee); + List resultIssueAssignees = WebCrawlingUtils.runXQuery(dom, queryIssueAssignees); // scrape - for(Iterator itProject = resultProject.iterator(); itProject.hasNext();) { + for(Iterator itProject = resultProjects.iterator(); itProject.hasNext();) { String valueProject = WebCrawlingUtils.eliminateEmptyValues(((NodeInfo)itProject.next()).getStringValue()); log.debug(String.format("Scraped project: \"%s\"", valueProject)); @@ -135,7 +135,7 @@ int reopenedIssues = 0; int resolvedIssues = 0; int closedIssues = 0; - for(Iterator itIssueStatus = resultIssueStatus.iterator(); itIssueStatus.hasNext();) { + for(Iterator itIssueStatus = resultIssueStatuses.iterator(); itIssueStatus.hasNext();) { String valueIssueStatus = ((NodeInfo)itIssueStatus.next()).getStringValue(); log.debug(String.format("Scraped issue status: \"%s\"", valueIssueStatus)); @@ -160,7 +160,7 @@ int minorOpenIssues = 0; int trivialOpenIssues = 0; int optionalOpenIssues = 0; - for(Iterator itIssuePriority = resultIssuePriority.iterator(); itIssuePriority.hasNext();) { + for(Iterator itIssuePriority = resultIssuePriorities.iterator(); itIssuePriority.hasNext();) { String valueIssuePriority = ((NodeInfo)itIssuePriority.next()).getStringValue(); log.debug(String.format("Scraped issue priority: \"%s\"", valueIssuePriority)); @@ -181,7 +181,7 @@ // scrape issue assignees Map<String, Integer> openIssuesPerAssigneeMap = new HashMap<String, Integer>(); - for(Iterator itIssueAssignee = resultIssueAssignee.iterator(); itIssueAssignee.hasNext();) { + for(Iterator itIssueAssignee = resultIssueAssignees.iterator(); itIssueAssignee.hasNext();) { String valueIssueAssignee = ((NodeInfo)itIssueAssignee.next()).getStringValue(); log.debug(String.format("Scraped issue assignee: \"%s\"", valueIssueAssignee)); Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java 2006-03-27 10:06:19 UTC (rev 3252) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java 2006-03-27 13:12:45 UTC (rev 3253) @@ -51,10 +51,10 @@ throw new IllegalStateException(String.format("Couldn't find 'Files' link for \"%s\"", url)); String filesPageUrl = UrlUtils.getBaseUrl(url) + aNode.getAttributes().getNamedItem("href").getNodeValue(); log.debug(String.format("Going to project file releases page at \"%s\"...", filesPageUrl)); - Document filesPageDom = WebCrawlingUtils.downloadHtmlDom(new URL(filesPageUrl)); + Document domFilesPage = WebCrawlingUtils.downloadHtmlDom(new URL(filesPageUrl)); // scrape "frelease" table if the project has releases - Node releasesTableNode = WebCrawlingUtils.findDomNodeByAttribute(filesPageDom.getElementsByTagName("table"), "id", "frelease"); + Node releasesTableNode = WebCrawlingUtils.findDomNodeByAttribute(domFilesPage.getElementsByTagName("table"), "id", "frelease"); if(releasesTableNode != null) { NodeList trNodes = releasesTableNode.getLastChild().getChildNodes(); for(int j = 0; j < trNodes.getLength(); j++) { |