tilman/mam-migration
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
gexce
2017-10-27 15:34:02 +02:00
parent 978cba8229
commit 4c9f8bf453
6 changed files with 23 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AH MAM Migration/src/com/bayer/edam/migration/Definitions.java
+2 -1
View File
@@ -28,6 +28,7 @@ public class Definitions {
classifications = new HashMap<String, WriteClassification>();
classifications.put("MediaAssistant-Migration", new WriteClassification("2bd24882-b7d8-4d30-8e6f-a7ef00eb33e7", 1));
classifications.put("Test-GEXCE", new WriteClassification("f1d058987a3043d5b021a819007ff3c0", 1));
classifications.put("Country.Global", new WriteClassification("dff7666b-326b-4e1c-912c-a7b4006c8500", 1)); // /Definitions/Animal Health/Country
classifications.put("Agencies.Bayer AH", new WriteClassification("8de5ef0e-3c6d-451c-b82b-a7b4006c954c", 1)); // /Definitions/Agencies/Bayer
@@ -89,7 +90,7 @@ public class Definitions {
classifications.put("MediaType.DirectMail", new WriteClassification("335b4227f05344e0aee2a73100a29d74", 1));
classifications.put("MediaType.Flyer", new WriteClassification("eb086cb861134039a8f4a73100a29aa2", 1));
classifications.put("MediaType.Folder", new WriteClassification("3a51645220dc4ba8b109a73100a29eeb", 1));
classifications.put("MediaType.Illustration", new WriteClassification("5222fed4a54f4098927da6dd00d0151f", 1));
classifications.put("MediaType.Illustration", new WriteClassification("7d1e20b9f244423b9214a7f400d3ae68", 1));
classifications.put("MediaType.TableGraphInfographic", new WriteClassification("bae7d168eb5341c09c15a73100a2ad46", 1));
classifications.put("MediaType.Logo", new WriteClassification("aef9f8deb91c4e169042a73100a2a859", 1));
classifications.put("MediaType.Newsletter", new WriteClassification("3322cf96cb4e408bb2dea73100a29df7", 1));
AH MAM Migration/src/com/bayer/edam/migration/MamMigrationSelective.java
+4 -9
View File
@@ -52,8 +52,7 @@ public class MamMigrationSelective implements CommandLineRunner {
static final String adamHost = "https://edam-q.bayer.com:2015";
static final String mamHost = "https://service.media-assistant.animalhealth.bayer.com";
private List<Integer> entrySelection = new ArrayList<Integer>(Arrays.asList( 28861, 28860, 71948, 71048, 70778, /*70746, 70142,*/ 70361/*, 63924, 71263, 63201, 56942, 57641, 70745, 70440, 70340,
70288, 71725*/));
private List<Integer> entrySelection = new ArrayList<Integer>(Arrays.asList( 72048, 60984 ));
static final String categoryJson = "resources/2017-10-19_categories.json";
static final String categoryMapping = "resources/Media_Assistant_Categories_131017_EDITED_without_archive.csv";
@@ -85,6 +84,7 @@ public class MamMigrationSelective implements CommandLineRunner {
@Override
public void run(String... strings) throws Exception {
// XXX
readEntryIDsFromFile();
log.info("Write log headers for " + entryLog.getAbsolutePath());
@@ -119,17 +119,12 @@ public class MamMigrationSelective implements CommandLineRunner {
HttpEntity<String> entity = new HttpEntity<String>("", mamHeaders);
for (int id : entrySelection) {
// XXX
// if (id > 80000 || id < 72009) //72048
// if needed start from a certain ID
// if (id > 60984 || id < 60984)
// continue;
log.info("GET entry " + id);
Entry entry = restTemplate.exchange(mamHost + "/rest/migration/entry/{id}", HttpMethod.GET, entity, Entry.class, id).getBody();
AH MAM Migration/src/com/bayer/edam/migration/adam/UploadRecord.java
+17 -2
View File
@@ -12,7 +12,7 @@ public class UploadRecord {
private static final Logger log = LoggerFactory.getLogger(UploadRecord.class);
public static class WriteClassification {
public static class WriteClassification implements Comparable<WriteClassification> {
public String id;
public Integer sortIndex;
@@ -20,10 +20,17 @@ public class UploadRecord {
this.id = id;
this.sortIndex = sortIndex;
}
@Override
public int compareTo(WriteClassification o) {
return o.id.compareTo(this.id);
}
}
public static class Classifications {
public List<WriteClassification> addOrUpdate = new ArrayList<WriteClassification>();
// public Set<WriteClassification> addOrUpdate = new HashSet<WriteClassification>();
}
public static class LocalizedValue {
@@ -62,11 +69,19 @@ public class UploadRecord {
public Classifications classifications = new Classifications();
public Fields fields = new Fields();
public void add(WriteClassification classification) {
public boolean add(WriteClassification classification) {
for (WriteClassification c : classifications.addOrUpdate) {
if (c.equals(classification))
return false;
}
classifications.addOrUpdate.add(classification);
return true;
}
public void add(Field field) {
log.debug("Adding field " + field.id);
fields.addOrUpdate.add(field);
}