Skip to content

Commit

Permalink
Made changes for affiliations
Browse files Browse the repository at this point in the history
  • Loading branch information
@romanchyla
romanchyla committed Jan 2, 2020
1 parent 7ef9d5a commit 72de189
Show file tree
Hide file tree
Showing 5 changed files with 176 additions and 115 deletions.
39 changes: 26 additions & 13 deletions contrib/adsabs/src/test/org/adsabs/TestAdsAllFields.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ public void test() throws Exception {
//", \"recid\": 100" +

", \"abstract\": \"all no-sky survey q'i quotient\"" +
", \"aff\": [\"-\", \"NASA Kavli space center, Cambridge, MA 02138, USA\", \"Einstein institute, Zurych, Switzerland\"]" +
", \"aff_abbrev\": [\"CfA\", \"Harvard U/Dep Ast\", \"-\"]" +
", \"institution\": [\"CfA\", \"Harvard U/Dep Ast\", \"-\", \"foo/bar baz\"]" +
", \"aff_id\": [\"61814\", \"A1036\", \"-\"]" +
", \"aff_abbrev\": [\"CfA\", \"Harvard U/Dep Ast\", \"-\"]" +
", \"aff_canonical\": [\"Harvard Smithsonian Center for Astrophysics\", \"Harvard University, Department of Astronomy\", \"-\"]" +
", \"aff_raw\": [\"-\", \"NASA Kavli space center, Cambridge, MA 02138, USA\", \"Einstein institute, Zurych, Switzerland\"]" +
", \"institution\": [\"CfA\", \"Harvard U/Dep Ast\", \"-\", \"foo/bar baz\"]" +
", \"aff_facet\": [[\"A1234\", \"facet abbrev/parent abbrev\"]]" +
", \"aff_facet_hier\": [\"1/1812/61814\", \"1/8264/61814\", \"1/1812/A1036\", \"-\"]" +
", \"aff_id\": [\"61814\", \"A1036\", \"-\"]" +
", \"aff_raw\": [\"-\", \"Center for Astrophysics, 60 Garden Street, Cambridge MA 02138, USA\", \"Department of Astronomy, Harvard University, 60 Garden St., Cambridge, MA 02130, USA\"]" +

", \"alternate_bibcode\": [\"2014JNuM..455...1a1\", \"2014JNuM..455...1a2\"]" +
", \"alternate_title\": \"This is of the alternate\"" +

Expand Down Expand Up @@ -449,6 +449,10 @@ public void test() throws Exception {
"<str>Anders, John Michael</str>" +
"<str>Einstein, A</str></arr>");

assertQ(req("q", "author:\"t' Hoof*\""),
"//*[@numFound='3']"
);

/*
* book_author
*/
Expand Down Expand Up @@ -492,7 +496,8 @@ public void test() throws Exception {


/*
* aff - must be the same order as authors
* aff - is a virtual field;
* all aff_ fields must be the same order as authors
*/

assertQ(req("q", "aff:NASA"),
Expand Down Expand Up @@ -551,22 +556,26 @@ public void test() throws Exception {
// "//*[@numFound='1']");
assertQ(req("q", "aff_id:\"61814\""),
"//*[@numFound='1']");
assertQ(req("q", "aff_raw:\"Harvard\""),
assertQ(req("q", "aff_raw:\"02138\""),
"//*[@numFound='1']");
assertQ(req("q", "aff_canonical:\"Smithsonian\""),
"//*[@numFound='1']");
assertQ(req("q", "institution:\"Harvard U/Dep Ast\""),
"//*[@numFound='1']");


assert h.query(req("q", "recid:100"))
.contains("<arr name=\"aff\">" +
.contains("<arr name=\"aff_raw\">" +
"<str>-</str>" +
"<str>NASA Kavli space center, Cambridge, MA 02138, USA</str>" +
"<str>Einstein institute, Zurych, Switzerland</str></arr>"
);
assertQ(req("q", "pos(aff:kavli, 2) AND recid:100"),
"//*[@numFound='1']"
);
assertQ(req("q", "=aff:\"acr::nasa\" AND recid:100"),
"//*[@numFound='1']"
);
assertQ(req("q", "pos(aff_raw:kavli, 2) AND recid:100"),
"//*[@numFound='1']"
);


/*
Expand Down Expand Up @@ -1614,7 +1623,11 @@ public void test() throws Exception {
* solrcofig.xml; here we just test what came up as bugs
*/
assertQueryEquals(req("q", "aff:\"ASTRO 3D\""),
"(aff:\"acr::astro (3d 3d)\" | aff:\"acr::astro 3 d\")",
DisjunctionMaxQuery.class);
"(aff_abbrev:\"acr::astro (3d 3d)\" | aff_abbrev:\"acr::astro 3 d\") "
+ "(institution:astro 3d)^2.0 "
+ "aff_id:astro 3d "
+ "(aff_canonical:\"acr::astro (3d 3d)\" | aff_canonical:\"acr::astro 3 d\") "
+ "((aff_raw:\"acr::astro (3d 3d)\" | aff_raw:\"acr::astro 3 d\"))^0.5",
BooleanQuery.class);
}
}
52 changes: 26 additions & 26 deletions contrib/adsabs/src/test/org/apache/solr/analysis/TestAdsabsTypeAffiliationText.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,83 +55,83 @@ public static void beforeClass() throws Exception {

public void test() throws Exception {

assertU(addDocs("aff", "W.K. Kellogg Radiation Laboratory, California Institute of Technology, Pasadena, CA 91125, USA"));
assertU(addDocs("aff", "W.K. Kellogg <xfoo> Radiation Laboratory, California Institute of Technology, Pasadena, CA(91125), USA"));
assertU(addDocs("aff", "IMCCE/Observatoire de Paris"));
assertU(addDocs("aff", "INAF - Osservatorio Astronomico di Brera, via E. Bianchi 46, I-23807 Merate, Italy;",
"aff", "INAF - IASF Milano, via E. Bassini 15, I-20133 Milano, Italy"));
assertU(addDocs("aff", "Instituto de Astrofísica de Andalucía (IAA-CSIC) foo:doo"));
assertU(addDocs("aff", "foo1", "aff", "foo2", "aff", "-", "aff", "foo4"));
assertU(addDocs("aff_raw", "W.K. Kellogg Radiation Laboratory, California Institute of Technology, Pasadena, CA 91125, USA"));
assertU(addDocs("aff_raw", "W.K. Kellogg <xfoo> Radiation Laboratory, California Institute of Technology, Pasadena, CA(91125), USA"));
assertU(addDocs("aff_raw", "IMCCE/Observatoire de Paris"));
assertU(addDocs("aff_raw", "INAF - Osservatorio Astronomico di Brera, via E. Bianchi 46, I-23807 Merate, Italy;",
"aff_raw", "INAF - IASF Milano, via E. Bassini 15, I-20133 Milano, Italy"));
assertU(addDocs("aff_raw", "Instituto de Astrofísica de Andalucía (IAA-CSIC) foo:doo"));
assertU(addDocs("aff_raw", "foo1", "aff_raw", "foo2", "aff_raw", "-", "aff_raw", "foo4"));

assertU(commit());

//dumpDoc(null, "aff");
//System.err.println(h.query(req("q", "aff:foo1")));
//dumpDoc(null, "aff_raw");
//System.err.println(h.query(req("q", "aff_raw:foo1")));

assertQ(req("q", "*:*"), "//*[@numFound>='2']");
assertQ(req("q", "aff:xfoo"), "//*[@numFound='0']");
assertQ(req("q", "aff_raw:xfoo"), "//*[@numFound='0']");

assertQueryEquals(req("q", "aff:\"Pasadena, CA 91125\"", "qt", "aqp"),
"aff:\"pasadena acr::ca 91125\"",
assertQueryEquals(req("q", "aff_raw:\"Pasadena, CA 91125\"", "qt", "aqp"),
"aff_raw:\"pasadena acr::ca 91125\"",
PhraseQuery.class
);
assertQueryEquals(req("q", "aff:\"Pasadena, CA(91125)\"", "qt", "aqp"),
"aff:\"pasadena acr::ca 91125\"",
assertQueryEquals(req("q", "aff_raw:\"Pasadena, CA(91125)\"", "qt", "aqp"),
"aff_raw:\"pasadena acr::ca 91125\"",
PhraseQuery.class
);

assertQ(req("q", "aff:\"Pasadena, CA 91125\""),
assertQ(req("q", "aff_raw:\"Pasadena, CA 91125\""),
"//*[@numFound='2']",
"//doc/str[@name='id'][.='0']",
"//doc/str[@name='id'][.='1']"
);

assertQ(req("q", "aff:IMCCE"),
assertQ(req("q", "aff_raw:IMCCE"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='2']"
);

assertQ(req("q", "aff:imcce"),
assertQ(req("q", "aff_raw:imcce"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='2']"
);

assertQ(req("q", "aff:IASF"),
assertQ(req("q", "aff_raw:IASF"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='3']"
);

assertQ(req("q", "aff:iasf"),
assertQ(req("q", "aff_raw:iasf"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='3']"
);

assertQ(req("q", "aff:IAA-CSIC"),
assertQ(req("q", "aff_raw:IAA-CSIC"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='4']"
);

assertQ(req("q", "aff:IAACSIC"),
assertQ(req("q", "aff_raw:IAACSIC"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='4']"
);
assertQ(req("q", "aff:iaa-csic"),
assertQ(req("q", "aff_raw:iaa-csic"),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='4']"
);

assertQ(req("q", "aff:\"INAF - IASF\""),
assertQ(req("q", "aff_raw:\"INAF - IASF\""),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='3']"
);
assertQ(req("q", "aff:\"inaf - iasf\""),
assertQ(req("q", "aff_raw:\"inaf - iasf\""),
"//*[@numFound='1']",
"//doc/str[@name='id'][.='3']"
);


assert h.query(req("q", "aff:foo1"))
.contains("<arr name=\"aff\">" +
assert h.query(req("q", "aff_raw:foo1"))
.contains("<arr name=\"aff_raw\">" +
"<str>foo1</str>" +
"<str>foo2</str>" +
"<str>-</str>" +
Expand Down
47 changes: 44 additions & 3 deletions contrib/adsabs/src/test/org/apache/solr/analysis/TestAdsabsTypeAffiliationTokens.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@
import monty.solr.util.MontySolrQueryTestCase;
import monty.solr.util.MontySolrSetup;

import java.io.File;
import java.io.IOException;

import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.SynonymQuery;
import org.apache.lucene.search.TermQuery;
import org.junit.BeforeClass;

Expand All @@ -44,16 +48,46 @@ public static void beforeClass() throws Exception {
System.setProperty("solr.allow.unsafe.resourceloading", "true");


schemaString = MontySolrSetup.getMontySolrHome()
+ "/contrib/examples/adsabs/server/solr/collection1/conf/schema.xml";
schemaString = getSchemaFile();

configString = MontySolrSetup.getMontySolrHome()
+ "/contrib/examples/adsabs/server/solr/collection1/conf/solrconfig.xml";

initCore(configString, schemaString, MontySolrSetup.getSolrHome()
+ "/example/solr");
}


public static String getSchemaFile() {

/*
* For purposes of the test, we make a copy of the schema.xml, and create
* our own synonym files
*/

String configFile = MontySolrSetup.getMontySolrHome()
+ "/contrib/examples/adsabs/server/solr/collection1/conf/schema.xml";

File newConfig;
try {

newConfig = duplicateFile(new File(configFile));


File simpleTokenSynonymsFile = createTempFile(
new String[] { "id1,id2\n"
+ "ror.1,foo,bar"
});

replaceInFile(newConfig, "synonyms=\"aff_id.synonyms\"",
"synonyms=\"" + simpleTokenSynonymsFile.getAbsolutePath() + "\"");

} catch (IOException e) {
e.printStackTrace();
throw new IllegalStateException(e.getMessage());
}

return newConfig.getAbsolutePath();
}

public void test() throws Exception {

Expand All @@ -65,6 +99,13 @@ public void test() throws Exception {
));
assertU(commit());


// test synonyms
assertQueryEquals(req("q", "aff_id:\"ror.1\""),
"Synonym(aff_id:bar aff_id:foo aff_id:ror.1)",
SynonymQuery.class
);

// make sure docs are there
assertQ(req("q", "*:*"), "//*[@numFound>='2']");

Expand Down
Loading

0 comments on commit 72de189

Please sign in to comment.