[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 14:45:50 UTC 2010
The following commit has been merged in the master branch:
commit da42b9be18b998cc9b86ae813222496c63235adc
Author: John Goerzen <jgoerzen at complete.org>
Date: Sun Oct 24 12:37:42 2004 +0100
Fixed up docs
Keywords:
(jgoerzen at complete.org--projects/missingh--head--1.0--patch-119)
diff --git a/ChangeLog b/ChangeLog
index 6184be3..14fdde5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
# arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
#
+2004-10-24 06:37:42 GMT John Goerzen <jgoerzen at complete.org> patch-119
+
+ Summary:
+ Fixed up docs
+ Revision:
+ missingh--head--1.0--patch-119
+
+
+ modified files:
+ ChangeLog Setup.description libsrc/MissingH/Logging/Logger.hs
+ libsrc/MissingH/Network/FTP/Client.hs
+
+
2004-10-24 06:18:21 GMT John Goerzen <jgoerzen at complete.org> patch-118
Summary:
diff --git a/Setup.description b/Setup.description
index 5bd151f..e03c9e1 100644
--- a/Setup.description
+++ b/Setup.description
@@ -15,7 +15,8 @@ Modules: MissingH.IO, MissingH.IO.Binary, MissingH.List,
MissingH.Str,
MissingH.Cmd,
MissingH.FiniteMap, MissingH.Path,
- MissingH.Network.FTP.Client,
+ MissingH.Network,
+ MissingH.Network.FTP.Client,
MissingH.Network.FTP.Parser,
MissingH.Parsec,
MissingH.Bits,
@@ -44,4 +45,4 @@ Modules: MissingH.IO, MissingH.IO.Binary, MissingH.List,
MissingH.Wash.Utility.Unique
HS-Source-Dir: libsrc
Extensions: ExistentialQuantification
-Build-Depends: haskell-src
+Build-Depends: haskell-src, network, unix, parsec
diff --git a/libsrc/MissingH/Logging/Logger.hs b/libsrc/MissingH/Logging/Logger.hs
index eb31af5..6caa507 100644
--- a/libsrc/MissingH/Logging/Logger.hs
+++ b/libsrc/MissingH/Logging/Logger.hs
@@ -102,31 +102,30 @@ Here's an example to illustrate some of these concepts:
>
> -- Copy everything to syslog from here on out.
> s <- openlog "SyslogStuff" [PID] USER DEBUG
-> updateGlobalLogger rootLoggerName (addHandler s)
+> updateGlobalLogger rootLoggerName (addHandler s)
>
> errorM "MyApp.Component" "This is going to stderr and syslog."
>
> -- Now we'd like to see everything from BuggyComponent
-> -- at DEBUG or higher go to syslog, but only go to stderr
-> -- if it's WARNING or higher as before. Also, we'd like to
-> -- still ignore things less than WARNING in other areas.
+> -- at DEBUG or higher go to syslog and stderr.
+> -- Also, we'd like to still ignore things less than
+> -- WARNING in other areas.
> --
> -- So, we adjust the Logger for MyApp.Component.
>
> updateGlobalLogger "MyApp.BuggyComponent"
-> (setLevel DEBUG . setHandlers [s])
+> (setLevel DEBUG)
>
> -- This message will go to syslog -- the default
> -- restrictions on the root logger will filter it out.
> debugM "MyApp.BuggyComponent" "This buggy component is buggy"
>
-> -- This message will go to syslog and stderr.
+> -- This message will go to syslog and stderr too.
> warningM "MyApp.BuggyComponent" "Still Buggy"
>
> -- This message goes nowhere.
> debugM "MyApp.WorkingComponent" "Hello"
-
-}
module MissingH.Logging.Logger(
@@ -210,7 +209,7 @@ rootLoggerName = ""
-- | Placeholders created when a new logger must be created.
placeholder :: Logger
-placeholder = Logger {level = DEBUG, handlers = [], name = ""}
+placeholder = Logger {level = WARNING, handlers = [], name = ""}
---------------------------------------------------------------------------
-- Logger Tree Storage
@@ -429,4 +428,4 @@ updateGlobalLogger :: String -- ^ Logger name
updateGlobalLogger ln func =
do
l <- getLogger ln
- saveGlobalLogger (func l)
\ No newline at end of file
+ saveGlobalLogger (func l)
diff --git a/libsrc/MissingH/Network/FTP/Client.hs b/libsrc/MissingH/Network/FTP/Client.hs
index b7753b7..8f22326 100644
--- a/libsrc/MissingH/Network/FTP/Client.hs
+++ b/libsrc/MissingH/Network/FTP/Client.hs
@@ -43,8 +43,8 @@ run that with Hugs.)
The above loads the module.
-Next, we enable the debugging. This will turn on all the @"FTP sent"@ and
-@"FTP received"@ messages you'll see.
+Next, we enable the debugging. This will turn on all the "FTP sent" and
+"FTP received" messages you'll see.
> Prelude MissingH.Network.FTP.Client> enableFTPDebugging
@@ -149,7 +149,7 @@ are trying that, and confusion will ensue. Either open two FTP connections
or make sure you consume the 'nlst' data first.
Here is a partial list of commands effected: 'nlst', 'dir', 'getbinary',
-'getlines', 'downloadbinary', 'downloadlines'.
+'getlines', 'downloadbinary'.
The corrolary is:
@@ -180,19 +180,21 @@ module MissingH.Network.FTP.Client(-- * Establishing\/Removing connections
easyConnectFTP, connectFTP,
loginAnon, login, quit,
-- * Configuration
- setPassive, enableFTPDebugging,
+ setPassive, isPassive, enableFTPDebugging,
-- * Directory listing
nlst, dir,
-- * File downloads
- getlines, getbinary, downloadbinary,
+ getlines, getbinary,
+ downloadbinary,
-- * File uploads
- putlines, putbinary, uploadbinary,
+ putlines, putbinary,
+ uploadbinary,
-- * File manipulation
rename, delete, size,
-- * Directory manipulation
cwd, mkdir, rmdir, pwd,
-- * Low-level advanced commands
- FTPConnection(isPassive),
+ FTPConnection,
transfercmd, ntransfercmd,
retrlines, storlines
)
@@ -235,8 +237,8 @@ easyConnectFTP h = do x <- connectFTP h 21
return (fst x)
{- | Enable logging of FTP messages through 'MissingH.Logging.Logger'.
-This sets the log levels of @"MissingH.Network.FTP.Parser"@ and
-@"MissingH.Network.FTP.Client"@ to DEBUG. By default, this means that
+This sets the log levels of @MissingH.Network.FTP.Parser@ and
+ at MissingH.Network.FTP.Client@ to DEBUG. By default, this means that
full protocol dumps will be sent to stderr.
The effect is global and persists until changed.
@@ -306,7 +308,6 @@ login h user pass acct =
{- | Sets whether passive mode is used (returns new
connection object reflecting this) -}
-
setPassive :: FTPConnection -> Bool -> FTPConnection
setPassive f b = f{isPassive = b}
@@ -436,7 +437,7 @@ uploadbinary :: FTPConnection -> String -> IO FTPResult
uploadbinary h fn = do input <- readFile fn
putbinary h fn input
-{- Downloads a file from remote and saves to disk in binary mode. Note: filename is used for both local and remote. -}
+{- | Downloads a file from remote and saves to disk in binary mode. Note: filename is used for both local and remote. -}
downloadbinary :: FTPConnection -> String -> IO FTPResult
downloadbinary h fn = do r <- getbinary h fn
writeFile fn (fst r)
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list