X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FMain.hs;h=924a699674c27b118ae57783af1467cc18ce361a;hb=79cba02a6f520256991b345e9dffdaedf68ddde0;hp=06cb22e2e46e385ee61a35e7ea89d69cba0c005d;hpb=9fff5c185dd7a2c8655815f36b72736d61401e41;p=dead%2Fhtsn-import.git diff --git a/src/Main.hs b/src/Main.hs index 06cb22e..924a699 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -111,8 +111,8 @@ import_file cfg path = do -- | An arrow which parses the doctype "SYSTEM" of an 'XmlTree'. -- We use these to determine the parser to use. - doctypeA :: ArrowXml a => a XmlTree DtdName - doctypeA = getAttrl >>> hasName "doctype-SYSTEM" /> getText >>^ DtdName + dtdnameA :: ArrowXml a => a XmlTree DtdName + dtdnameA = getAttrl >>> hasName "doctype-SYSTEM" /> getText >>^ DtdName -- | Combine the arrows above as well as the function below -- (arrowized with 'arr') into an IO action that does everything @@ -123,7 +123,7 @@ import_file cfg path = do -- big one outside of the list. parse_and_import :: IO [ImportResult] parse_and_import = - runX (readA >>> (doctypeA &&& returnA) >>> (arr import_with_dtd)) + runX (readA >>> (dtdnameA &&& returnA) >>> (arr import_with_dtd)) >>= sequence