Resolves #33.

JULIELab · Jan 23, 2023 · 508f4a4 · 508f4a4
1 parent 7ada311
commit 508f4a4
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 5 deletions.
diff --git a/julielab-neo4j-plugins-concepts-representation/pom.xml b/julielab-neo4j-plugins-concepts-representation/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.julielab</groupId>
 		<artifactId>julielab-neo4j-server-plugins</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>julielab-neo4j-plugins-concepts-representation</artifactId>

diff --git a/...resentation/src/main/java/de/julielab/neo4j/plugins/datarepresentation/ImportOptions.java b/...resentation/src/main/java/de/julielab/neo4j/plugins/datarepresentation/ImportOptions.java
@@ -35,6 +35,11 @@ public class ImportOptions {
 	 * will be changed.
 	 */
 	public boolean merge;
+	/**
+	 * Normally, the preferred name is only set once. In case of correction or necessary update, this option
+	 * allows to set the preferred name on already existing nodes. Only non-blank names are accepted.
+	 */
+	public boolean overridePreferredName;
 
 	public ImportOptions() {
 		doNotCreateHollowParents = false;

diff --git a/julielab-neo4j-plugins-concepts/pom.xml b/julielab-neo4j-plugins-concepts/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.julielab</groupId>
         <artifactId>julielab-neo4j-server-plugins</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>julielab-neo4j-plugins-concepts</artifactId>

diff --git a/...j-plugins-concepts/src/main/java/de/julielab/neo4j/plugins/concepts/ConceptInsertion.java b/...j-plugins-concepts/src/main/java/de/julielab/neo4j/plugins/concepts/ConceptInsertion.java
@@ -354,7 +354,10 @@ else if (concept == null)
             concept.setProperty(PROP_ORG_ID, coordinates.originalId);
             concept.setProperty(PROP_ORG_SRC, coordinates.originalSource);
         }
-        setNonNullNodeProperty(concept, PROP_PREF_NAME, jsonConcept.prefName);
+        if (!importOptions.overridePreferredName)
+            setNonNullNodeProperty(concept, PROP_PREF_NAME, jsonConcept.prefName);
+        else if (!jsonConcept.prefName.isBlank())
+            concept.setProperty(PROP_PREF_NAME, jsonConcept.prefName);
         mergeArrayProperty(concept, PROP_DESCRIPTIONS, () -> jsonConcept.descriptions.toArray(new String[0]));
         mergeArrayProperty(concept, PROP_WRITING_VARIANTS, () -> jsonConcept.writingVariants.toArray(new String[0]));
         mergeArrayProperty(concept, PROP_COPY_PROPERTIES, () -> jsonConcept.copyProperties.toArray(new String[0]));

diff --git a/...ab-neo4j-plugins-concepts/src/test/java/de/julielab/neo4j/plugins/ConceptManagerTest.java b/...ab-neo4j-plugins-concepts/src/test/java/de/julielab/neo4j/plugins/ConceptManagerTest.java
@@ -1957,4 +1957,28 @@ public void testGetAllFacetRoots() {
         }
     }
 
+    @Test
+    public void testOverridePreferredName() {
+        final ImportConcepts testConcepts = getTestConcepts(1);
+        final ConceptManager cm = new ConceptManager(graphDBMS, log);
+        cm.insertConcepts(testConcepts);
+
+        // Make sure a node exists with the default name now
+        try (Transaction tx = graphDb.beginTx()) {
+            final Node concept = tx.findNode(CONCEPT, PROP_ID, NodeIDPrefixConstants.TERM + 0);
+            assertEquals("prefname0", concept.getProperty(PROP_PREF_NAME));
+        }
+
+        // Now change the name, insert again and check that the name was actually changed
+        final ImportConcepts changedTestConcepts = getTestConcepts(1);
+        changedTestConcepts.setImportOptions(new ImportOptions());
+        changedTestConcepts.getImportOptions().overridePreferredName = true;
+        changedTestConcepts.getConceptsAsList().get(0).prefName = "changedName";
+        cm.insertConcepts(changedTestConcepts);
+        try (Transaction tx = graphDb.beginTx()) {
+            final Node concept = tx.findNode(CONCEPT, PROP_ID, NodeIDPrefixConstants.TERM + 0);
+            assertEquals("changedName", concept.getProperty(PROP_PREF_NAME));
+        }
+    }
+
 }
diff --git a/julielab-neo4j-plugins-utilities/pom.xml b/julielab-neo4j-plugins-utilities/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>de.julielab</groupId>
     <artifactId>julielab-neo4j-server-plugins</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>julielab-neo4j-plugins-utilities</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 		<version>2.5.0</version>
 	</parent>
 	<artifactId>julielab-neo4j-server-plugins</artifactId>
-	<version>3.2.0</version>
+	<version>3.2.1-SNAPSHOT</version>
 	<name>JULIE Lab Neo4j Server Plugins</name>
 	<build>
 		<pluginManagement>