supply OCEAN env var more often; turn on single page if output is only --find-island

[ypp-sc-tools.web-live.git] / pctb / convert.c

diff --git a/pctb/convert.c b/pctb/convert.c
index 433b043a3dadd5a043f7f9087733c21262e12160..21445c563b6108ed117304c8a27fb9eb4fdd23ab 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -226,8 +226,14 @@ int main(int argc, char **argv) {
   /* Consequential changes to options */
 
   if (o_mode & mf_analyse) {
   /* Consequential changes to options */
 
   if (o_mode & mf_analyse) {

-    if (!o_outmode_kind)
-      o_outmode_kind= (o_flags & ff_printisland) ? omk_none : omk_str;
+    if (!o_outmode_kind) {
+      if (o_flags & ff_printisland) {
+       o_outmode_kind= omk_none;
+       o_flags |= ff_singlepage;
+      } else {
+       o_outmode_kind= omk_str;
+      }
+    }

 
     if (o_outmode_kind==omk_upload) {
       o_flags |= ffs_upload;
 
     if (o_outmode_kind==omk_upload) {
       o_flags |= ffs_upload;


@@ -264,12 +270,12 @@ int main(int argc, char **argv) {
   if (!ocean)  ocean=  o_ocean;
   if (!pirate) pirate= o_pirate;
   
   if (!ocean)  ocean=  o_ocean;
   if (!pirate) pirate= o_pirate;
   

-  if (o_flags & ff_needisland) {
+  if (o_flags & ff_needisland)

     if (!ocean)
       badusage("need --ocean option when replaying images"
               " (consider supplying --pirate too)");
     if (!ocean)
       badusage("need --ocean option when replaying images"
               " (consider supplying --pirate too)");

+  if (ocean)

     sysassert(! setenv("YPPSC_OCEAN",ocean,1) );
     sysassert(! setenv("YPPSC_OCEAN",ocean,1) );

-  }

   if (pirate && (o_flags & ff_dict_pirate))
     sysassert(! setenv("YPPSC_PIRATE",pirate,1) );
 
   if (pirate && (o_flags & ff_dict_pirate))
     sysassert(! setenv("YPPSC_PIRATE",pirate,1) );