Changeset 2370

Timestamp:

2001-05-07T15:27:02+12:00 (23 years ago)

Author:

sjboddie

Message:

The collector will now add a "This collection contains n documents"
sentence to the about text of each collection it builds.

Location:

trunk/gsdl

Files:

• macros/english.dm (modified) (1 diff)
• src/recpt/collectoraction.cpp (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (1 diff)

trunk/gsdl/macros/english.dm

@@ -57 +57 @@
 _collectionextra_ {This collection contains _about:numdocs_ documents. 
 It was last built _about:builddate_ days ago.}
+
+# this is only used by the collector (where the above _collectionextra_
+# macro will always be set to another value)
+_collectorextra_ {
+<p>This collection contains _numdocs_ _If_("_numdocs_" eq "1",document,documents), a total of _numbytes_.
+}
 
 _textimagecollection_ {}

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1404 +1404 @@
   text_t options = "-creator \"" + args["bc1contactemail"] + "\"";
   options += " -title \"" + args["bc1fullname"] + "\"";
-  options += " -about \"" + carriage_replace (args["bc1aboutdesc"], 0) + "\"";
+  options += " -about \"" + carriage_replace (args["bc1aboutdesc"] + "_collectorextra_", 0) + "\"";
   options += " -collectdir \"" + tmpdir + "\" ";
   text_t optionfile = filename_cat (tmpdir, "mkcol.opt");

trunk/gsdl/src/recpt/pageaction.cpp

@@ -337 +337 @@
   if (collectproto != NULL) {
     cinfo = recpt->get_collectinfo_ptr (collectproto, arg_c, logout);
-
+    
     disp.setmacro ("numdocs", "Global", cinfo->numDocs);
     unsigned long current_time = time(NULL);
     unsigned long builddate = (current_time - cinfo->buildDate) / 86400;
     disp.setmacro ("builddate", "Global", builddate);
-
+    
+    text_t numbytes;
+    if ((cinfo->numBytes/(1024*1024)) > 1) {
+      numbytes = (text_t)(cinfo->numBytes/(1024*1024)) + " Mb";
+    } else if ((cinfo->numBytes/1024) > 1) {
+      numbytes = (text_t)(cinfo->numBytes/1024) + " kb";
+    } else {
+      numbytes = (text_t)cinfo->numBytes + " bytes";
+    }
+    disp.setmacro("numbytes", "Global", numbytes);
   }