diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2009-11-21 17:01:50 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2009-11-21 17:01:50 +0000 |
| commit | 3a4fad07cb5097598eefd0cd7f588c5881a61c8f (patch) | |
| tree | 6945d805eb72a37a5b27ae14a7ec2d1e8690fdac /src/mochiweb/mochiweb_skel.erl | |
| parent | a2ebd6155b8171befd8f55b42c48bc563bb330b0 (diff) | |
upgrade mochiweb to r113, use hooks instead of forking mochijson2. COUCHDB-474
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@882941 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/mochiweb/mochiweb_skel.erl')
| -rw-r--r-- | src/mochiweb/mochiweb_skel.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mochiweb/mochiweb_skel.erl b/src/mochiweb/mochiweb_skel.erl index 098951be..36b48be5 100644 --- a/src/mochiweb/mochiweb_skel.erl +++ b/src/mochiweb/mochiweb_skel.erl @@ -29,7 +29,8 @@ skel() -> "skel". skelcopy(Src, DestDir, Name, LDst) -> - {ok, Dest, _} = regexp:gsub(filename:basename(Src), skel(), Name), + Dest = re:replace(filename:basename(Src), skel(), Name, + [global, {return, list}]), case file:read_file_info(Src) of {ok, #file_info{type=directory, mode=Mode}} -> Dir = DestDir ++ "/" ++ Dest, @@ -50,7 +51,8 @@ skelcopy(Src, DestDir, Name, LDst) -> {ok, #file_info{type=regular, mode=Mode}} -> OutFile = filename:join(DestDir, Dest), {ok, B} = file:read_file(Src), - {ok, S, _} = regexp:gsub(binary_to_list(B), skel(), Name), + S = re:replace(binary_to_list(B), skel(), Name, + [{return, list}, global]), ok = file:write_file(OutFile, list_to_binary(S)), ok = file:write_file_info(OutFile, #file_info{mode=Mode}), io:format(" ~s~n", [filename:basename(Src)]), |