fix: [AOU-1995] fix problem with pages when exporting in TSV format and added...

fix: [AOU-1995] fix problem with pages when exporting in TSV format and added pid of the archive at first column

https://issues.unige.ch/browse/AOU-1995

AoU-ResourceServerCommon/src/main/java/ch/unige/aou/service/metadata/Xml2TsvConvertor.java

@@ -79,7 +79,7 @@ public class Xml2TsvConvertor {
   private static StringBuilder generateCommonHeaders() {
     StringBuilder strBuilder = new StringBuilder();
     // Write Header
-    strBuilder.append("Type").append(CELL_DELIMITER).append("Subtype").append(CELL_DELIMITER).append("Subsubtype").append(CELL_DELIMITER)
+    strBuilder.append("pid").append(CELL_DELIMITER).append("Type").append(CELL_DELIMITER).append("Subtype").append(CELL_DELIMITER).append("Subsubtype").append(CELL_DELIMITER)
             .append("Title").append(CELL_DELIMITER).append("Languages").append(CELL_DELIMITER).append("OriginalTitle").append(CELL_DELIMITER)
             .append("Language").append(CELL_DELIMITER).append("Publication date").append(CELL_DELIMITER).append("First online date").append(CELL_DELIMITER)
             .append("Imprimatur date").append(CELL_DELIMITER).append("Defense date").append(CELL_DELIMITER)
@@ -104,7 +104,8 @@ public class Xml2TsvConvertor {
   private static void fillDataForCommonHeaders(Publications publications, StringBuilder strBuilder,
           Map<String, Map<String, Object>> additionalInfoPublications) {
     for (Publication publication : publications.getPublication()) {
-      Xml2TsvConvertor.appendValue(strBuilder, publication.getDepositDoc().getType());
+      Xml2TsvConvertor.appendValue(strBuilder, publication.getArchiveId());
+      appendValue(strBuilder, publication.getDepositDoc().getType());
       appendValue(strBuilder, publication.getDepositDoc().getSubtype());
       appendValue(strBuilder, publication.getDepositDoc().getSubsubtype());
       appendValue(strBuilder, publication.getDepositDoc().getTitle().getContent());
@@ -249,10 +250,8 @@ public class Xml2TsvConvertor {
 
   private static String convertPages(Pages pages) {
     StringBuilder sb = new StringBuilder();
-    for (Object page : pages.getPagingOrOther()) {
-      if (page instanceof String) {
-        sb.append(page).append(";");
-      }
+    for (int i=0; i< pages.getPagingOrOther().size(); i++) {
+      sb.append(pages.getPagingOrOther().get(i).getValue()).append(";");
     }
     return sb.toString();
   }