Changeset 2785 for trunk/gsdl/src

Timestamp:

2001-10-09T17:21:29+13:00 (23 years ago)

Author:

sjboddie

Message:

The build process now creates a summary of how many files were included,
which were rejected, etc. A link to a page containing this summary is
provided from the final page of the collector (once the collection is built
successfully) and from the default "about this collection" text for
collections built by the collector.

Also did a little bit of tidying in a couple of places

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (4 diffs)
• pageaction.cpp (modified) (7 diffs)
• pageaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1030 +1030 @@
   // _faillog_ - set to last 6 lines of .bld file if build failed
   // _gsdlhome_ - the gsdlhome path (dm_safe)
-
   // _sourcelist_ -- "input source" text boxes
   // _badsources_ -- will be set to "1" if we've come from the 
@@ -1154 +1153 @@
     collectorbar += get_button (collector_page, "grey", "view", false);
   }
+
+  collectorbar += "</tr></table>\n";
+  disp.setmacro ("collectorbar", "collector", collectorbar);
 
   if (collector_page == "bildfail") {
@@ -1175 +1177 @@
     disp.setmacro ("faillog", "collector", dm_safe(faillog));
   }
-
-  collectorbar += "</tr></table>\n";
-  disp.setmacro ("collectorbar", "collector", collectorbar);
 
   if (collector_page == "srce" || collector_page == "existing") 
@@ -1659 +1658 @@
   }
     
+  text_t collectdir = get_collectdir (args);
+
   // set up build options
   text_t options = "-make_writable -remove_import -out \"";
   options += filename_cat (tmpdir, collection + ".bld");
-  options += "\" -collectdir \"" + get_collectdir (args) + "\"";
+  options += "\" -collectdir \"" + collectdir + "\" -statsfile \"";
+  options += filename_cat(collectdir, collection, "etc", "import.log") + "\"";
 
   if (args["bc1esrce"] == 1) {

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 #include "receptionist.h"
 #include "fileutil.h"
+#include "gsdltools.h"
 #include <time.h>
 
@@ -327 +328 @@
 }
 
+void pageaction::set_macro_to_file_contents (displayclass &disp, const text_t &macroname,
+                         const text_t &packagename, const text_t &filename) {
+
+  text_t filecontent;
+  char *filenamec = filename.getcstr();
+  ifstream file_in (filenamec);
+  delete filenamec;
+  if (file_in) {
+    char c;
+    file_in.get(c);
+    while (!file_in.eof ()) {
+      if (c == '\n') filecontent += "<br>";
+      filecontent.push_back(c);
+      file_in.get(c);
+    }
+    file_in.close();
+  }
+  disp.setmacro (macroname, packagename, dm_safe(filecontent));
+}
+
 void pageaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                      recptprotolistclass *protos, ostream &logout) {
@@ -383 +404 @@
   // if page is "docs"
   // _documentation_       links to PDF documents if they're available
+
+
+  // if page is "bsummary"
+  // _importlog_           set to contents of collections import.log file
+  // _faillog_             set to contents of collections fail.log file
 
   
@@ -418 +444 @@
   //setting _queryformcontent_ so that the query interface is consistent.
   if(arg_p == "about"){
-    text_t collection = args["c"];
-     //check that the protocol is alive
-    recptproto* colproto = protos->getrecptproto (collection, logout);
-    if(colproto == NULL) {
-      logout << "ERROR: Null collection protocol trying to query"
-         << collection.getcstr() << "\n";
-      return;
-    }
-    
-    //check the collection is responding/in place
-    ColInfoResponse_t *colinfo = recpt->get_collectinfo_ptr(colproto, collection,
-                                logout);
-    if(colinfo == NULL){
-      logout << "ERROR: Null returned for get_collectinfo_ptr on "
-         << collection.getcstr() << "in queryaction::define_query_interface\n";
-      return;
-    }
-    
-    
-    text_tmap::iterator check = colinfo->format.find("QueryInterface");
-    if(check != colinfo->format.end()){
-      if((*check).second=="DateSearch"){
-    text_t current = "_basicqueryform_ _datesearch_";
+    if (cinfo != NULL) {
+      text_tmap::iterator check = cinfo->format.find("QueryInterface");
+      if(check != cinfo->format.end()){
+    if((*check).second=="DateSearch"){
+      text_t current = "_basicqueryform_ _datesearch_";
     
-    disp.setmacro("queryformcontent","query",current);
-      }
-    }
-  }
-
-
+      disp.setmacro("queryformcontent","query",current);
+    }
+      }
+    }
+  }
 
   if (arg_p == "home") {
@@ -454 +461 @@
     if (collector_disabled) disp.setmacro ("textgocollector", "home", "");
   }
-
-
-  
   
   else if (arg_p == "preferences") {
@@ -462 +466 @@
     // _collectionoption_
 
-    if (args["ccs"] == "1" && collectproto != NULL && (cinfo->ccsCols.size() > 1)) {
+    if ((args["ccs"] == "1") && (cinfo->ccsCols.size() > 1)) {
       text_t collectionoption = "_textcollectionoption_";
       text_tarray::const_iterator col_here = cinfo->ccsCols.begin();
@@ -675 +679 @@
     set_documentation_macro (disp);
 
+  } else if (arg_p == "bsummary" && !arg_c.empty()) {
+
+    set_macro_to_file_contents (disp, "importlog", "bsummary",
+                filename_cat(gsdlhome, "collect", arg_c, "etc", "import.log"));
+    set_macro_to_file_contents (disp, "faillog", "bsummary",
+                filename_cat(gsdlhome, "collect", arg_c, "etc", "fail.log"));
   }
 }

trunk/gsdl/src/recpt/pageaction.h

@@ -75 +75 @@
   void set_documentation_macro (displayclass &disp);
 
+  void set_macro_to_file_contents (displayclass &disp, const text_t &macroname,
+                   const text_t &packagename, const text_t &filename);
+
   bool status_disabled;
   bool collector_disabled;