Project

General

Profile

« Previous | Next » 

Revision 6814

remove flag for independent system metadata replication -- these entries are replicated along with the data/metadata objects or via hazelcast when the actual object is not on the server.

View differences:

ReplicationService.java
299 299
		String replicate = null;
300 300
		String server = null;
301 301
		String dataReplicate = null;
302
		String systemMetadataReplicate = null;
303 302
		String hub = null;
304 303
		Writer out = null;
305 304
		try {
......
318 317

  
319 318
				//Get data replication value
320 319
				dataReplicate = ((String[]) params.get("datareplicate"))[0];
321
				//Get system metadata replication value
322
				systemMetadataReplicate = ((String[]) params.get("systemmetadatareplicate"))[0];
320
				
323 321
				//Get hub value
324 322
				hub = ((String[]) params.get("hub"))[0];
325 323

  
326 324
				Calendar cal = Calendar.getInstance();
327 325
                cal.set(1980, 1, 1);
328 326
				String sql = "INSERT INTO xml_replication "
329
						+ "(server, last_checked, replicate, datareplicate, systemmetadatareplicate, hub) "
330
						+ "VALUES (?,?,?,?,?,?)";
327
						+ "(server, last_checked, replicate, datareplicate, hub) "
328
						+ "VALUES (?,?,?,?,?)";
331 329
				
332 330
				pstmt = dbConn.prepareStatement(sql);
333 331
						
......
335 333
				pstmt.setTimestamp(2, new Timestamp(cal.getTimeInMillis()));
336 334
				pstmt.setInt(3, Integer.parseInt(replicate));
337 335
				pstmt.setInt(4, Integer.parseInt(dataReplicate));
338
				pstmt.setInt(5, Integer.parseInt(systemMetadataReplicate));
339
				pstmt.setInt(6, Integer.parseInt(hub));
336
				pstmt.setInt(5, Integer.parseInt(hub));
340 337
				
341 338
				String sqlReport = "XMLAccessAccess.getXMLAccessForDoc - SQL: " + sql;
342 339
				sqlReport += " [" + server + "," + replicate + 
......
354 351
				out.write("<td><b>last_checked</b></td>");
355 352
				out.write("<td><b>replicate</b></td>");
356 353
				out.write("<td><b>datareplicate</b></td>");
357
				out.write("<td><b>systemmetadatareplicate</b></td>");
358 354
				out.write("<td><b>hub</b></td></tr>");
359
				pstmt = dbConn.prepareStatement("SELECT serverid, server, last_checked, replicate, datareplicate, systemmetadatareplicate, hub FROM xml_replication");
355
				pstmt = dbConn.prepareStatement("SELECT serverid, server, last_checked, replicate, datareplicate, hub FROM xml_replication");
360 356
				//increase dbconnection usage
361 357
				dbConn.increaseUsageCount(1);
362 358

  
......
368 364
					out.write(rs.getString(3) + "</td><td>");
369 365
					out.write(rs.getString(4) + "</td><td>");
370 366
					out.write(rs.getString(5) + "</td><td>");
371
					out.write(rs.getString(6) + "</td><td>");
372
					out.write(rs.getString(7) + "</td></tr>");
367
					out.write(rs.getString(6) + "</td></tr>");
373 368

  
374 369
					tablehasrows = rs.next();
375 370
				}
......
391 386
				out.write("<td><b>last_checked</b></td>");
392 387
				out.write("<td><b>replicate</b></td>");
393 388
				out.write("<td><b>datareplicate</b></td>");
394
				out.write("<td><b>systemmetadatareplicate</b></td>");
395 389
				out.write("<td><b>hub</b></td></tr>");
396 390

  
397
				pstmt = dbConn.prepareStatement("SELECT serverid, server, last_checked, replicate, datareplicate, systemmetadatareplicate, hub FROM xml_replication");
391
				pstmt = dbConn.prepareStatement("SELECT serverid, server, last_checked, replicate, datareplicate, hub FROM xml_replication");
398 392
				//increase dbconnection usage
399 393
				dbConn.increaseUsageCount(1);
400 394
				pstmt.execute();
......
405 399
					out.write(rs.getString(3) + "</td><td>");
406 400
					out.write(rs.getString(4) + "</td><td>");
407 401
					out.write(rs.getString(5) + "</td><td>");
408
					out.write(rs.getString(6) + "</td><td>");
409
					out.write(rs.getString(7) + "</td></tr>");
402
					out.write(rs.getString(6) + "</td></tr>");
410 403
					tablehasrows = rs.next();
411 404
				}
412 405
				out.write("</table></body></html>");
......
419 412
				out.write("<td><b>last_checked</b></td>");
420 413
				out.write("<td><b>replicate</b></td>");
421 414
				out.write("<td><b>datareplicate</b></td>");
422
				out.write("<td><b>systemmetadatareplicate</b></td>");
423 415
				out.write("<td><b>hub</b></td></tr>");
424
				pstmt = dbConn.prepareStatement("SELECT serverid, server, last_checked, replicate, datareplicate, systemmetadatareplicate, hub FROM xml_replication");
416
				pstmt = dbConn.prepareStatement("SELECT serverid, server, last_checked, replicate, datareplicate, hub FROM xml_replication");
425 417
				pstmt.execute();
426 418
				ResultSet rs = pstmt.getResultSet();
427 419
				boolean tablehasrows = rs.next();
......
430 422
					out.write(rs.getString(3) + "</td><td>");
431 423
					out.write(rs.getString(4) + "</td><td>");
432 424
					out.write(rs.getString(5) + "</td><td>");
433
					out.write(rs.getString(6) + "</td><td>");
434
					out.write(rs.getString(7) + "</td></tr>");
425
					out.write(rs.getString(6) + "</td></tr>");
435 426

  
436 427
					tablehasrows = rs.next();
437 428
				}
......
1509 1500
			// add revision doc list  
1510 1501
			doclist.append(prepareRevisionDoc(dbConn, revisionSql.toString(),
1511 1502
					replicateData));
1512
			
1513
			// add the system metadata entries if configured to replicate them
1514
			boolean replicateSystemMetadata = serverList.getSystemMetadataReplicationValue(server);
1515
			if (replicateSystemMetadata) {
1516
				Date since = new Date(System.currentTimeMillis());
1517
				since = serverList.getLastCheckedDate(server);
1518
				List<String> systemMetadataEntries = 
1519
					IdentifierManager.getInstance().getUpdatedSystemMetadataIds(since);
1520
				for (int i = 0; i < systemMetadataEntries.size(); i++) {
1521
					String guid = systemMetadataEntries.get(i);
1522
					doclist.append("<updatedSystemMetadata>");
1523
					doclist.append("<guid>");
1524
					doclist.append(guid);
1525
					doclist.append("</guid>");
1526
					doclist.append("</updatedSystemMetadata>");
1527
				}
1528
			}
1529 1503

  
1530 1504
			doclist.append("</updates></replication>");
1531 1505
			logReplication.info("ReplicationService.handleUpdateRequest - doclist: " + doclist.toString());

Also available in: Unified diff