Revert "Majority of the test cases pass; but query variations must be…

… applied conditionally" This reverts commit ada6e2e. Changes are moved to a separate branch: author-parsing
romanchyla · Jan 27, 2021 · 4f3c5f2 · 4f3c5f2
1 parent ada6e2e
commit 4f3c5f2
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 392 deletions.
diff --git a/...ache/lucene/queryparser/flexible/aqp/processors/AqpAdsabsExpandAuthorSearchProcessor.java b/...ache/lucene/queryparser/flexible/aqp/processors/AqpAdsabsExpandAuthorSearchProcessor.java
@@ -97,10 +97,6 @@ private QueryNode expandNodes(QueryNode node, NameInfo origNameInfo, int[] level
       List<QueryNode> children = node.getChildren();
       boolean changed = false;
       for (int i=0;i<children.size();i++) {
-
-        QueryNode n = children.get(i);
-        if (n.getTag(AqpAnalyzerQueryNodeProcessor.TYPE_ATTRIBUTE) == "AUTHOR_QUERY_VARIANT")
-          continue;
         doExpansion(origNameInfo, children.get(i), collector, level);
 
         // interlacing new values right behind the old values
@@ -179,8 +175,6 @@ private void doExpansion(NameInfo origNameInfo, QueryNode node, List<QueryNode>
           if (nameParts.length < origNameInfo.noOfParts ) return; // do nothing
 
           if (origNameInfo.containsOnlySurname) { // orig was lone surname
-            // do nothing if the input has been generated by variations
-            // do something if it was user input or synonym
             parentChildren.add(new PrefixWildcardQueryNode(fqn.getField(), v + "*", fqn.getBegin(), fqn.getEnd()));
           }
           else {

diff --git a/contrib/adsabs/src/java/org/apache/solr/analysis/author/AuthorQueryVariationsFilter.java b/contrib/adsabs/src/java/org/apache/solr/analysis/author/AuthorQueryVariationsFilter.java
@@ -61,7 +61,6 @@ public boolean incrementToken() throws IOException {
 
 	private boolean genVariations() {
 	    String authorName = termAtt.toString();
-
 	    //log.debug("generating variations for " + authorName);
 	    HashSet<String> variations = AuthorQueryVariations.getQueryVariationsInclRegex(authorName);
 	    if (variations.size() > 0) {

diff --git a/...ib/adsabs/src/java/org/apache/solr/analysis/author/AuthorRemoveDuplicatesTokenFilter.java b/...ib/adsabs/src/java/org/apache/solr/analysis/author/AuthorRemoveDuplicatesTokenFilter.java
diff --git a/...bs/src/java/org/apache/solr/analysis/author/AuthorRemoveDuplicatesTokenFilterFactory.java b/...bs/src/java/org/apache/solr/analysis/author/AuthorRemoveDuplicatesTokenFilterFactory.java
diff --git a/.../adsabs/src/java/org/apache/solr/analysis/author/AuthorShortNameUpgradeFilterFactory.java b/.../adsabs/src/java/org/apache/solr/analysis/author/AuthorShortNameUpgradeFilterFactory.java
@@ -7,7 +7,6 @@
 import java.io.Reader;
 import java.nio.charset.Charset;
 import java.text.ParseException;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -138,7 +137,7 @@ public void add(Reader in) throws IOException, ParseException {
                     if (seen.contains(shortForm)) continue;
                     seen.add(shortForm);
                     newBr.append(escape(shortForm) + "=>" +
-                        escape(sides[0]) + "," +
+                        sides[0] + "," +
                         buildLine(names));
                     newBr.append("\n");
                   }
@@ -483,8 +482,7 @@ public void add(Reader in) throws IOException, ParseException {
               String[] sides = line.split("=>");
               if (sides.length > 1) { // explicit mapping
                 String[] names = getNames(sides[1]);
-                Arrays.sort(names); // from shortest to longest
-                newBr.append(escape(sides[0]));
+                newBr.append(escape(names[0]));
                 newBr.append("=>");
                 boolean first = false;
                 for (String n: names) {
@@ -496,7 +494,6 @@ public void add(Reader in) throws IOException, ParseException {
               }
               else {
                 String[] names = getNames(sides[0]);
-                Arrays.sort(names); // from shortest to longest (important if we want to see synonyms before automatically generated query variants)
                 newBr.append(buildLine(names));
               }
               newBr.append("\n");

diff --git a/contrib/adsabs/src/test/monty/solr/util/MontySolrQueryTestCase.java b/contrib/adsabs/src/test/monty/solr/util/MontySolrQueryTestCase.java
@@ -136,10 +136,6 @@ public void setDebug(boolean v) {
 		tp.setDebug(v);
 	}
 
-	public boolean getDebug() {
-	  return tp.getDebug();
-	}
-
 	/*
 	 * This is only for printing/debugging, DO NOT use this for testing!!!
 	 *