Skip to content

Commit

Permalink
bla Merge branch 'master' of https://github.com/UniFormal/MMT
Browse files Browse the repository at this point in the history
  • Loading branch information
Jazzpirate committed Aug 23, 2016
2 parents 6f4a360 + 879ebb4 commit 6daa5a5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ case class NotApplicable(message: String = "") extends Error(message)
abstract class Storage extends QueryResolver with OntologyResolver {
protected def loadXML(u: URI, dpath: DPath, reader: BufferedReader)(implicit controller: Controller) {
val ps = new ParsingStream(u, IsRootDoc(dpath), NamespaceMap(dpath), "omdoc", reader)
controller.report("storage", "found by " + toString + " at URL " + u)
controller.read(ps, interpret = false)(ErrorThrower)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ class Controller extends ROController with ActionHandling with Logger {

/** loads a path via the backend and reports it */
protected def retrieve(nf: NotFound) {
log("retrieving " + nf.path)
log("asking backend for URI " + nf.path)
logGroup {
try {
// loading objects into memory changes state, so make sure only one object is loaded at a time
Expand Down

0 comments on commit 6daa5a5

Please sign in to comment.