Merge pull request #20 from hbz/dipsStruct

added item logic to root element in structure.xml

Author: aquast

src/main/java/de/nrw/hbz/genericSipLoader/dips/impl/DipsIEStructureProvider.java

@@ -18,13 +18,10 @@
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.DatabindException;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
 import de.nrw.hbz.genericSipLoader.dips.model.IEStructure;
 import de.nrw.hbz.genericSipLoader.dips.model.deserialize.DeserializeIEStructure;
 import de.nrw.hbz.genericSipLoader.dips.model.serialize.SerializeIEStructure;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeRdf;
 
 
 /**
@@ -74,7 +71,7 @@ private static InputStream loadXmlString(String ieString) {
   /**
    * method takes serialized DiPS IE-Structure as InputStream 
    * @param is InputStream to be used
-   * @return EDM as Pojos according to jackson-Framework
+   * @return EDM as Pojos according to the jackson-Framework
    */
   public static IEStructure deserialize(InputStream is) {
     DeserializeIEStructure ieStruct = null;
@@ -98,7 +95,7 @@ public static IEStructure deserialize(InputStream is) {
   /**
    * method takes serialized DiPS IE Structure as File object 
    * @param file File to be used
-   * @return EDM as Pojos according to jackson-Framework
+   * @return EDM as Pojos according to the jackson-Framework
    */
   public static IEStructure deserialize(File file) {
     DeserializeIEStructure ieStruct = null;
@@ -140,6 +137,10 @@ public static IEStructure deserialize(String ieStructString) {
     return ieStruct;
     }
 
+  /**
+   * @param ieStruct
+   * @return xml the IEStructure as serialized xml String
+   */
   public static String serialize(IEStructure ieStruct) {
     XmlMapper xmlMapper = new XmlMapper();
     String xml = null;

src/main/java/de/nrw/hbz/genericSipLoader/dips/model/IEStructure.java

@@ -41,5 +41,14 @@ public interface IEStructure {
   public ArrayList<ChildStructure> getChildStructure();
 
 
+  /**
+   * @param childStructure
+   */
   public void setChildStructure(ArrayList<ChildStructure> childStructure);
+
+  
+  /**
+   * @return item ArrayList of item Element
+   */
+  public ArrayList<Item> getItem();
 }

src/main/java/de/nrw/hbz/genericSipLoader/dips/model/deserialize/DeserializeIEStructure.java

@@ -12,6 +12,7 @@
 
 import de.nrw.hbz.genericSipLoader.dips.model.ChildStructure;
 import de.nrw.hbz.genericSipLoader.dips.model.IEStructure;
+import de.nrw.hbz.genericSipLoader.dips.model.Item;
 
 /**
  * 
@@ -24,12 +25,14 @@ public class DeserializeIEStructure implements IEStructure {
   private String title = new String();
   private String structureIdentifier =  new String();
   private ArrayList<ChildStructure> childStructure = new ArrayList<>();
+  private ArrayList<Item> item = new ArrayList<>();
 
 
 
   /**
+   * Replace childStructure Element at respective position
    * @param cStruct
-   * @param i
+   * @param i position at which childStructrue Element will be replaced
    */
   public void replaceChildStructure(ChildStructure cStruct , int i) {
     this.childStructure.remove(i);
@@ -48,18 +51,30 @@ public String getDipsXmlns() {
   public String getTitle() {
     return title;
   }
+  
   @Override
   @JacksonXmlProperty(localName="structureIdentifier")
   public String getStructureIdentifier() {
     return structureIdentifier;
   }
+  
+  /**
+   * @return ArrayList of childStructure Elements
+   */
   @Override
   @JacksonXmlProperty(localName="childStructure")
   public ArrayList<ChildStructure> getChildStructure() {
     return childStructure;
   }
 
+  @Override
+  @JacksonXmlProperty(localName="item")
+  public ArrayList<Item> getItem() {
+    return item;
+  }
+
   /**
+   * Add title literal to deserialized Element
    * @param title the title to set
    */
   @JacksonXmlElementWrapper(useWrapping = false)
@@ -86,6 +101,18 @@ public void setChildStructure(ArrayList<ChildStructure> childStructure) {
     this.childStructure = childStructure;
   }
 
+  /**
+   * Because Stadt Köln has introduced item Elements within ieStructureRoot
+   * we have to implement item methods too
+   * @param Item ArrayList of item Element
+   */
+  @JacksonXmlElementWrapper(useWrapping = false)
+  @JacksonXmlProperty(localName="item")
+  public void setItem(ArrayList<Item> Item) {
+    this.item = Item;
+  }
+  
+  
 
 
 }

src/main/java/de/nrw/hbz/genericSipLoader/dips/model/serialize/SerializeIEStructure.java

@@ -9,6 +9,7 @@
 
 import de.nrw.hbz.genericSipLoader.dips.model.ChildStructure;
 import de.nrw.hbz.genericSipLoader.dips.model.IEStructure;
+import de.nrw.hbz.genericSipLoader.dips.model.Item;
 
 /**
  * 
@@ -60,4 +61,10 @@ public void setChildStructure(ArrayList<ChildStructure> childStructure) {
 
   }
 
+  @Override
+  public ArrayList<Item> getItem() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
 }

src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/HtmlProvider.java

@@ -19,6 +19,7 @@
 
 import de.nrw.hbz.genericSipLoader.dips.model.ChildStructure;
 import de.nrw.hbz.genericSipLoader.dips.model.IEStructure;
+import de.nrw.hbz.genericSipLoader.dips.model.Item;
 import de.nrw.hbz.genericSipLoader.edm.model.Aggregation;
 import de.nrw.hbz.genericSipLoader.edm.model.Rdf;
 import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeAggregation;
@@ -187,7 +188,20 @@ private void appendStructureMD() {
       appendChildStructureMD(ieStruct.getChildStructure().get(i));
 
     }
+    
+    if( ieStruct.getItem() != null) {
+      appendRootItemMD(ieStruct.getItem());
+    }
+  }
+
+  private void appendRootItemMD(ArrayList<Item> item) {
 
+    for (int i = 0; i < ieStruct.getItem().size(); i++) {
+
+    htmlText.append("<li><a href=\"" + item.get(i).getItemID() + "\">"
+        + item.get(i).getItemTitle() + "</a></li>\n");
+    }
+    
   }
 
   private void appendChildStructureMD(ChildStructure cStruct) {

src/main/java/de/nrw/hbz/genericSipLoader/impl/DipsLoaderImpl.java

@@ -309,6 +309,18 @@ private String refactorEdm(Hashtable<String,String> replacements, String edmFile
   private String refactorIEStructure(Hashtable<String,String> replacements, String dIEFileName) {
     logger.debug(dIEFileName);
     IEStructure ieStruct = DipsIEStructureProvider.deserialize(new File(dIEFileName));
+    
+    for(int i=0; i < ieStruct.getItem().size(); i++) {
+      String itemID = ieStruct.getItem().get(i).getItemID();
+
+      logger.info("Found itemID: " + itemID);
+      if(replacements.containsKey(itemID)){
+        ieStruct.getItem().get(i).setItemID(replacements.get(itemID));
+        logger.info("Found replacement: " + replacements.get(itemID));
+      }
+
+    }
+
     for(int i=0; i < ieStruct.getChildStructure().size(); i++) {
       // ChildStructure cStruct = ieStruct.getChildStructure().get(i);
       ieStruct.setChildStructure(refactorChildStructure(replacements, ieStruct.getChildStructure()));