Skip to content

Commit

Permalink
cleanup for tests and localhost development (#96)
Browse files Browse the repository at this point in the history 
* cleanup for tests and localhost development

* Fixed entdate range

* Added more scoring methods; book_author and editor; and constant() method

* #94 fix regex issue

remove use of predefined character classes that are not available in solr

* cleanup for tests and localhost development

* #94 fix regex issue

remove use of predefined character classes that are not available in solr
  • Loading branch information
@spacemansteve @romanchyla
spacemansteve authored and romanchyla committed May 18, 2018
1 parent 64b0e4e commit 41b855a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
3 changes: 2 additions & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,9 @@ solr.version=${solr.version}
</copy>

<!-- copy solr/webapp jars -->
<mkdir dir="${solr.real.location}/server/solr-webapp/webapp/WEB-INF/lib" />
<copy todir="${build.dir}/solrjars-extracted/solr">
<fileset dir="${solr.real.location}/server/solr-webapp/webapp/WEB-INF/lib">
<fileset dir="${solr.real.location}/server/solr-webapp/webapp/WEB-INF/lib">
<include name="**/**.jar"/>
</fileset>
</copy>
Expand Down
2 changes: 1 addition & 1 deletion .../apache/lucene/queryparser/flexible/aqp/processors/AqpAdsabsCarefulAnalyzerProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,4 @@ protected List<QueryNode> setChildrenOrder(List<QueryNode> children)
return children;
}

}
}
3 changes: 2 additions & 1 deletion contrib/adsabs/src/java/org/apache/solr/search/CitationCacheReaderWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public class CitationCacheReaderWriter {

public CitationCacheReaderWriter(File targetDir) {
this.targetDir = targetDir;


assert targetDir != null;
if (! targetDir.exists())
targetDir.mkdirs();

Expand Down
2 changes: 2 additions & 0 deletions contrib/adsabs/src/java/org/apache/solr/search/CitationLRUCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,8 @@ private File getCacheStorageDir(SolrIndexSearcher searcher) {

private CitationCacheReaderWriter getCitationCacheReaderWriter(SolrIndexSearcher searcher) {
File confDir = getCacheStorageDir(searcher);
if (confDir == null)
return null;
return new CitationCacheReaderWriter(confDir);
}

Expand Down
46 changes: 21 additions & 25 deletions contrib/adsabs/src/test/org/apache/solr/search/TestAqpAdsabsSolrSearch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,13 +496,13 @@ public void testSpecialCases() throws Exception {
assertQueryEquals(req("defType", "aqp",
"q", "first_author:\"kurtz, m j\""
),
"first_author:kurtz, m j first_author:kurtz, m j* first_author:/kurtz, m[^\\s]+/ first_author:/kurtz, m[^\\s]+ j.*/ first_author:kurtz, m first_author:kurtz,",
"first_author:kurtz, m j first_author:kurtz, m j* first_author:/kurtz, m[^ ]+/ first_author:/kurtz, m[^ ]+ j.*/ first_author:kurtz, m first_author:kurtz,",
BooleanQuery.class
);
assertQueryEquals(req("defType", "aqp",
"q", "author:\"^kurtz, m j\""
),
"spanPosRange(spanOr([author:kurtz, m j, SpanMultiTermQueryWrapper(author:kurtz, m j*), SpanMultiTermQueryWrapper(author:/kurtz, m[^\\s]+/), SpanMultiTermQueryWrapper(author:/kurtz, m[^\\s]+ j.*/), author:kurtz, m, author:kurtz,]), 0, 1)",
"spanPosRange(spanOr([author:kurtz, m j, SpanMultiTermQueryWrapper(author:kurtz, m j*), SpanMultiTermQueryWrapper(author:/kurtz, m[^ ]+/), SpanMultiTermQueryWrapper(author:/kurtz, m[^ ]+ j.*/), author:kurtz, m, author:kurtz,]), 0, 1)",
SpanPositionRangeQuery.class
);

Expand Down Expand Up @@ -659,7 +659,7 @@ public void testSpecialCases() throws Exception {
"spanPosRange(spanOr([author:two,, SpanMultiTermQueryWrapper(author:two,*)]), 0, 1)",
SpanPositionRangeQuery.class);
assertQueryEquals(req("defType", "aqp", "q", "one ^two, j k"),
"+all:one +spanPosRange(spanOr([author:two, j k, SpanMultiTermQueryWrapper(author:two, j k*), SpanMultiTermQueryWrapper(author:/two, j[^\\s]+/), SpanMultiTermQueryWrapper(author:/two, j[^\\s]+ k.*/), author:two, j, author:two,]), 0, 1)",
"+all:one +spanPosRange(spanOr([author:two, j k, SpanMultiTermQueryWrapper(author:two, j k*), SpanMultiTermQueryWrapper(author:/two, j[^ ]+/), SpanMultiTermQueryWrapper(author:/two, j[^ ]+ k.*/), author:two, j, author:two,]), 0, 1)",
BooleanQuery.class);
assertQueryEquals(req("defType", "aqp", "q", "one \"^phrase, author\"", "qf", "title author"),
"+(((author:one, author:one,*)) | title:one) +spanPosRange(spanOr([author:phrase, author, SpanMultiTermQueryWrapper(author:phrase, author *), author:phrase, a, SpanMultiTermQueryWrapper(author:phrase, a *), author:phrase,]), 0, 1)",
Expand All @@ -668,7 +668,7 @@ public void testSpecialCases() throws Exception {

// author expansion can generate regexes, so we should deal with them (actually we ignore them)
assertQueryEquals(req("defType", "aqp", "q", "pos(author:\"Accomazzi, A. K. B.\", 1)"),
"spanPosRange(spanOr([author:accomazzi, a k b, SpanMultiTermQueryWrapper(author:accomazzi, a k b*), SpanMultiTermQueryWrapper(author:/accomazzi, a[^\\s]+/), SpanMultiTermQueryWrapper(author:/accomazzi, a[^\\s]+ k[^\\s]+/), SpanMultiTermQueryWrapper(author:/accomazzi, a[^\\s]+ k[^\\s]+ b.*/), author:accomazzi, a, author:accomazzi,]), 0, 1)",
"spanPosRange(spanOr([author:accomazzi, a k b, SpanMultiTermQueryWrapper(author:accomazzi, a k b*), SpanMultiTermQueryWrapper(author:/accomazzi, a[^ ]+/), SpanMultiTermQueryWrapper(author:/accomazzi, a[^ ]+ k[^ ]+/), SpanMultiTermQueryWrapper(author:/accomazzi, a[^ ]+ k[^ ]+ b.*/), author:accomazzi, a, author:accomazzi,]), 0, 1)",
SpanPositionRangeQuery.class);


Expand Down Expand Up @@ -849,7 +849,7 @@ public void testSpecialCases() throws Exception {
}


public void test() throws Exception {
public void testSearch() throws Exception {


// search for all docs with a field
Expand Down Expand Up @@ -898,9 +898,8 @@ public void test() throws Exception {


assertU(adoc("id", "57", "bibcode", "b57", "author", "Kurtz, M.", "author", "Foo, Bar"));
assertU(adoc("id", "58", "bibcode", "b58", "author", "Kurtz, M J", "author", "Foo, Bar"));
assertU(adoc("id", "59", "bibcode", "b59", "author", "Kurtz, w", "author", "Foo, Bar"));

assertU(adoc("id", "58", "bibcode", "b58", "author", "Kurtz, M J", "author", "Foo, Bar"));
assertU(adoc("id", "59", "bibcode", "b59", "author", "Mason, James Paul"));
assertU(commit("waitSearcher", "true"));

// regex
Expand All @@ -912,28 +911,25 @@ public void test() throws Exception {
RegexpQuery.class);

setDebug(true);

assertQueryEquals(req("q", "author:/kurtz, ~( )+/"), "", RegexpQuery.class);

assertQueryEquals(req("q", "author:/kurtz, ~( )+/"), "", RegexpQuery.class);

setDebug(false);
assertQ(req("q", "author:/kurtz, [^\\w]+/"), "//*[@numFound='2']");
assertQ(req("q", "author:/kurtz,[^\\w]+/"), "//*[@numFound='0']");
assertQueryEquals(req("q", "author:/kurtz, ~( )+/"), "author:/kurtz, ~( )+/", RegexpQuery.class);
dumpDoc(0, "id", "author");
assertQ(req("q", "author:/kurtz, m/"), "//*[@numFound='1']");
//assertQ(req("q", "author:\"kurtz, m\""), "//*[@numFound='1']");
//assertQ(req("q", "author:/kurtz, ~( )+/"), "//*[@numFound='1']");

assertQ(req("q", "author:/kurtz, [^ ]+/"),

assertQ(req("q", "author:/kurtz, [^ ]+/"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='57']");
assertQ(req("q", "author:/kurtz,[^ ]+/"), "//*[@numFound='0']");

assertQ(req("q", "author:/kurtz, [^ ]+ [^ ]+/"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='58']");
assertQ(req("q", "author:/kurtz, [^ ]+[^ ]+/"), "//*[@numFound='0']");

assertQ(req("q", "author:/mason, j[^ ]+ p[^ ]+/"), "//*[@numFound='1']");
assertQ(req("q", "author:/mason, james p[^ ]+/"), "//*[@numFound='1']");
assertQ(req("q", "author:/mason, james paul/"), "//*[@numFound='1']");
assertQ(req("q", "author:/mason, j[^ ]+/"), "//*[@numFound='0']");
assertQ(req("q", "author:/mason, p[^ ]+/"), "//*[@numFound='0']");


// this is treated as regex, but because it is unfielded search
// it ends up in the unfielded_search field. Feature or a bug?
Expand All @@ -951,8 +947,8 @@ public void test() throws Exception {
assertQueryEquals(req("defType", "aqp", "q", "author:(/kurtz, m.*/)"),
"author:/kurtz, m.*/",
RegexpQuery.class);
assertQueryEquals(req("defType", "aqp", "q", "abstract:/nas\\S+/"),
"abstract:/nas\\S+/",
assertQueryEquals(req("defType", "aqp", "q", "abstract:/nas[^ ]+/"),
"abstract:/nas[^ ]+/",
RegexpQuery.class);


Expand Down Expand Up @@ -995,7 +991,7 @@ public void test() throws Exception {


}

public static junit.framework.Test suite() {
return new junit.framework.JUnit4TestAdapter(TestAqpAdsabsSolrSearch.class);
}
Expand Down

0 comments on commit 41b855a

Please sign in to comment.