Changeset 7762

Timestamp:

2004-07-19T16:31:09+12:00 (20 years ago)

Author:

davidb

Message:

'gliapplet' flag added -- in comparable style of 'collector' flag --
to control whether applet version of GLI is enabled/disabled in
greenstone installation.

CVS: ----------------------------------------------------------------------

Location:

trunk/gsdl/src/recpt

Files:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -45 +45 @@
   collector_disabled = true;
   translator_disabled = true;
+  gliapplet_disabled = true;
   recpt = NULL;
 
@@ -730 +731 @@
   // _textgoadmin_         set to "" if status is disabled in main.cfg
   // _textgotranslator_    set to "" if translator is disabled in main.cfg
+  // _textgogliapplet_     set to "" if gliapplet is disabled in main.cfg
 
 
@@ -812 +814 @@
       set_collectionlist_macro (disp, protos, logout);
     }
+
+  } else if (arg_p == "gli") {
+    if (gliapplet_disabled) disp.setmacro ("gliapplet", "gli", "");
 
   } else if (arg_p == "homepref") {
@@ -1029 +1034 @@
          (cfgline[0] == "true" || cfgline[0] == "on" || cfgline[0] == "enabled")) {
     translator_disabled = false;
-  } else {
+  } else if ((key == "gliapplet") && (cfgline.size() == 1) && 
+         (cfgline[0] == "true" || cfgline[0] == "on" || cfgline[0] == "enabled")) {
+    gliapplet_disabled = false;
+  }
+  else {
     // call the parent class to deal with the things which
     // are not dealt with here

trunk/gsdl/src/recpt/pageaction.h

@@ -96 +96 @@
   bool collector_disabled;
   bool translator_disabled;
+  bool gliapplet_disabled;
 
 };