diff src/main/webapp/methods/getDataverseForm.jsp @ 28:cbc2c83022c7 dev_dataverse4

new: add dataverse level when publish which means users can have/publish their own dataverses and datasets
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Wed, 09 Sep 2015 17:04:01 +0200
parents 3b3e2963c8f7
children 9dbbbfd474f4
line wrap: on
line diff
--- a/src/main/webapp/methods/getDataverseForm.jsp	Tue Sep 08 16:33:31 2015 +0200
+++ b/src/main/webapp/methods/getDataverseForm.jsp	Wed Sep 09 17:04:01 2015 +0200
@@ -6,7 +6,9 @@
 <%
 	
 	//List<Study> studies = DataverseUtils.getStudies(sessionBean.getUser().getUserName(), sessionBean.getUser().getPassword());
-	List<Datasets> studies = DataverseUtils.getDatasets(sessionBean.getUser().getUserName(), sessionBean.getUser().getPassword());
+	// List<Datasets> studies = DataverseUtils.getDatasets(sessionBean.getUser().getUserName(), sessionBean.getUser().getPassword());
+	List<Datasets> studies = DataverseUtils.getDatasetsInAllDataverse(sessionBean.getUser().getUserName(), sessionBean.getUser().getPassword());
+	
 	System.out.println("%%%%% Studies: " + studies.size());
 	
 	if(studies.isEmpty()){
@@ -28,20 +30,18 @@
 	<table class="pageTable">
 		<tbody>
 			<tr>
+				<th><label class="tableTitle">Dataverse</label></th>
+				<!-- 
 				<th><label class="tableTitle">Dataset ID</label></th>
-				<th><label class="tableTitle">Title</label></th>
+				-->
+				<th><label class="tableTitle">Dataset</label></th>
 				<th><label class="tableTitle">Created</label></th>
 				<th><label class="tableTitle">State</label></th>
-				<th><label class="tableTitle">Dataverse</label></th>
 				<th><label class="tableTitle">Version</label></th>
 				<th><label class="tableTitle">Publish</label></th>
 				<!-- 
 				<th><label class="tableTitle">Release Date</label></th>
-				
 				<th><label class="tableTitle">Last Updated</label></th>
-				 -->
-				
-				<!-- 
 				<th><label class="tableTitle">Number of Files </label></th>
 				 -->
 			</tr>
@@ -51,11 +51,15 @@
 		%>
 			
 			<tr>
-				<td><%= study.getId()%></td>
+				<!--  <td>Chinese Local Gazetteers </td> -->
+				<td><%= study.getDvIdInDataverse() %></td>
+				
+				<!-- <td><%= study.getId()%></td> 
+				-->
 				<td><%= study.getTitle() %></td>
 				<td><%= study.getCreateTime() %></td>
 				<td><%= study.getVersionState().toLowerCase() %></td>
-				<td>Chinese Local Gazetteers </td>
+				
 				<td><%= study.getVersion() %></td>
 				<td>
 					<input type="image"