Changeset 604

Timestamp:

1999-09-17T16:46:06+12:00 (25 years ago)

Author:

sjboddie

Message:

fixed a couple of problems with 'unknown' classifier

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (2 diffs)
• pageaction.cpp (modified) (3 diffs)
• pageaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.25  1999/09/17 04:46:05  sjboddie
+   fixed a couple of problems with 'unknown' classifier
+
    Revision 1.24  1999/09/17 04:00:26  sjboddie
    tidied up navigation bar to produce a default "unknown" button if
@@ -688 +691 @@
       if (get_info (classtop, collection, metadata, false, collectproto, response, logout)) {
       
-    text_t &title = response.docInfo[0].metadata[0].values[0];
+    text_t title = response.docInfo[0].metadata[0].values[0];
     text_t &classifytype = response.docInfo[0].metadata[1].values[0];
+
+    text_tset::const_iterator it = classify_meta.find (title);
+    if (it == classify_meta.end()) title = "Unknown";
 
     disp.setmacro ("pagetitle", "document", "_text" + title + "page_");

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.15  1999/09/17 04:46:05  sjboddie
+   fixed a couple of problems with 'unknown' classifier
+
    Revision 1.14  1999/09/07 23:08:09  rjmcnab
    Removed some compiler warnings
@@ -117 +120 @@
 pageaction::~pageaction () {
 }
+
+
+bool pageaction::init (ostream &logout) {
+
+  // classify_meta should contain names of all classifiers supported
+  // by this receptionist. classifications using metadata names not
+  // in this list will be displayed as "unknown"
+  classify_meta.insert ("Title");
+  classify_meta.insert ("List");
+  classify_meta.insert ("Creator");
+  classify_meta.insert ("Series");
+  classify_meta.insert ("Date");
+  classify_meta.insert ("Subject");
+  classify_meta.insert ("Organization");
+  classify_meta.insert ("Howto");
+  classify_meta.insert ("Topic");
+  classify_meta.insert ("Browse");
+  classify_meta.insert ("People");
+
+  return action::init (logout);
+}
+
 
 bool pageaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &/*args*/, 
@@ -255 +280 @@
 
     while (here != end) {
-      const text_t &title = (*here).metadata[0].values[0];
+      text_t title = (*here).metadata[0].values[0];
+
+      text_tset::const_iterator it = classify_meta.find (title);
+      if (it == classify_meta.end()) title = "Unknown";
+
       shorttext += "<li>_text" + title + "short_\n";
       longtext += "_text" + title + "long_";

trunk/gsdl/src/recpt/pageaction.h

@@ -41 +41 @@
   receptionist *recpt;
 
+  text_tset classify_meta;
+
 public:
   pageaction ();
   virtual ~pageaction ();
+
+  bool init (ostream &logout);
 
   text_t get_action_name () {return "p";}