Add crawlerTask functions

EOS.sql

@@ -11,7 +11,7 @@ CREATE TABLE `project` (
   `hostUrl` varchar(100) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uuid` (`uuid`)
-) ENGINE=MyISAM AUTO_INCREMENT=19142 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for `resourceMetaData`
@@ -24,7 +24,7 @@ CREATE TABLE `resourceMetaData` (
   `crawler` varchar(20) DEFAULT NULL,
   `id` int(50) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=38861 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for `crawlerTask`
@@ -40,7 +40,7 @@ CREATE TABLE `crawlerTask` (
   `finishTime` datetime DEFAULT NULL,
   `status` int(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=138 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for `mail`
@@ -59,7 +59,7 @@ CREATE TABLE `mail` (
   `toName` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `projectID` (`projectID`)
-) ENGINE=MyISAM AUTO_INCREMENT=204695 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for `Documentation`
@@ -76,7 +76,7 @@ CREATE TABLE `Documentation` (
   `Updatetime` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `uuid` (`Uuid`) USING BTREE
-) ENGINE=MyISAM AUTO_INCREMENT=1103 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Table structure for `issueTracker`
@@ -111,4 +111,4 @@ CREATE TABLE `RelativeWeb` (
   `filepath` varchar(200) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uuid_UNIQUE` (`uuid`)
-) ENGINE=MyISAM AUTO_INCREMENT=1940 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

WebContent/WEB-INF/web.xml

@@ -22,13 +22,13 @@
   </servlet-mapping>
   <servlet>
     <description></description>
-    <display-name>Test</display-name>
-    <servlet-name>Test</servlet-name>
-    <servlet-class>cn.edu.pku.EOS.servlet.Test</servlet-class>
+    <display-name>DetectProjectInfo</display-name>
+    <servlet-name>DetectProjectInfo</servlet-name>
+    <servlet-class>cn.edu.pku.EOS.servlet.DetectProjectInfo</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>Test</servlet-name>
-    <url-pattern>/Test</url-pattern>
+    <servlet-name>DetectProjectInfo</servlet-name>
+    <url-pattern>/DetectProjectInfo</url-pattern>
   </servlet-mapping>
   <servlet>
     <description></description>

src/cn/edu/pku/EOS/DAO/CrawlerTaskDao.java

@@ -62,4 +62,10 @@ public class CrawlerTaskDao {
 		}
 	}
 
+	public static CrawlerTask getTask(CrawlerTask crawlerTask) throws SQLException {
+		List<CrawlerTask> crawlerTasks = DAOUtils.getResult(CrawlerTask.class, "select * from crawlerTask where projectUuid = ? AND resourceType = ? AND startTime = ?",
+				crawlerTask.getProjectUuid(), crawlerTask.getResourceType(), crawlerTask.getStartTime());
+		return crawlerTasks.get(0);
+	}
+
 }

src/cn/edu/pku/EOS/business/ProjectBusiness.java

@@ -102,6 +102,7 @@ public class ProjectBusiness {
 		if (result.equals(MessageSender.REMOTE_SUCCESS_RESPONCE)) {
 			try {
 				CrawlerTaskDao.insertCrawlerTask(crawlerTask);
+				crawlerTask = CrawlerTaskDao.getTask(crawlerTask);
 			} catch (SQLException e) {
 				logger.info(e.getMessage());
 				e.printStackTrace();
@@ -120,7 +121,7 @@ public class ProjectBusiness {
 //			return;
 //		} 
 //		CrawlerPool.startCrawlerThread(crawler);
-		return result;
+		return crawlerTask.getUuid();
 	}
 	
 	/**

src/cn/edu/pku/EOS/servlet/DetectProjectInfo.java

@@ -16,13 +16,13 @@ import cn.edu.pku.EOS.entity.Project;
  * 用于测试的servlet
  * @author 张灵箫
  */
-public class Test extends HttpServlet {
+public class DetectProjectInfo extends HttpServlet {
 	private static final long serialVersionUID = 1L;
        
     /**
      * @see HttpServlet#HttpServlet()
      */
-    public Test() {
+    public DetectProjectInfo() {
         super();
         // TODO Auto-generated constructor stub
     }
@@ -45,12 +45,16 @@ public class Test extends HttpServlet {
 		if (project2 != null) {
 			pb.updateProjectInfo(project, project2.getUuid());
 			TestUtil.printProjectInfo(project);
-			System.out.println("Test Success!");
+			//System.out.println("Test Success!");
+			response.setContentType("text/plain");  
+		    response.getWriter().print(project2.getUuid());
 			return;
 		}
 		TestUtil.printProjectInfo(project);
 		pb.createNewProject(project);
-		System.out.println("Test Success!");
+		project = pb.getProjectByName(project.getName());
+		response.setContentType("text/plain");  
+	    response.getWriter().print(project.getUuid());
 	}
 
 }