Mercurial > hg > orthanc
comparison Core/HttpServer/FilesystemHttpHandler.cpp @ 110:fd7b0a3e6260
support of boost 1.42 for debian
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 04 Oct 2012 12:33:31 +0200 |
parents | c996319e90bc |
children | fe180eae201d |
comparison
equal
deleted
inserted
replaced
109:8c0a5666b05f | 110:fd7b0a3e6260 |
---|---|
54 } | 54 } |
55 | 55 |
56 fs::directory_iterator end; | 56 fs::directory_iterator end; |
57 for (fs::directory_iterator it(p) ; it != end; ++it) | 57 for (fs::directory_iterator it(p) ; it != end; ++it) |
58 { | 58 { |
59 #if BOOST_HAS_FILESYSTEM_V3 == 1 | |
59 std::string f = it->path().filename().string(); | 60 std::string f = it->path().filename().string(); |
61 #else | |
62 std::string f = it->path().filename(); | |
63 #endif | |
64 | |
60 std::string h = Toolbox::FlattenUri(uri) + "/" + f; | 65 std::string h = Toolbox::FlattenUri(uri) + "/" + f; |
61 if (fs::is_directory(it->status())) | 66 if (fs::is_directory(it->status())) |
62 output.SendString("<li><a href=\"" + h + "\">" + f + "</a></li>"); | 67 output.SendString("<li><a href=\"" + h + "\">" + f + "</a></li>"); |
63 } | 68 } |
64 | 69 |
66 output.SendString(" <h1>Files</h1>"); | 71 output.SendString(" <h1>Files</h1>"); |
67 output.SendString(" <ul>"); | 72 output.SendString(" <ul>"); |
68 | 73 |
69 for (fs::directory_iterator it(p) ; it != end; ++it) | 74 for (fs::directory_iterator it(p) ; it != end; ++it) |
70 { | 75 { |
76 #if BOOST_HAS_FILESYSTEM_V3 == 1 | |
71 std::string f = it->path().filename().string(); | 77 std::string f = it->path().filename().string(); |
78 #else | |
79 std::string f = it->path().filename(); | |
80 #endif | |
81 | |
72 std::string h = Toolbox::FlattenUri(uri) + "/" + f; | 82 std::string h = Toolbox::FlattenUri(uri) + "/" + f; |
73 if (fs::is_regular_file(it->status())) | 83 if (fs::is_regular_file(it->status())) |
74 output.SendString("<li><a href=\"" + h + "\">" + f + "</a></li>"); | 84 output.SendString("<li><a href=\"" + h + "\">" + f + "</a></li>"); |
75 } | 85 } |
76 | 86 |