Changeset 27363 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2013-05-16T18:37:30+12:00 (11 years ago)

Author:

ak19

Message:

If you add in the line 'format AllowUserComments true' into a collection's collect.cfg, you can now control whether the User Comments section appears on a document page or not. The runtime-src/src/recpt/documentaction.cpp defines an internal macro for the document package called allowusercomments and this is then checked for in macros/document.dm.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/documentaction.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/documentaction.cpp

@@ -728 +728 @@
   // must have a valid collection server to continue
 
-   text_t &collection = args["c"];
+  // _allowusercomments_      Whether the User Comments area is to be shown for this doc or not
+
+  text_t &collection = args["c"];
   if (collection.empty()) return;
   recptproto *collectproto = protos->getrecptproto (collection, logout);
@@ -783 +785 @@
     //do not display relation metadata
     disp.setmacro ("relateddoc", "document", "");  
-       
+
+    // Whether the UserComments section is supposed to be displayed when a document is loaded or not
+    if (collectproto != NULL) {
+      ColInfoResponse_t *cinfo = NULL;
+
+      cinfo = recpt->get_collectinfo_ptr (collectproto, collection, logout);
+      
+      text_tmap::const_iterator user_comments_it = cinfo->format.find ("AllowUserComments");
+      if ((user_comments_it != cinfo->format.end()) && ((*user_comments_it).second == "true")) {
+    disp.setmacro ("allowusercomments", "document", "1"); // document package
+    //disp.setmacro ("allowusercomments", displayclass::defaultpackage, "1"); // Global
+      }
+    }
+   
     //if preferences indicate relevant docs should be collected
     //and there is no particular format specified then display