Changeset 6699

Timestamp:

10/26/15 14:07:23 (9 years ago)

Author:

teckart@informatik.uni-leipzig.de

Message:

Added new hierarchy graph check that removes edges between vertices that were not imported because of missing (or wrong) ResourceProxys? (fixes #790)

File:

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

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

@@ -48 +48 @@
  * and so on.
  */
-@SuppressWarnings({"serial"})
 public class MetadataImporter {
 
@@ -229 +228 @@
      * list of existing data roots will be filtered with the list from user
      * 
-     * @return
+     * @param dataRoots complete list of DataRoots
+     * @return list of DataRoots without DataRoots excluded by the user
      */
     protected List<DataRoot> filterDataRootsWithCLArgs(List<DataRoot> dataRoots){
@@ -366 +366 @@
                         // are usually not very interesting (think imdi corpus files) and will not be included.
                         updateDocument(solrDocument, cmdiData, file, dataOrigin);
+                        if(ResourceStructureGraph.getVertex(cmdiData.getId()) != null)
+                            ResourceStructureGraph.getVertex(cmdiData.getId()).setWasImported(true);
                     } else {
                         nrOfIgnoredFiles++;
@@ -549 +551 @@
                 }
                 
+                // remove vertices that were not imported
+                Iterator<String> incomingVertexIter = incomingVertexNames.iterator();
+                while(incomingVertexIter.hasNext()) {
+                    String vertexId = incomingVertexIter.next();
+                    if(ResourceStructureGraph.getVertex(vertexId) == null || !ResourceStructureGraph.getVertex(vertexId).getWasImported())
+                        incomingVertexIter.remove();
+                }
+                Iterator<String> outgoingVertexIter = outgoingVertexNames.iterator();
+                while(outgoingVertexIter.hasNext()) {
+                    String vertexId = outgoingVertexIter.next();
+                    if(ResourceStructureGraph.getVertex(vertexId) == null || !ResourceStructureGraph.getVertex(vertexId).getWasImported())
+                        outgoingVertexIter.remove();
+                }
+                
                 if(!incomingVertexNames.isEmpty()) {
                     doc.setField(FacetConstants.FIELD_HAS_PART, incomingVertexNames);