diff src/main/java/de/mpiwg/gazetteer/utils/FileManager.java @ 49:7c2e1b14b77d

new: load existing full text searching result into searching table
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 26 Jan 2016 11:46:10 +0100
parents 35ed4e650a53
children cf747a960516
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/gazetteer/utils/FileManager.java	Thu Jan 21 11:56:30 2016 +0100
+++ b/src/main/java/de/mpiwg/gazetteer/utils/FileManager.java	Tue Jan 26 11:46:10 2016 +0100
@@ -59,12 +59,12 @@
 		PrintWriter out = new PrintWriter(absolutePath + fileName);
 		
 		String text = new String();	// make it from list
-		text += "Address,LEVEL1,LEVEL2,Name,PERIOD,TimeSpan:begin,TimeSpan:end,Longitude,Latitude,PAGE,SECTION,CONTENT,BOOK_ID,Description\n";
+		text += "Address,LEVEL1,LEVEL2,Name,DYNASTY,PERIOD,ADMIN_TYPE,TimeSpan:begin,TimeSpan:end,Longitude,Latitude,PAGE,SECTION,CONTENT,BOOK_ID,Description\n";
 	
 		for (DBContents c : list) {
 			
-			if (c.getSection() != null && !c.isRemoved()){
-				
+			if (c.getSection() != null && !c.isRemoved()){	// only those are not removed to csv which means to LGMap
+	
 				DBBook book = c.getSection().getBook();
 				
 				String description = book.getVolume() + "/" + book.getAuthor() + "/" + book.getEdition();
@@ -73,7 +73,9 @@
 						book.getLevel1() + "," +
 						book.getLevel2() + "," +
 						book.getName() + "," +
+						book.getDynasty() + "," +
 						book.getPeriod() + "," +
+						book.getAdmin_type() + "," +
 						book.getStart_year() + "," +
 						book.getEnd_year() + "," +
 						c.getCoordinatesBook().getX() + "," +
@@ -134,7 +136,7 @@
 		text += "<body>"
 				+ "<div class='subTitel'>Table name: " + file.getFileName() + "<div>"
 				+ "<div class='label'>" + list.size() + " result(s) in the table.</dvi>"
-				+ "<div class='label'>searching by keywords (possibly with filters): " + '"' + "<span id='searchTerm'>" + file.getSearchTerms() + "</span>" + '"' + "</div>"
+				+ "<div class='label'>searching by keywords: " + '"' + "<span id='searchTerm'>" + file.getSearchTerms() + "</span>" + '"' + "</div>"
 				+ "<div class='label'><a href='" + getLGMapUrl(file) + "' target='_blank'>view on LGMap</a><div>"
 				+ "<br>"
 				+ "<table class='pageTable'>"
@@ -144,15 +146,21 @@
 						+ "<td class='tableTitle'>book name</td>"
 						+ "<td class='tableTitle'>level1</td>"
 						+ "<td class='tableTitle'>level2</td>"
+						+ "<td class='tableTitle'>dynasty</td>"
 						+ "<td class='tableTitle'>period</td>"
+						+ "<td class='tableTitle'>admin type</td>"
 						+ "<td class='tableTitle'>section name</td>"
 						+ "<td class='tableTitle'>page</td>"
 						+ "<td class='tableTitle'>content</td>"
+						+ "<td class='tableTitle'>content id</td>"
+						+ "<td class='tableTitle'>isRemoved</td>"
+						
 		 			+ "<tr>";
 		for (DBContents c : list) {			
 		
-			if ( c.getSection() != null && !c.isRemoved()){
-				
+			//if ( c.getSection() != null && !c.isRemoved()){
+			if ( c.getSection() != null){
+						
 				DBBook book = c.getSection().getBook();
 	
 				text += "<tr>" +
@@ -161,11 +169,15 @@
 							"<td>" + book.getName() + "</td>" +
 							"<td>" + book.getLevel1() + "</td>" +
 							"<td>" + book.getLevel2() + "</td>" +
+							"<td>" + book.getDynasty() + "</td>" +
 							"<td>" + book.getPeriod() + "</td>" +
+							"<td>" + book.getAdmin_type() + "</td>" +
 							"<td>" + c.getSection().getName() + "</td>" +
 							"<td>" + c.getPage() + "</td>" +
 							"<td class='content'>" + c.getContent() + "</td>" +
-							"</tr>";
+							"<td>" + c.getId() + "</td>" +
+							"<td>" + c.isRemoved() + "</td>" +
+						"</tr>";
 			}
 		}