Changeset 7379

Timestamp:

2004-05-24T14:55:33+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Allow some browser classes to be easily switched off. Also added a clone function to every browser class.

Location:

trunk/gsdl/src/recpt

Files:

• browserclass.h (modified) (1 diff)
• datelistbrowserclass.cpp (modified) (3 diffs)
• datelistbrowserclass.h (modified) (3 diffs)
• gsdl_modules_cfg.h (modified) (2 diffs)
• htmlbrowserclass.cpp (modified) (3 diffs)
• htmlbrowserclass.h (modified) (2 diffs)
• invbrowserclass.cpp (modified) (1 diff)
• invbrowserclass.h (modified) (1 diff)
• pagedbrowserclass.cpp (modified) (3 diffs)
• pagedbrowserclass.h (modified) (3 diffs)
• phindbrowserclass.cpp (modified) (2 diffs)
• phindbrowserclass.h (modified) (2 diffs)

trunk/gsdl/src/recpt/browserclass.h

@@ -59 +59 @@
   // before any other methods are called
   virtual bool init (ostream &logout);
+
+  virtual browserclass* clone() = 0;
 
   // returns the name that specifies the browserclass type

trunk/gsdl/src/recpt/datelistbrowserclass.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_DATELIST_BROWSER
+
 #include "datelistbrowserclass.h"
 #include <assert.h>
@@ -36 +39 @@
 text_t datelistbrowserclass::get_browser_name () {
   return "DateList";
+}
+
+browserclass* datelistbrowserclass::clone()
+{
+  return new datelistbrowserclass();
 }
 
@@ -159 +167 @@
   return 1;
 }
+
+#endif //GSDL_USE_DATELIST_BROWSER

trunk/gsdl/src/recpt/datelistbrowserclass.h

@@ -24 +24 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_DATELIST_BROWSER
 
 #ifndef DATELISTBROWSERCLASS_H
@@ -38 +40 @@
 
   text_t get_browser_name ();
+
+  virtual browserclass* clone();
 
   virtual void load_metadata_defaults (text_tset &metadata);
@@ -56 +60 @@
 };
 
-#endif
+#endif //DATELISTBROWSERCLASS_H
+#endif //GSDL_USE_DATELIST_BROWSER

trunk/gsdl/src/recpt/gsdl_modules_cfg.h

@@ -65 +65 @@
 #define GSDL_USE_STATUS_ACTION
 #define GSDL_USE_TIP_ACTION
+#define GSDL_USE_USERS_ACTION
 
 //BROWSER MODULES
@@ -70 +71 @@
 #undef  GSDL_USE_TREE_EX_CLASSIFIER_BROWSER
 #undef  GSDL_USE_CLONE_BROWSER
-#undef  GSDL_USE_DATELIST_BROWSER
-#undef  GSDL_USE_HTML_BROWSER
-#undef  GSDL_USE_PAGED_BROWSER
+#define GSDL_USE_DATELIST_BROWSER
+#define GSDL_USE_HTML_BROWSER
+#define GSDL_USE_PAGED_BROWSER
+#define GSDL_USE_PHIND_BROWSER
 
 //FILTERS

trunk/gsdl/src/recpt/htmlbrowserclass.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_HTML_BROWSER
+
 #include "htmlbrowserclass.h"
 #include <assert.h>
@@ -37 +40 @@
 text_t htmlbrowserclass::get_browser_name () {
   return "HTML";
+}
+
+browserclass* htmlbrowserclass::clone()
+{
+  return new htmlbrowserclass();
 }
 
@@ -62 +70 @@
   args["hp"] = response.docInfo[0].OID;
 }
+
+#endif //GSDL_USE_HTML_BROWSER

trunk/gsdl/src/recpt/htmlbrowserclass.h

@@ -24 +24 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_HTML_BROWSER
 
 #ifndef HTMLBROWSERCLASS_H
@@ -44 +46 @@
            ostream &logout);
 
-
+  virtual browserclass* clone();
 };
 
-#endif
+#endif //!HTMLBROWSERCLASS_H
+#endif //GSDL_USE_HTML_BROWSER

trunk/gsdl/src/recpt/invbrowserclass.cpp

@@ -38 +38 @@
   return "Invisible";
 }
+
+browserclass* invbrowserclass::clone()
+{
+  return new invbrowserclass();
+}

trunk/gsdl/src/recpt/invbrowserclass.h

@@ -45 +45 @@
   text_t get_browser_name ();
 
+  virtual browserclass* clone();
 };
 

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_PAGED_BROWSER
+
 #include "pagedbrowserclass.h"
 #include <assert.h>
@@ -40 +43 @@
 }
 
+browserclass* pagedbrowserclass::clone()
+{
+  return new pagedbrowserclass();
+}
 
 void pagedbrowserclass::load_metadata_defaults (text_tset &metadata) {
@@ -189 +196 @@
   return 0;
 }
+
+#endif //GSDL_USE_PAGED_BROWSER

trunk/gsdl/src/recpt/pagedbrowserclass.h

@@ -24 +24 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_PAGED_BROWSER
 
 #ifndef PAGEDBROWSERCLASS_H
@@ -40 +42 @@
   // returns the name that specifies the browserclass type
   virtual text_t get_browser_name ();
+
+  virtual browserclass* clone();
 
   void load_metadata_defaults (text_tset &metadata);
@@ -61 +65 @@
 };
 
-#endif
+#endif //!PAGEDBROWSERCLASS_H
+#endif //GSDL_USE_PAGED_BROWSER

trunk/gsdl/src/recpt/phindbrowserclass.cpp

@@ -26 +26 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_PHIND_BROWSER
+
 #include "phindbrowserclass.h"
 #include <assert.h>
@@ -41 +44 @@
 }
 
+browserclass* phindbrowserclass::clone()
+{
+  return new phindbrowserclass();
+}
 
-
+#endif //GSDL_USE_PHIND_BROWSER

trunk/gsdl/src/recpt/phindbrowserclass.h

@@ -26 +26 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
+#ifdef GSDL_USE_PHIND_BROWSER
+
 // The phindbrowserclass is necessary to add a phind classifier to the user
 // interface and navigation bar, but is basically empty - all the work is
@@ -49 +52 @@
   virtual text_t get_browser_name ();
 
+  virtual browserclass* clone();
+
 };
 
-#endif
+#endif //!PHINDBROWSERCLASS_H
+#endif //GSDL_USE_PHIND_BROWSER