Changeset 7432 for trunk/gsdl/src/recpt/librarymain.cpp

Timestamp:

2004-05-25T16:31:41+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Added language parameter to all calls of get_info, get_children, has_children, and get_contents. Also, removed some of the modifications so it compiles again.

File:

• trunk/gsdl/src/recpt/librarymain.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/librarymain.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#include "gsdl_modules_cfg.h"
 #include "receptionist.h"
 #include "cgiwrapper.h"
+#include "recptconfig.h"
 #include "fileutil.h"
 #include "nullproto.h"
@@ -53 +55 @@
 #include "usersaction.h"
 #include "extlinkaction.h"
+
+#ifdef GSDL_USE_EXPORT_ACTION
+#include "exportaction.h"
+#endif
+
+#ifdef GSDL_USE_CL_DISPLAY_ACTION
+#include "cldisplayaction.h"
+#endif
+
+#ifdef GSDL_USE_COURSES_ACTION
+#include "coursesaction.h"
+#endif
+
+#ifdef GSDL_USE_COMPOSITION_ACTION
+#include "compositionaction.h"
+#endif
+
+#ifdef GSDL_USE_INDEX_BROWSE_ACTION
+#include "indexbrowseaction.h"
+#endif
+
+#ifdef GSDL_USE_DIR_BROWSE_ACTION
+#include "dirbrowseaction.h"
+#endif
+
+#ifdef GSDL_USE_GENERATOR_ACTION
+#include "generatoraction.h"
+#endif
+
 #include "tipaction.h"
 #include "collectoraction.h"
 #include "browseaction.h"
 #include "phindaction.h"
-#if defined(USE_LANGACTION)
+#if defined(GSDL_USE_LANG_ACTION)
 #include "langaction.h"
 #endif
@@ -69 +100 @@
 #include "htmlbrowserclass.h"
 #include "phindbrowserclass.h"
+
+#ifdef GSDL_USE_CLASSIFIER_BROWSER
+//classifier browsers
+
+#include "treeclassifierbrowserclass.h"
+#ifdef GSDL_USE_TREE_EX_CLASSIFIER_BROWSER
+#include "treeexclassifierbrowserclass.h"
+#endif
+
+#endif //GSDL_USE_CLASSIFIER_BROWSER
 
 int main () {
@@ -113 +154 @@
 #endif
 
+#ifdef GSDL_USE_TIP_ACTION
   // the list of actions. Note: these actions will become invalid
-  // at the end of this function.
-  tipaction atipaction;
-  recpt.add_action (&atipaction);
-
-  statusaction astatusaction;
-  astatusaction.set_receptionist (&recpt);
-  recpt.add_action (&astatusaction);
-
-  pageaction apageaction;
-  apageaction.set_receptionist (&recpt);
-  recpt.add_action (&apageaction);
-
-  pingaction apingaction;
-  recpt.add_action (&apingaction);
-
-  queryaction aqueryaction;
-  aqueryaction.set_receptionist (&recpt);
-  recpt.add_action (&aqueryaction);
-
-  documentaction adocumentaction;
-  adocumentaction.set_receptionist (&recpt);
-  recpt.add_action (&adocumentaction);
-
-  usersaction ausersaction;
-  recpt.add_action (&ausersaction);
-
-  extlinkaction anextlinkaction;
-  recpt.add_action (&anextlinkaction);
-
-  authenaction aauthenaction;
-  aauthenaction.set_receptionist(&recpt);
-  recpt.add_action (&aauthenaction);
-
-  collectoraction acollectoraction;
-  acollectoraction.set_receptionist (&recpt);
-  recpt.add_action(&acollectoraction);
-
-  browseaction abrowseaction;
-  abrowseaction.set_receptionist (&recpt);
-  recpt.add_action(&abrowseaction);
-
-  phindaction aphindaction;
-  recpt.add_action(&aphindaction);
-
-#if defined(USE_LANGACTION)
-  langaction alangaction;
-  alangaction.set_receptionist(&recpt);
-  recpt.add_action(&alangaction);
+  // at the end of this function. We will clean them.
+  recpt.add_action (new tipaction());
+#endif
+
+#ifdef GSDL_USE_STATUS_ACTION
+  statusaction *astatusaction = new statusaction();
+  astatusaction->set_receptionist (&recpt);
+  recpt.add_action (astatusaction);
+#endif
+
+  pageaction *apageaction = new pageaction();
+  apageaction->set_receptionist (&recpt);
+  recpt.add_action (apageaction);
+
+#ifdef GSDL_USE_PING_ACTION
+  recpt.add_action (new pingaction());
+#endif
+
+  queryaction *aqueryaction = new queryaction();
+  aqueryaction->set_receptionist (&recpt);
+  recpt.add_action (aqueryaction);
+        
+  documentaction *adocumentaction = new documentaction();
+  adocumentaction->set_receptionist (&recpt);
+  recpt.add_action (adocumentaction);
+
+#ifdef GSDL_USE_USERS_ACTION
+  recpt.add_action (new usersaction());
+#endif
+
+#ifdef GSDL_USE_EXTLINK_ACTION
+  recpt.add_action (new extlinkaction());
+#endif
+        
+#ifdef GSDL_USE_AUTHEN_ACTION
+  authenaction *aauthenaction = new authenaction();
+  aauthenaction->set_receptionist(&recpt);
+  recpt.add_action (aauthenaction);
+#endif
+
+#ifdef GSDL_USE_COLLECTOR_ACTION
+  collectoraction *acollectoraction = new collectoraction();
+  acollectoraction->set_receptionist (&recpt);
+  recpt.add_action(acollectoraction);
+#endif
+
+#ifdef GSDL_USE_BROWSE_ACTION
+  browseaction *abrowseaction = new browseaction();
+  abrowseaction->set_receptionist (&recpt);
+  recpt.add_action(abrowseaction);
+#endif
+
+#ifdef GSDL_USE_PHIND_ACTION
+  recpt.add_action(new phindaction());
+#endif
+
+#ifdef GSDL_USE_LANG_ACTION
+  langaction *alangaction = new langaction();
+  alangaction->set_receptionist(&recpt);
+  recpt.add_action(alangaction);
 #endif
 
   // list of browsers
   vlistbrowserclass avlistbrowserclass;
+  avlistbrowserclass.set_receptionist(&recpt);
   recpt.add_browser (&avlistbrowserclass);
   recpt.setdefaultbrowser ("VList");
 
   hlistbrowserclass ahlistbrowserclass;
+  ahlistbrowserclass.set_receptionist(&recpt);
   recpt.add_browser (&ahlistbrowserclass);
 
+#ifdef GSDL_USE_DATELIST_BROWSER
   datelistbrowserclass adatelistbrowserclass;
   recpt.add_browser (&adatelistbrowserclass);
+#endif
 
   invbrowserclass ainvbrowserclass;
   recpt.add_browser (&ainvbrowserclass);
 
+#ifdef GSDL_USE_PAGED_BROWSER
   pagedbrowserclass apagedbrowserclass;
   recpt.add_browser (&apagedbrowserclass);
-
+#endif
+
+#ifdef GSDL_USE_HTML_BROWSER
   htmlbrowserclass ahtmlbrowserclass;
   recpt.add_browser (&ahtmlbrowserclass);
-
+#endif
+
+#ifdef GSDL_USE_PHIND_BROWSER
   phindbrowserclass aphindbrowserclass;
   recpt.add_browser (&aphindbrowserclass);
+#endif
+
+#ifdef GSDL_USE_CLASSIFIER_BROWSER
+  //list of classifier browsers
+  CTreeClassifierBrowserClass *pTreeClassifierBrowser = new CTreeClassifierBrowserClass();
+  if (pTreeClassifierBrowser != NULL) {
+    recpt.GetClassifierBrowsers().AddBrowser(pTreeClassifierBrowser);
+    recpt.GetClassifierBrowsers().SetDefaultBrowser(pTreeClassifierBrowser->GetBrowserName());
+  }
+#ifdef GSDL_USE_TREE_EX_CLASSIFIER_BROWSER
+  CTreeExClassifierBrowserClass *pTreeExClassifierBrowser = new CTreeExClassifierBrowserClass();
+  if (pTreeExClassifierBrowser != NULL) {
+    recpt.GetClassifierBrowsers().AddBrowser(pTreeExClassifierBrowser);
+  }
+#endif //GSDL_USE_TREE_EX_CLASSIFIER_BROWSER
+#endif //GSDL_USE_CLASSIFIER_BROWSER
 
   cgiwrapper (recpt, "");
   delete cservers;
+
+  // clean up the actions
+  actionmapclass::iterator thisAction = recpt.get_actionmap_ptr()->begin();
+  actionmapclass::iterator endAction = recpt.get_actionmap_ptr()->begin();
+  while (thisAction != endAction) {
+    delete thisAction->second.a; thisAction->second.a = NULL;
+    ++thisAction;
+  }
+  thisAction = recpt.get_actionmap_ptr()->begin();
+  recpt.get_actionmap_ptr()->erase(thisAction, endAction);
   return 0;
 }