Changeset 411

Timestamp:

1999-07-21T17:01:09+12:00 (25 years ago)

Author:

sjboddie

Message:

fixed up wrapping of classificationlinks

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (8 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.14  1999/07/21 05:01:09  sjboddie
+   fixed up wrapping of classificationlinks
+
    Revision 1.13  1999/07/20 02:59:54  sjboddie
    List and AZList classifications now use format strings
@@ -364 +367 @@
         // set the _httpbrowseXXX_ macro for this classification
         text_t link = (*dochere).OID;
-        if (classifytype == "AZList" || classifytype == "Datelist") link += ".fc";
+        if (classifytype == "AZList" || classifytype == "DateList") link += ".fc";
         disp.setmacro ("httpbrowse" + title, "Global", 
                "_httpdocument_&cl=" + link);
@@ -404 +407 @@
 
   // _httpprevarrow_        these are set if next or previous arrows
-  // _httpnextarrow_        are to be used - (i.e. if it's an AZList or a Datelist 
+  // _httpnextarrow_        are to be used - (i.e. if it's an AZList or a DateList 
   //                        classifytype at a top level or if it's a Book or a
   //                        Hierarchy classifytype at document level 
@@ -498 +501 @@
     // (if they're required by the current classification type)
     
-    if ((classifytype == "AZList") || (classifytype == "Datelist")) {
+    if ((classifytype == "AZList") || (classifytype == "DateList")) {
       
       text_t classificationlinks, navarrows;
@@ -519 +522 @@
           ResultDocInfo_tarray::const_iterator secend = response.docInfo.end();
           
+          int lenlinks = 0;
           while (sechere != secend) {
         if ((*sechere).metadata[1].values[0] == "classify") {
+          const text_t &sectionheading = (*sechere).metadata[0].values[0];
+
           if (((*sechere).OID == arg_cl) || is_child_of((*sechere).OID, arg_cl)) {
             
@@ -529 +535 @@
               disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + (*(sechere+1)).OID);
 
-            classificationlinks += "\n<b>" + (*sechere).metadata[0].values[0] + "</b>&nbsp;&nbsp;&nbsp;";
+            lenlinks += sectionheading.size();
+            classificationlinks += "<b>" + sectionheading + "</b>";
+            if (lenlinks > 50) {
+              classificationlinks += "<br>\n";
+              lenlinks = 0;
+            } else {
+              if (sechere+1 != secend) classificationlinks += "&nbsp;&nbsp;&nbsp;\n";
+              lenlinks += 3;
+            }
           } else {
+            lenlinks += sectionheading.size();
             classificationlinks += link + (*sechere).OID + "\">";
-            classificationlinks += (*sechere).metadata[0].values[0] + "</a>";
-            if ((sechere + 1) != secend) classificationlinks += "&nbsp;&nbsp;&nbsp;";
+            classificationlinks += sectionheading + "</a>";
+            if (lenlinks > 50) {
+              classificationlinks += "<br>\n";
+              lenlinks = 0;
+            } else {
+              if (sechere+1 != secend) classificationlinks += "&nbsp;&nbsp;&nbsp;\n";
+              lenlinks += 3;
+            }
           }
         }
@@ -599 +620 @@
       else
     // Book is the default for a document level toc - AZList, List and 
-    // Datelist don't make sense for document level
+    // DateList don't make sense for document level
     book_toc (args, collectproto, disp,
           outconvert, textout, logout);
@@ -616 +637 @@
     hierarchy_toc (thistype, args, collectproto, 
                disp, outconvert, textout, logout);
-      else if (toptype == "Datelist")
-    datelist_toc (thistype, toptitle, formatstring, args, collectproto, 
+      else if (toptype == "DateList")
+    datelist_toc (thistype, formatstring, args, collectproto, 
               disp, outconvert, textout, logout);
       else