Changeset 600

Timestamp:

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

Author:

sjboddie

Message:

tidied up navigation bar to produce a default "unknown" button if
it comes across metadata it can't display

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (8 diffs)
• documentaction.h (modified) (2 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.24  1999/09/17 04:00:26  sjboddie
+   tidied up navigation bar to produce a default "unknown" button if
+   it comes across metadata it can't display
+
    Revision 1.23  1999/09/07 04:56:54  sjboddie
    added GPL notice
@@ -134 +138 @@
 
 documentaction::documentaction () {
+
   // this action uses cgi variables "a", "d", "cl",
   // "x", "gc", "gt", "gp", and "hl"
@@ -218 +223 @@
 
 bool documentaction::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);
 }
@@ -266 +287 @@
 
 
+// set_widthtspace calculates how wide the spaces in the nav bar should
+// be and sets the appropriate macro
+void documentaction::set_spacemacro (displayclass &disp, const FilterResponse_t &response) {
+
+  text_t width;
+  int twidth, swidth, iwidth = 0;
+
+  int numc = response.docInfo.size();
+  ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
+  ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
+    
+  disp.expandstring ("Global", "_pagewidth_", width);
+  twidth = width.getint();
+      
+  disp.expandstring ("query", "_searchwidth_", width);
+  iwidth += width.getint();
+  
+  while (dochere != docend) {
+    text_t title = (*dochere).metadata[0].values[0];
+    text_tset::const_iterator it = classify_meta.find (title);
+    if (it == classify_meta.end()) title = "Unknown";
+
+    disp.expandstring ("document", "_" + title + "width_", width);
+    iwidth += width.getint();
+    dochere ++;
+  }
+  if ((twidth - iwidth) < numc) swidth = 2;
+  else {
+    swidth = twidth - iwidth;
+    if (numc > 0) swidth = swidth / numc;
+  }
+  disp.setmacro ("widthtspace", "Global", swidth);
+}
+
+// set_navbarmacros sets _navigationbar_, _javaimagesnavbar_ and _httpbrowseXXX_ macros
+void documentaction::set_navbarmacros (displayclass &disp, const FilterResponse_t &response, 
+                       cgiargsclass &args) {
+
+  text_t javaimagesnavbar, topparent;
+  text_t &arg_d = args["d"];
+  text_t navigationbar = "<!-- Navigation Bar -->\n";
+
+  get_top (args["cl"], topparent);
+  int numc = response.docInfo.size();
+  ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
+  ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
+
+  navigationbar += "<nobr>\n";
+  if (args["a"] == "q") {
+    navigationbar += "_icontabsearchgreen_";
+  } else {
+    navigationbar += "_imagesearch_";
+    javaimagesnavbar = "_javasearch_";
+  }
+  if (numc == 0) navigationbar += "_imagespacer_";
+    
+  while (dochere != docend) {
+    text_t title = (*dochere).metadata[0].values[0];
+    const text_t &classifytype = (*dochere).metadata[1].values[0];
+
+    text_tset::const_iterator it = classify_meta.find (title);
+    if (it == classify_meta.end()) title = "Unknown";
+      
+    // if we're inside a document all the classification buttons should be enabled
+    if (arg_d.empty() && ((*dochere).OID == topparent))
+      navigationbar += "_imagespacer__icontab" + title + "green_";
+    else {
+      navigationbar += "_imagespacer__image" + title + "_";
+      
+      // set the _httpbrowseXXX_ macro for this classification
+      text_t link;
+      if (classifytype == "HTML") 
+    link = "_httppagex_(html)&hp=" + (*dochere).OID + ".fc";
+      else 
+    link = "_httpdocument_&cl=" + (*dochere).OID;
+
+      if (classifytype == "AZList" || classifytype == "DateList") link += ".fc";
+      disp.setmacro ("httpbrowse" + title, "Global", link); 
+      
+    }
+    javaimagesnavbar += "_java" + title + "_";
+    dochere ++;
+  }
+  navigationbar += "\n</nobr>\n";
+  navigationbar += "<!-- End of Navigation Bar -->\n";
+  disp.setmacro ("navigationbar", "Global", navigationbar);
+  if (args.getintarg("v") == 0) 
+    disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);
+}
+
+
 // define all the macros which might be used by other actions
 // to produce pages. 
@@ -286 +398 @@
   // _javaimagesnavbar_  this is the javascript code to shove in to make the 
   //                     flashy images used by _navigationbar_ work
+
+  // _widthtspace_       the width of the spacers between buttons in navigation
+  //                     bar
   
 
@@ -296 +411 @@
   FilterResponse_t response;
   text_tarray metadata;
-  text_t navigationbar, javaimagesnavbar, width, topparent;
-  int twidth, swidth, iwidth = 0;
-
-  text_t &arg_d = args["d"];
-  text_t &arg_cl = args["cl"];
   text_t &collection = args["c"];
 
@@ -306 +416 @@
   if (!args.getintarg("x")) {
 
-    get_top (arg_cl, topparent);
-    
     collectproto->get_filterinfo (collection, filterinfo, err, logout);
     if (err == noError) {
@@ -317 +425 @@
     bool getParents = false;
     get_children ("", collection, metadata, getParents, collectproto, response, logout);
-      
-    int numc = response.docInfo.size();
-    ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
     
-    navigationbar = "<!-- Navigation Bar -->\n";
-    
-    // calculate width of spacers and set macro
-    if (args.getintarg("v") == 0) {
-      disp.expandstring ("Global", "_pagewidth_", width);
-      twidth = width.getint();
-      
-      disp.expandstring ("query", "_searchwidth_", width);
-      iwidth += width.getint();
-      
-      while (dochere != docend) {
-        disp.expandstring ("document", "_" + (*dochere).metadata[0].values[0] + "width_", width);
-        iwidth += width.getint();
-        dochere ++;
-      }
-      if ((twidth - iwidth) < numc) swidth = 2;
-      else {
-        swidth = twidth - iwidth;
-        if (numc > 0) swidth = swidth / numc;
-      }
-      disp.setmacro ("widthtspace", "Global", swidth);
-    }
-    
-    navigationbar += "<nobr>\n";
-    if (args["a"] == "q") {
-      navigationbar += "_icontabsearchgreen_";
-    } else {
-      navigationbar += "_imagesearch_";
-      javaimagesnavbar = "_javasearch_";
-    }
-    if (numc == 0) navigationbar += "_imagespacer_";
-    
-    dochere = response.docInfo.begin();
-    while (dochere != docend) {
-      const text_t &title = (*dochere).metadata[0].values[0];
-      const text_t &classifytype = (*dochere).metadata[1].values[0];
-      
-      // if we're inside a document all the classification buttons should be enabled
-      if (arg_d.empty() && ((*dochere).OID == topparent))
-        navigationbar += "_imagespacer__icontab" + title + "green_";
-      else {
-        navigationbar += "_imagespacer__image" + title + "_";
-        
-        // set the _httpbrowseXXX_ macro for this classification
-        text_t link;
-        if (classifytype == "HTML") 
-          link = "_httppagex_(html)&hp=" + (*dochere).OID + ".fc";
-        else 
-          link = "_httpdocument_&cl=" + (*dochere).OID;
-
-        if (classifytype == "AZList" || classifytype == "DateList") link += ".fc";
-        disp.setmacro ("httpbrowse" + title, "Global", link); 
-
-      }
-        javaimagesnavbar += "_java" + title + "_";
-        dochere ++;
-    }
-    navigationbar += "\n</nobr>\n";
-    navigationbar += "<!-- End of Navigation Bar -->\n";
-    disp.setmacro ("navigationbar", "Global", navigationbar);
-    if (args.getintarg("v") == 0) 
-      disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);
+    // calculate width of spacers and set _widthtspace_ macro
+    if (args.getintarg("v") == 0) set_spacemacro (disp, response);
+
+    // set _navigationbar_ and _javaimagesnavbar_ macros
+    set_navbarmacros (disp, response, args);
       }
     } else {

trunk/gsdl/src/recpt/documentaction.h

@@ -40 +40 @@
   void load_formatinfo (const text_tmap &colformat, int gt);
 
+  void set_spacemacro (displayclass &disp, const FilterResponse_t &response);
+
+  void set_navbarmacros (displayclass &disp, const FilterResponse_t &response, cgiargsclass &args);
+
   void set_java_macros (cgiargsclass &args, displayclass &disp);
 
@@ -63 +67 @@
 
   formatinfo_t formatinfo;
+  text_tset classify_meta;