second iteration on #12

kermitt2 · Jan 30, 2019 · 9d6089c · 9d6089c
1 parent d865e37
commit 9d6089c
Showing 1 changed file with 45 additions and 0 deletions.
diff --git a/lookup/src/main/java/com/scienceminer/lookup/web/resource/LookupController.java b/lookup/src/main/java/com/scienceminer/lookup/web/resource/LookupController.java
@@ -152,6 +152,51 @@ private void getByQuery(
         if (isNotBlank(atitle) && isNotBlank(firstAuthor)) {
             storage.retrieveByArticleMetadataAsync(atitle, firstAuthor, postValidate, matchingDocument -> {
                 if (matchingDocument.isException()) {
+
+                    if (isNotBlank(jtitle) && isNotBlank(volume) && isNotBlank(firstPage)) {
+                        storage.retrieveByJournalMetadataAsync(jtitle, volume, firstPage, matchingDocumentJournal -> {
+                            if (matchingDocumentJournal.isException()) {
+                                if (isNotBlank(biblio)) {
+                                    storage.retrieveByBiblioAsync(biblio, matchingDocument2 -> {
+                                        if (matchingDocument2.isException()) {
+                                            asyncResponse.resume(matchingDocument2.getException());
+                                        } else {
+                                            asyncResponse.resume(matchingDocument2.getFinalJsonObject());
+                                        }
+                                    });
+                                    return;
+                                } else {
+                                    asyncResponse.resume(matchingDocument.getException());
+                                }
+                            } else {
+                                asyncResponse.resume(matchingDocumentJournal.getFinalJsonObject());
+                            }
+                        });
+                        return;
+                    }
+
+                    if (isNotBlank(jtitle) && isNotBlank(volume) && isNotBlank(firstPage) && isNotBlank(firstAuthor)) {
+                        storage.retrieveByJournalMetadataAsync(jtitle, volume, firstPage, firstAuthor, matchingDocumentJournal -> {
+                            if (matchingDocumentJournal.isException()) {
+                                if (isNotBlank(biblio)) {
+                                    storage.retrieveByBiblioAsync(biblio, matchingDocument2 -> {
+                                        if (matchingDocument2.isException()) {
+                                            asyncResponse.resume(matchingDocument2.getException());
+                                        } else {
+                                            asyncResponse.resume(matchingDocument2.getFinalJsonObject());
+                                        }
+                                    });
+                                    return;
+                                } else {
+                                    asyncResponse.resume(matchingDocument.getException());
+                                }
+                            } else {
+                                asyncResponse.resume(matchingDocumentJournal.getFinalJsonObject());
+                            }
+                        });
+                        return;
+                    }
+
                     if (isNotBlank(biblio)) {
                         storage.retrieveByBiblioAsync(biblio, matchingDocument2 -> {
                             if (matchingDocument2.isException()) {