Changeset 6698

Timestamp:

10/26/15 14:02:22 (9 years ago)

Author:

teckart@informatik.uni-leipzig.de

Message:

Added new helper methods and more consistent handling of normalized vertex IDs

File:

• vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/ResourceStructureGraph.java (modified) (7 diffs)

vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/ResourceStructureGraph.java

@@ -53 +53 @@
      */
     public static void addResource(String mdSelfLink) {
-        if (!vertexIdMap.containsKey(mdSelfLink)) {
-            CmdiVertex newVertex = new CmdiVertex(StringUtils.normalizeIdString(mdSelfLink));
-            vertexIdMap.put(mdSelfLink, newVertex);
-        }
-
-        if (!foundVerticesSet.contains(vertexIdMap.get(mdSelfLink))) {
-            graph.addVertex(vertexIdMap.get(mdSelfLink));
-            foundVerticesSet.add(vertexIdMap.get(mdSelfLink));
+        String normalizedMdSelfLink = StringUtils.normalizeIdString(mdSelfLink);
+        if (!vertexIdMap.containsKey(normalizedMdSelfLink)) {
+            CmdiVertex newVertex = new CmdiVertex(normalizedMdSelfLink);
+            vertexIdMap.put(normalizedMdSelfLink, newVertex);
+        }
+
+        if (!foundVerticesSet.contains(vertexIdMap.get(normalizedMdSelfLink))) {
+            graph.addVertex(vertexIdMap.get(normalizedMdSelfLink));
+            foundVerticesSet.add(vertexIdMap.get(normalizedMdSelfLink));
         } else {
             LOG.debug("Duplicate resource vertex mdSelfLink: " + mdSelfLink);
@@ -73 +74 @@
      */
     public static void addEdge(String sourceVertexId, String targetVertexId) {
+        String normalizedSourceVertexId = StringUtils.normalizeIdString(sourceVertexId);
+        String normalizedTargetVertexId = StringUtils.normalizeIdString(targetVertexId);
+        
         // add vertices
-        if (!vertexIdMap.containsKey(sourceVertexId)) {
-            CmdiVertex sourceVertex = new CmdiVertex(StringUtils.normalizeIdString(sourceVertexId));
-            vertexIdMap.put(sourceVertexId, sourceVertex);
+        if (!vertexIdMap.containsKey(normalizedSourceVertexId)) {
+            CmdiVertex sourceVertex = new CmdiVertex(normalizedSourceVertexId);
+            vertexIdMap.put(normalizedSourceVertexId, sourceVertex);
             graph.addVertex(sourceVertex);
         }
 
-        if (!vertexIdMap.containsKey(targetVertexId)) {
-            CmdiVertex targetVertex = new CmdiVertex(StringUtils.normalizeIdString(targetVertexId));
-            vertexIdMap.put(targetVertexId, targetVertex);
+        if (!vertexIdMap.containsKey(normalizedTargetVertexId)) {
+            CmdiVertex targetVertex = new CmdiVertex(normalizedTargetVertexId);
+            vertexIdMap.put(normalizedTargetVertexId, targetVertex);
             graph.addVertex(targetVertex);
         }
@@ -88 +92 @@
         // add edge
         try {
-            graph.addEdge(vertexIdMap.get(sourceVertexId), vertexIdMap.get(targetVertexId));
-            updateDepthValues(vertexIdMap.get(sourceVertexId), new HashSet<CmdiVertex>());
+            graph.addEdge(vertexIdMap.get(normalizedSourceVertexId), vertexIdMap.get(normalizedTargetVertexId));
+            updateDepthValues(vertexIdMap.get(normalizedSourceVertexId), new HashSet<CmdiVertex>());
         } catch (IllegalArgumentException cfe) {
             // was a cycle -> ignore
@@ -162 +166 @@
         return foundVerticesSet;
     }
+    
+    public static CmdiVertex getVertex(String vertexId) {
+        return vertexIdMap.get(vertexId);        
+    }
+    
+    public static Map<String, CmdiVertex> getVertexIdMap() {
+        return vertexIdMap;
+    }
 
     /**
      * Get all vertices that are source of an edge where targetVertex is target.
-     * In other words get all vertices that are part of targetVertex.
+     * In other words get all resource vertices that are part of resource targetVertex.
      *
      * @param targetVertex
@@ -187 +199 @@
     /**
      * Get all vertices that are target of an edge where sourceVertex is source.
-     * In other words get all vertices of which sourceVertex is part of.
+     * In other words get all resource vertices of which resource sourceVertex is part of.
      *
      * @param sourceVertex
@@ -273 +285 @@
     private final String id;
     private int hierarchyWeight = 0;
+    private boolean wasImported = false;
 
     public CmdiVertex(String id) {
@@ -288 +301 @@
     public int getHierarchyWeight() {
         return hierarchyWeight;
+    }
+    
+    public void setWasImported(boolean wasImported) {
+        this.wasImported = wasImported;
+    }
+    
+    public boolean getWasImported() {
+        return wasImported;
     }