author | Michael Krelin <hacker@klever.net> | 2007-06-28 12:24:23 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-06-28 12:24:23 (UTC) |
commit | 3779aa290c30ee80976b63db0b8d17ab73f64847 (patch) (unidiff) | |
tree | 5ed2262631bd8119c7d03710704812c2ef385eb7 /htdocs/handlers/exception_dev | |
parent | f58a286ee7b26101e97e5b69b6c026f4c33a037d (diff) | |
download | sitecing-showcase/master.zip sitecing-showcase/master.tar.gz sitecing-showcase/master.tar.bz2 |
imported amd64bit compile fixespublic/showcase/mastershowcase/master
Diffstat (limited to 'htdocs/handlers/exception_dev') (more/less context) (ignore whitespace changes)
-rw-r--r-- | htdocs/handlers/exception_dev | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/htdocs/handlers/exception_dev b/htdocs/handlers/exception_dev index d62f462..49b7f45 100644 --- a/htdocs/handlers/exception_dev +++ b/htdocs/handlers/exception_dev | |||
@@ -19,17 +19,17 @@ | |||
19 | %%var string root_so; | 19 | %%var string root_so; |
20 | %%var string component; | 20 | %%var string component; |
21 | %%var int line_number = -1; | 21 | %%var int line_number = -1; |
22 | %%var const exception* exception_caught; | 22 | %%var const exception* exception_caught; |
23 | <%code> | 23 | <%code> |
24 | __SCIF->headers.clear(); | 24 | __SCIF->headers.clear(); |
25 | __SCIF->out->seekp(0); | 25 | __SCIF->out->seekp(0); |
26 | int magic = _magic; | 26 | int magic = _magic; |
27 | va_list va = _args; | 27 | va_list va; va_copy(va,_args); |
28 | switch(magic) { | 28 | switch(magic) { |
29 | case sitecing::__magic_compile_error: | 29 | case sitecing::__magic_compile_error: |
30 | message = va_arg(va,const char*); | 30 | message = va_arg(va,const char*); |
31 | root_source = va_arg(va,const char*); | 31 | root_source = va_arg(va,const char*); |
32 | root_intermediate = va_arg(va,const char*); | 32 | root_intermediate = va_arg(va,const char*); |
33 | root_so = va_arg(va,const char*); | 33 | root_so = va_arg(va,const char*); |
34 | component = va_arg(va,const char*); | 34 | component = va_arg(va,const char*); |
35 | break; | 35 | break; |
@@ -321,16 +321,17 @@ | |||
321 | <%codemethod string strip_roots(const string& filename) %> | 321 | <%codemethod string strip_roots(const string& filename) %> |
322 | string np = konforka::normalize_path(filename); | 322 | string np = konforka::normalize_path(filename); |
323 | try{ | 323 | try{ |
324 | return sitecing::strip_prefix(np,root_source); | 324 | return sitecing::strip_prefix(np,root_source); |
325 | }catch(sitecing::utility_no_prefix& e){ } | 325 | }catch(sitecing::utility_no_prefix& e){ } |
326 | try{ | 326 | try{ |
327 | return sitecing::strip_prefix(np,root_intermediate); | 327 | return sitecing::strip_prefix(np,root_intermediate); |
328 | }catch(sitecing::utility_no_prefix& e){ } | 328 | }catch(sitecing::utility_no_prefix& e){ } |
329 | return np; | ||
329 | </%codemethod> | 330 | </%codemethod> |
330 | <%codemethod string remove_roots(const string& str) %> | 331 | <%codemethod string remove_roots(const string& str) %> |
331 | string rv = str; | 332 | string rv = str; |
332 | string::size_type rp; | 333 | string::size_type rp; |
333 | string::size_type rl = root_source.length(); | 334 | string::size_type rl = root_source.length(); |
334 | while((rp=rv.find(root_source))!=string::npos) { | 335 | while((rp=rv.find(root_source))!=string::npos) { |
335 | rv.erase(rp,rl); | 336 | rv.erase(rp,rl); |
336 | } | 337 | } |