Mercurial > hg > LGServices

changeset 20:996f8f1b69db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
little modification on books page
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Fri, 19 Jun 2015 16:23:16 +0200
parents 9c4937b290c6
children 5b1856cd6b4f
files src/main/java/de/mpiwg/web/jsp/BooksPage.java src/main/java/de/mpiwg/web/jsp/BranchPage.java src/main/java/de/mpiwg/web/jsp/HomePage.java src/main/java/de/mpiwg/web/jsp/JSPProxy.java src/main/resources/config.properties src/main/webapp/pages/books.jsp src/main/webapp/pages/branchPage.jsp
diffstat 7 files changed, 49 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/web/jsp/BooksPage.java	Tue Jun 02 16:44:02 2015 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/BooksPage.java	Fri Jun 19 16:23:16 2015 +0200
@@ -57,6 +57,10 @@
 	private String editionFilter = new String();
 	
 
+	private String filteringMessage;
+	
+	
+
 	public void loadParameters(HttpServletRequest request, HttpServletResponse response){
 		this.request = request;
 		this.response = response;
@@ -96,7 +100,7 @@
 		}
 		
 		if(completeBookList.size() > 0){
-			//this.filteringMessage = this.filteredSectionList.size() + " section(s) listed after the filtering";
+			this.filteringMessage = this.filteredBookList.size() + " book(s) listed after filtering";
 			this.paginator.setCurrentPage(0);
 			this.paginator.resetNumberOfPages(filteredBookList.size());
 			this.updateCurrentBooks();
@@ -198,7 +202,9 @@
 	public void loadBooks(){
 		if(this.completeBookList == null){
 			this.forceLoadBooks();
-			filter();
+			sortByBookIdUp();//bookId ascend as default sorting
+			this.filteringMessage = null;
+			
 		} 
 		
 	}
@@ -486,4 +492,18 @@
 	public void setPaginator(DataPaginator paginator) {
 		this.paginator = paginator;
 	}
+	
+
+
+	public String getFilteringMessage() {
+		return filteringMessage;
+	}
+
+
+
+	public void setFilteringMessage(String filteringMessage) {
+		this.filteringMessage = filteringMessage;
+	}
+
+
 }
--- a/src/main/java/de/mpiwg/web/jsp/BranchPage.java	Tue Jun 02 16:44:02 2015 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/BranchPage.java	Fri Jun 19 16:23:16 2015 +0200
@@ -58,6 +58,9 @@
 					Long dvId = resp.getJSONObject("fileMetadata").getLong("id");
 					String fileNameInDv = resp.getJSONObject("fileMetadata").getString("label");
 					
+					// TODO: bug? fileNameInDv will be duplicated and cannot be distinguished since the names of file from a branch with different versions will be the same
+					
+					
 					LGFile  file = DataProvider.getInstance().getFile(getFileId());
 					//LGBranch branch = DataProvider.getInstance().getBranch(file.getBranchId());
 					file.setDvId(dvId);
--- a/src/main/java/de/mpiwg/web/jsp/HomePage.java	Tue Jun 02 16:44:02 2015 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/HomePage.java	Fri Jun 19 16:23:16 2015 +0200
@@ -40,9 +40,8 @@
 		this.branches = new ArrayList<LGBranch>();
 		if(getSessionBean().getUser() != null){
 			for(LGBranch branch : DataProvider.getInstance().getBranches(getSessionBean().getUser().getId())){
-				if(!branch.isTransientDataLoaded()){
-					branch.loadTransientData();
-				}	
+	
+				branch.loadTransientData();
 				this.branches.add(branch);
 			}	
 		}
--- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Tue Jun 02 16:44:02 2015 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Fri Jun 19 16:23:16 2015 +0200
@@ -81,7 +81,8 @@
 					getSessionBean().logout();
 				}
 				
-				return "pages/home.jsp";
+				return BooksPage.page;	// TMP: make the default page after login to be "Books" page for TOC editing task
+				//return "pages/home.jsp";
 				
 			}else if(StringUtils.equals(bean, SearchPage.bean)){
 				getSessionBean().getSearchPage().loadParameters(request, response);
--- a/src/main/resources/config.properties	Tue Jun 02 16:44:02 2015 +0200
+++ b/src/main/resources/config.properties	Fri Jun 19 16:23:16 2015 +0200
@@ -5,21 +5,22 @@
 
 #Local
 #dvn_server=http://localhost/dvn
+#dvn_server=http://localhost:8082		
 #root_server=http://localhost:8080/LGServices
 #toc_interface=http://localhost:1080/localgazetteers-dev/LGToc
 #extraction_interface=http://localhost:1080/localgazetteers-dev/extraction-interface
 
 
-# currently stable one
-#localgazetteers-dev 
-#dvn_server=http://localgazetteers-dev/dvn
-#root_server=http://localgazetteers-dev/LGServices
-#toc_interface=http://localgazetteers-dev/LGToc
-#extraction_interface=http://localgazetteers-dev/extraction-interface
+# Production one:
+#localgazetteers-dev -> localgazetteers
+dvn_server=http://localgazetteers.mpiwg-berlin.mpg.de/dvn
+root_server=http://localgazetteers.mpiwg-berlin.mpg.de/LGServices
+toc_interface=http://localgazetteers.mpiwg-berlin.mpg.de/LGToc
+extraction_interface=http://localgazetteers.mpiwg-berlin.mpg.de/extraction-interface
 
-
-#localgazetteers
-dvn_server=http://localgazetteers/dvn
-root_server=http://localgazetteers/LGServices
-toc_interface=http://localgazetteers/LGToc
-extraction_interface=http://localgazetteers/extraction-interface
\ No newline at end of file
+# Development one:
+#localgazetteers -> localgazetteers-test
+#dvn_server=http://localgazetteers-test.mpiwg-berlin.mpg.de/dvn
+#root_server=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGServices
+#toc_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGToc
+#extraction_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/extraction-interface
\ No newline at end of file
--- a/src/main/webapp/pages/books.jsp	Tue Jun 02 16:44:02 2015 +0200
+++ b/src/main/webapp/pages/books.jsp	Fri Jun 19 16:23:16 2015 +0200
@@ -36,7 +36,8 @@
 		%>
 		
 		<div class="subTitel">List of Books
-			<p class="label">Total <%= sessionBean.getBooksPage().getBookNumber() %> books</p>
+			<p class="label"><%= sessionBean.getBooksPage().getBookNumber() %> books in Chinese localgazetteers</p>
+			<p class="label"><%= (StringUtils.isNotEmpty(sessionBean.getBooksPage().getFilteringMessage())) ? sessionBean.getBooksPage().getFilteringMessage() : ""%></p>
 		</div>
 		<form name="booksForm"
 			action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp"
--- a/src/main/webapp/pages/branchPage.jsp	Tue Jun 02 16:44:02 2015 +0200
+++ b/src/main/webapp/pages/branchPage.jsp	Fri Jun 19 16:23:16 2015 +0200
@@ -299,7 +299,11 @@
 													<% if(file.getDvId() == null) {%>
 													<button type="button" class="get-studies" data-file-id="<%=file.getId()%>">load</button>
 													<% } else { %>
-													<label>Yes! Id in Dataverse: <%= file.getDvId() %></label>							
+													<label>Yes! Id in Dataverse: <%= file.getDvId() %></label>	
+												
+											 		<!-- TODO: replace "Id in Dataverse" as "file name in Dataverse" ? --
+												
+																			
 													<% } %>		
 												</td>												
 												<td>