Changeset 1438 for trunk

Timestamp:

2000-08-21T22:40:55+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl

Files:

• bin/script/build (modified) (6 diffs)
• lib/fileutil.cpp (modified) (1 diff)
• macros/collect.dm (modified) (2 diffs)
• src/recpt/collectoraction.cpp (modified) (4 diffs)

trunk/gsdl/bin/script/build

@@ -3 +3 @@
 # This perl script may be called directly or by running build.bat on
 # windows (build.bat is in bin\windows)
+
+use FileHandle;
 
 BEGIN {
@@ -11 +13 @@
     "run setup.bat (windows)?\n" unless defined $ENV{'GSDLOS'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
+
+    STDOUT->autoflush(1);
+    STDERR->autoflush(1);
 }
 
 use parsargv;
 use util;
-use FileHandle;
 
 if (!parsargv::parse(\@ARGV, 
@@ -153 +157 @@
         print $out "       or archives data. Try downloading an unbuilt version\n";
         print $out "       of the collection from www.nzdl.org\n";
+        &final_out (1) if $use_out;
         die "\n";
     }
     }
+    &final_out (0) if $use_out;
 }
 
@@ -177 +183 @@
     }
     } else {
+    &final_out (2) if $use_out;
     die "\nimport.pl failed\n";
     }
@@ -200 +207 @@
     }
     } else {
+    &final_out (2) if $use_out;
     die "\nbuildcol.pl failed\n";
     }
@@ -239 +247 @@
     &util::rm ($file);
 }
+
+# creates a file called $outfile.final (should only be called if -out option
+# is used and isn't STDERR or STDOUT) and writes an output code to it.
+# An output code of 0 specifies that there was no error
+sub final_out {
+    my ($exit_code) = @_;
+
+    if (open (FINAL, ">$outfile.final")) {
+    print FINAL $exit_code;
+    close FINAL;
+    }
+}

trunk/gsdl/lib/fileutil.cpp

@@ -263 +263 @@
   ifstream file_in (filenamec);
   if (file_in) {
-    file_in.seekg (256, ios::end);
+    file_in.seekg (-256, ios::end);
     char c;
     file_in.get(c);
     while (!file_in.eof()) {
-      if (c == '\n') return_str.clear();
-      else return_str.push_back (c);
+      if (c == '\n') {
+    file_in.get(c);
+    if (!file_in.eof()) {
+      return_str.clear();
+      if (c == '\\') return_str.push_back ('\\');
+      return_str.push_back (c);
+    }
+      } else {
+    if (c == '\\') return_str.push_back ('\\');
+    return_str.push_back (c);
+      }
       file_in.get(c);
     }
     file_in.close();
+
   }
   delete filenamec;

trunk/gsdl/macros/collect.dm

@@ -630 +630 @@
 }
 
-_bildstatusscriptextra_ {}
+# special header for status page
+_bildstatusheader_ {_cgihead_
+_htmlhead_(background="_httpiconchalk_" onLoad="initialize();")_startspacer_
+}
+_bildstatusheader_[v=1] {_cgihead_
+_htmlhead_(onLoad="initialize();")
+}
+
+_bildstatusscriptextra_ {
+var timer = 5;
+function initialize() \{
+  setTimeout("count_down()",1000);
+\}
+
+function count_down() \{
+  if (timer==0) \{
+    document.collectorform.submit();
+  \} else \{
+    window.status = "Building status update in  "+timer+" seconds";
+    timer--;
+    setTimeout("count_down()",1000);
+  \}    
+\}
+}
+
 _bildstatuscontent_ {
+<form name="collectorform" method=post action="_gwcgi_">
+<input type=hidden name="e" value="_decodedcompressedoptions_">
 <center>
 <table width=_pagewidth_>
@@ -638 +664 @@
 </td></tr>
 </table></center>
+</form>
 }
 

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -238 +238 @@
                      ostream &logout) {
 
-  if (args["cp"] != "intro") {
+  text_t &current_page = args["cp"];
+
+  if (current_page != "intro") {
     // authenticate the user if authentication is available
     args["uan"] = 1;
@@ -276 +278 @@
     // turned on).
     update_cfgfile_clone (args, logout);
+  }
+
+  if (current_page == "bildstatus") {
+    // if .final file exists then build has finished
+    text_t fbld = filename_cat (gsdlhome, "tmp", args["bc1dirname"] + ".bld.final");
+    if (file_exists (fbld)) {
+      char *fbldc = fbld.getcstr();
+      ifstream fbld_in (fbldc);
+      if (fbld_in) {
+    char c = fbld_in.get();
+    fbld_in.close();
+    if (c == '0') current_page = "bilddone";
+    else current_page = "bildfail";
+      } else {
+    // assume build failed (we shouldn't get here though ... right?)
+    current_page = "bildfail";
+      }
+      delete fbldc;
+    }
   }
 
@@ -644 +665 @@
   // _cfgfile_ -- if displaying the "configure collection" page
   // _statusline_ -- if displaying the bildstatus page
-  // _pagebanner_ -- may be set to _collector:plainbanner_ for some pages
+  // _header_ -- may be set for pages that require it
 
   text_t &collector_page = args["cp"];
@@ -653 +674 @@
   disp.setmacro ("pagescriptextra", "collector", "_" + collector_page + "scriptextra_");
 
-  // set _pagebanner_ for those pages that don't want a fancy header (e.g. those
-  // displayed in frames
   if (collector_page == "bildstatus") {
-    disp.setmacro ("pagebanner", "collector", "_plainbanner_");
+    disp.setmacro ("header", "collector", "_" + collector_page + "header_");
   }