Changeset 405 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

1999-07-20T14:59:54+12:00 (25 years ago)

Author:

sjboddie

Message:

List and AZList classifications now use format strings

File:

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

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.13  1999/07/20 02:59:54  sjboddie
+   List and AZList classifications now use format strings
+
    Revision 1.12  1999/07/16 00:19:01  sjboddie
    some changes to the way quoted queries are handled
@@ -257 +260 @@
     get_top (arg_d, top);
     metadata.push_back ("Title");
-    get_children (top, collection, metadata, collectproto, response, logout);
+    bool getParents = false;
+    get_children (top, collection, metadata, getParents, collectproto, response, logout);
     ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
     ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
@@ -308 +312 @@
     metadata.push_back ("Title");
     metadata.push_back ("classifytype");
-    get_children ("", collection, metadata, collectproto, response, logout);
+    bool getParents = false;
+    get_children ("", collection, metadata, getParents, collectproto, response, logout);
       
     int numc = response.docInfo.size();
@@ -501 +506 @@
       metadata.push_back ("Title");
       metadata.push_back ("doctype");
-      if (get_children (classtop, collection, metadata, collectproto, response, logout)) {
+      bool getParents = false;
+      if (get_children (classtop, collection, metadata, getParents, collectproto, response, logout)) {
         
         // don't want links unless there are 2 or more sections
@@ -558 +564 @@
     text_tarray metadata;
     FilterResponse_t response;
-    text_t toptitle, toptype, thistype;
+    text_t toptitle, toptype, thistype, formatstring;
     
+    text_t &collection = args["c"];
     text_t &arg_d = args["d"];
     text_t &arg_cl = args["cl"];
@@ -578 +585 @@
     metadata.push_back ("Title");
     metadata.push_back ("classifytype");
-    if (get_info (OID, args["c"], metadata, true, collectproto, response, logout)) {
+    if (get_info (OID, collection, metadata, true, collectproto, response, logout)) {
       toptitle = response.docInfo[0].metadata[0].values[0];
       toptype = response.docInfo[0].metadata[1].values[0];
       thistype = response.docInfo[0].metadata[1].values.back();
     }
-    
+
     // output the table of contents
     if (!arg_d.empty()) {
       
       if (toptype == "Hierarchy")
-    hierarchy_toc (thistype, toptitle, args, collectproto, 
+    hierarchy_toc (thistype, args, collectproto, 
                disp, outconvert, textout, logout);
       else
     // Book is the default for a document level toc - AZList, List and 
     // Datelist don't make sense for document level
-    book_toc (toptitle, args, collectproto, disp,
+    book_toc (args, collectproto, disp,
           outconvert, textout, logout);
     } else {
-    
+
+      // see if we can find a formatstring for this type of toc
+      ColInfoResponse_t collectinfo;
+      comerror_t err;
+      collectproto->get_collectinfo (collection, collectinfo, err, logout);
+      if (err == noError) {
+    text_tmap::const_iterator it = collectinfo.format.find(toptype + toptitle);
+    if (it != collectinfo.format.end()) formatstring = (*it).second;
+      }
+      
       if (toptype == "Hierarchy")
-    hierarchy_toc (thistype, toptitle, args, collectproto, 
+    hierarchy_toc (thistype, args, collectproto, 
                disp, outconvert, textout, logout);
       else if (toptype == "Datelist")
-    datelist_toc (thistype, toptitle, args, collectproto, 
+    datelist_toc (thistype, toptitle, formatstring, args, collectproto, 
               disp, outconvert, textout, logout);
-      else if (toptype == "AZList")
-    azlist_toc (thistype, toptitle, args, collectproto, 
-            disp, outconvert, textout, logout);
       else 
     // List is the default for a classification level toc - Book doesn't make 
     // sense for classification level
-    list_toc (thistype, toptitle, args, collectproto, 
+    list_toc (thistype, formatstring, args, collectproto, 
           disp, outconvert, textout, logout);
     }