Browse Source

add -omit-complete

David Rose 20 years ago
parent
commit
8e983b1cfb

+ 3 - 2
pandaapp/src/indexify/indexParameters.cxx

@@ -22,8 +22,8 @@
 int max_index_width = 700;
 int max_index_width = 700;
 int max_index_height = 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 thumb_caption_height = 12;
 int caption_font_size = 12;
 int caption_font_size = 12;
@@ -76,6 +76,7 @@ bool draw_frames = false;
 bool omit_roll_headers = false;
 bool omit_roll_headers = false;
 DSearchPath cm_search;
 DSearchPath cm_search;
 bool omit_full_links = false;
 bool omit_full_links = false;
+bool omit_complete = false;
 bool caption_frame_numbers = false;
 bool caption_frame_numbers = false;
 
 
 
 

+ 3 - 0
pandaapp/src/indexify/indexParameters.h

@@ -109,6 +109,9 @@ extern DSearchPath cm_search;
 // True to omit links to the full-size source images.
 // True to omit links to the full-size source images.
 extern bool omit_full_links;
 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
 // True to caption photos with just a frame number instead of the
 // whole image basename.  This only works if the photo image filenames
 // whole image basename.  This only works if the photo image filenames
 // consist of the roll directory name concatenated with a frame number.
 // consist of the roll directory name concatenated with a frame number.

+ 55 - 42
pandaapp/src/indexify/indexify.cxx

@@ -169,6 +169,11 @@ Indexify() {
      "Omits links to the full-size images.",
      "Omits links to the full-size images.",
      &Indexify::dispatch_none, &omit_full_links);
      &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
   add_option
     ("caption", "size[,spacing]", 0,
     ("caption", "size[,spacing]", 0,
      "Specifies the font size in pixels of the thumbnail captions.  If the "
      "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);
-  }
-
-  complete_html
-    << "<html>\n"
-    << "<head>\n"
-    << "<title>" << _front_title << "</title>\n"
-    << "</head>\n"
-    << "<body>\n"
-    << "<h1>" << _front_title << "</h1>\n";
+  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);
+    }
 
 
-  for (di = _roll_dirs.begin(); di != _roll_dirs.end(); ++di) {
-    RollDirectory *roll_dir = (*di);
     complete_html
     complete_html
-      << roll_dir->get_comment_html()
-      << roll_dir->get_index_html();
-  }
-
-  complete_html << "<p>\n";
-  if (!up_icon.empty()) {
-    // Use an icon to go up.
-    Filename up_icon_href = compose_href("..", up_icon);
-    complete_html 
-      << "<a href=\"../index.htm\"><img src=\"" << up_icon_href
-      << "\" alt=\"return to index\"></a>\n";
-  } else {
-    // No up icon; use text to go up.
+      << "<html>\n"
+      << "<head>\n"
+      << "<title>" << _front_title << "</title>\n"
+      << "</head>\n"
+      << "<body>\n"
+      << "<h1>" << _front_title << "</h1>\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 << "<p>\n";
+    if (!up_icon.empty()) {
+      // Use an icon to go up.
+      Filename up_icon_href = compose_href("..", up_icon);
+      complete_html 
+        << "<a href=\"../index.htm\"><img src=\"" << up_icon_href
+        << "\" alt=\"return to index\"></a>\n";
+    } else {
+      // No up icon; use text to go up.
+      complete_html
+        << "<br><a href=\"../index.htm\">Return to index</a>\n";
+    }
+    complete_html << "</p>\n";
+    
     complete_html
     complete_html
-      << "<br><a href=\"../index.htm\">Return to index</a>\n";
+      << "</body>\n"
+      << "</html>\n";
   }
   }
-  complete_html << "</p>\n";
-
-  complete_html
-    << "</body>\n"
-    << "</html>\n";
-
+    
   // And finally, generate the index HTML file that sits on the top of
   // And finally, generate the index HTML file that sits on the top of
   // all of this.
   // all of this.
   Filename index_filename(archive_dir, "index.htm");
   Filename index_filename(archive_dir, "index.htm");
@@ -638,8 +645,14 @@ run() {
   }
   }
 
 
   index_html
   index_html
-    << "</ul>\n"
-    << "<a href=\"html/complete.htm\">(complete archive)</a>\n"
+    << "</ul>\n";
+
+  if (!omit_complete) {
+    index_html
+      << "<a href=\"html/complete.htm\">(complete archive)</a>\n";
+  }
+
+  index_html
     << "</body>\n"
     << "</body>\n"
     << "</html>\n";
     << "</html>\n";
 }
 }