Merge pull request #87 from phenoscape/issue-82

Support POST for OntoTrace.
phenoscape · Mar 22, 2019 · 71c0193 · 71c0193
2 parents 6f2916a + 3528f9a
commit 71c0193
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/src/main/scala/org/phenoscape/kb/Main.scala b/src/main/scala/org/phenoscape/kb/Main.scala
@@ -198,13 +198,24 @@ object Main extends HttpApp with App {
               }
           } ~
           path("ontotrace") {
-            parameters('entity.as[OWLClassExpression], 'taxon.as[OWLClassExpression], 'variable_only.as[Boolean].?(true), 'parts.as[Boolean].?(false)) { (entity, taxon, variableOnly, includeParts) =>
-              respondWithHeader(headers.`Content-Disposition`(ContentDispositionTypes.attachment, Map("filename" -> "ontotrace.xml"))) {
-                complete {
-                  PresenceAbsenceOfStructure.presenceAbsenceMatrix(entity, taxon, variableOnly, includeParts)
+            get {
+              parameters('entity.as[OWLClassExpression], 'taxon.as[OWLClassExpression], 'variable_only.as[Boolean].?(true), 'parts.as[Boolean].?(false)) { (entity, taxon, variableOnly, includeParts) =>
+                respondWithHeader(headers.`Content-Disposition`(ContentDispositionTypes.attachment, Map("filename" -> "ontotrace.xml"))) {
+                  complete {
+                    PresenceAbsenceOfStructure.presenceAbsenceMatrix(entity, taxon, variableOnly, includeParts)
+                  }
+                }
+              }
+            } ~
+              post {
+                formFields('entity.as[OWLClassExpression], 'taxon.as[OWLClassExpression], 'variable_only.as[Boolean].?(true), 'parts.as[Boolean].?(false)) { (entity, taxon, variableOnly, includeParts) =>
+                  respondWithHeader(headers.`Content-Disposition`(ContentDispositionTypes.attachment, Map("filename" -> "ontotrace.xml"))) {
+                    complete {
+                      PresenceAbsenceOfStructure.presenceAbsenceMatrix(entity, taxon, variableOnly, includeParts)
+                    }
+                  }
                 }
               }
-            }
           } ~
           pathPrefix("similarity") {
             path("query") {
@@ -296,14 +307,14 @@ object Main extends HttpApp with App {
                     }
                   }
                 } ~
-                post {
-                  formFields('terms.as[Seq[String]]) { iriStrings =>
-                    complete {
-                      val iris = iriStrings.map(IRI.create).toSet
-                      Graph.ancestorMatrix(iris)
+                  post {
+                    formFields('terms.as[Seq[String]]) { iriStrings =>
+                      complete {
+                        val iris = iriStrings.map(IRI.create).toSet
+                        Graph.ancestorMatrix(iris)
+                      }
                     }
                   }
-                }
               }
           } ~
           pathPrefix("characterstate") {