From 8e983b1cfbfbf532138ea0f5ad6e4e36dcf71555 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 30 May 2005 05:42:06 +0000 Subject: [PATCH] add -omit-complete --- pandaapp/src/indexify/indexParameters.cxx | 5 +- pandaapp/src/indexify/indexParameters.h | 3 + pandaapp/src/indexify/indexify.cxx | 97 +++++++++++++---------- 3 files changed, 61 insertions(+), 44 deletions(-) diff --git a/pandaapp/src/indexify/indexParameters.cxx b/pandaapp/src/indexify/indexParameters.cxx index bb7e107934..38a6d0d866 100644 --- a/pandaapp/src/indexify/indexParameters.cxx +++ b/pandaapp/src/indexify/indexParameters.cxx @@ -22,8 +22,8 @@ int max_index_width = 700; int max_index_height = 700; -int thumb_width = 100; -int thumb_height = 100; +int thumb_width = 150; +int thumb_height = 150; int thumb_caption_height = 12; int caption_font_size = 12; @@ -76,6 +76,7 @@ bool draw_frames = false; bool omit_roll_headers = false; DSearchPath cm_search; bool omit_full_links = false; +bool omit_complete = false; bool caption_frame_numbers = false; diff --git a/pandaapp/src/indexify/indexParameters.h b/pandaapp/src/indexify/indexParameters.h index 65f65ae7ed..7bd8c4df02 100644 --- a/pandaapp/src/indexify/indexParameters.h +++ b/pandaapp/src/indexify/indexParameters.h @@ -109,6 +109,9 @@ extern DSearchPath cm_search; // True to omit links to the full-size source images. extern bool omit_full_links; +// True to omit complete.htm +extern bool omit_complete; + // True to caption photos with just a frame number instead of the // whole image basename. This only works if the photo image filenames // consist of the roll directory name concatenated with a frame number. diff --git a/pandaapp/src/indexify/indexify.cxx b/pandaapp/src/indexify/indexify.cxx index 68a265e1cc..556c5f8fb2 100644 --- a/pandaapp/src/indexify/indexify.cxx +++ b/pandaapp/src/indexify/indexify.cxx @@ -169,6 +169,11 @@ Indexify() { "Omits links to the full-size images.", &Indexify::dispatch_none, &omit_full_links); + add_option + ("omit-complete", "", 0, + "Omits the complete.htm index file that lists all thumbnails at once.", + &Indexify::dispatch_none, &omit_complete); + add_option ("caption", "size[,spacing]", 0, "Specifies the font size in pixels of the thumbnail captions. If the " @@ -562,50 +567,52 @@ run() { } } - // Generate the complete index that browses all the roll directories - // at once. - Filename complete_filename(archive_dir, "html/complete.htm"); - nout << "Generating " << complete_filename << "\n"; - complete_filename.set_text(); - ofstream complete_html; - if (!complete_filename.open_write(complete_html)) { - nout << "Unable to write to " << complete_filename << "\n"; - exit(1); - } + if (!omit_complete) { + // Generate the complete index that browses all the roll directories + // at once. + Filename complete_filename(archive_dir, "html/complete.htm"); + nout << "Generating " << complete_filename << "\n"; + complete_filename.set_text(); + ofstream complete_html; + if (!complete_filename.open_write(complete_html)) { + nout << "Unable to write to " << complete_filename << "\n"; + exit(1); + } - complete_html - << "\n" - << "\n" - << "" << _front_title << "\n" - << "\n" - << "\n" - << "

" << _front_title << "

\n"; - - for (di = _roll_dirs.begin(); di != _roll_dirs.end(); ++di) { - RollDirectory *roll_dir = (*di); complete_html - << roll_dir->get_comment_html() - << roll_dir->get_index_html(); - } - - complete_html << "

\n"; - if (!up_icon.empty()) { - // Use an icon to go up. - Filename up_icon_href = compose_href("..", up_icon); - complete_html - << "\"return\n"; - } else { - // No up icon; use text to go up. + << "\n" + << "\n" + << "" << _front_title << "\n" + << "\n" + << "\n" + << "

" << _front_title << "

\n"; + + for (di = _roll_dirs.begin(); di != _roll_dirs.end(); ++di) { + RollDirectory *roll_dir = (*di); + complete_html + << roll_dir->get_comment_html() + << roll_dir->get_index_html(); + } + + complete_html << "

\n"; + if (!up_icon.empty()) { + // Use an icon to go up. + Filename up_icon_href = compose_href("..", up_icon); + complete_html + << "\"return\n"; + } else { + // No up icon; use text to go up. + complete_html + << "
Return to index\n"; + } + complete_html << "

\n"; + complete_html - << "
Return to index\n"; + << "\n" + << "\n"; } - complete_html << "

\n"; - - complete_html - << "\n" - << "\n"; - + // And finally, generate the index HTML file that sits on the top of // all of this. Filename index_filename(archive_dir, "index.htm"); @@ -638,8 +645,14 @@ run() { } index_html - << "\n" - << "(complete archive)\n" + << "\n"; + + if (!omit_complete) { + index_html + << "(complete archive)\n"; + } + + index_html << "\n" << "\n"; }