Project

General

Profile

« Previous | Next » 

Revision 6941

Added by Chris Jones about 12 years ago

Update the D1Admin class to set the dataone.contactSubject property. I've added the property to the http request to be added to the JSP form, but for now am setting the property using the dataone.subject field value. Not sure if we want to expose the contact subject in the form yet or not.

View differences:

src/edu/ucsb/nceas/metacat/admin/D1Admin.java
109 109 
				String memberNodeId = PropertyService.getProperty("dataone.memberNodeId");
110 110 
				String nodeSynchronize = PropertyService.getProperty("dataone.nodeSynchronize");
111 111 
				String nodeReplicate = PropertyService.getProperty("dataone.nodeReplicate");
112 
				String subject = PropertyService.getProperty("dataone.subject");
112 
        String subject = PropertyService.getProperty("dataone.subject");
113 
				String contactSubject = PropertyService.getProperty("dataone.contactSubject");
113 114 
				String certpath = PropertyService.getProperty("D1Client.certificate.file");
114 115
115 116 
				//the synch schedule
......
145 146 
				request.setAttribute("dataone.memberNodeId", memberNodeId);
146 147 
				request.setAttribute("dataone.nodeSynchronize", Boolean.toString(synchronize));
147 148 
				request.setAttribute("dataone.nodeReplicate", Boolean.toString(replicate));
148 
				request.setAttribute("dataone.subject", subject);
149 
        request.setAttribute("dataone.subject", subject);
150 
				request.setAttribute("dataone.contactSubject", contactSubject);
149 151 
				request.setAttribute("D1Client.certificate.file", certpath);
150 152
151 153 
				// synch schedule
......
235 237 
				String memberNodeId = (String)request.getParameter("dataone.memberNodeId");
236 238 
				String nodeSynchronize = (String)request.getParameter("dataone.nodeSynchronize");
237 239 
				String nodeReplicate = (String)request.getParameter("dataone.nodeReplicate");
238 
				String subject = (String)request.getParameter("dataone.subject");
240 
        String subject = (String)request.getParameter("dataone.subject");
241 
				String contactSubject = (String)request.getParameter("dataone.contactSubject");
239 242 
				String certpath = (String)request.getParameter("D1Client.certificate.file");
240 243
241 244 
				// the synch schedule
......
275 278
276 279 
					PropertyService.setPropertyNoPersist("dataone.nodeSynchronize", Boolean.toString(synchronize));
277 280 
					PropertyService.setPropertyNoPersist("dataone.nodeReplicate", Boolean.toString(replicate));
278 
					PropertyService.setPropertyNoPersist("dataone.subject", subject);
281 
          PropertyService.setPropertyNoPersist("dataone.subject", subject);
282 
					PropertyService.setPropertyNoPersist("dataone.contactSubject", subject); // same as subject for now
279 283 
					PropertyService.setPropertyNoPersist("D1Client.certificate.file", certpath);
280 284
281 285 
					// the synch schedule

Also available in: Unified diff