Changeset 1443 for trunk/gsdl/src/recpt/vlistbrowserclass.cpp

Timestamp:

2000-08-25T12:57:05+12:00 (24 years ago)

Author:

davidb

Message:

Changes to support nested {If} and {Or} statements in macro files.
Also expansion of metadata if it includes further metadata. The two
can be intermixed -- metadata can include metadata that has {If}
and {Or} statements.

File:

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

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -52 +52 @@
                          format_t *formatlistptr, bool use_table, 
                          text_tset &/*metadata*/, bool &/*getParents*/, 
-                         recptproto * /*collectproto*/, displayclass &disp, 
+                         recptproto * collectproto, displayclass &disp, 
                          outconvertclass &outconvert, ostream &textout, 
-                         ostream &/*logout*/) {
+                         ostream& logout) {
 
   text_t link, icon;
@@ -80 +80 @@
   }
 
-  textout << outconvert << disp << get_formatted_string (section, formatlistptr, 
-                             link, icon, highlight);
+  textout << outconvert << disp 
+      << get_formatted_string (collection, collectproto, 
+                   section, formatlistptr, 
+                   link, icon, highlight, logout);
   
   if (use_table  || colnumber > 0) textout << "</tr></table>\n";
@@ -92 +94 @@
                          format_t *formatlistptr, bool use_table, 
                          text_tset &/*metadata*/, bool &/*getParents*/, 
-                         recptproto * /*collectproto*/, displayclass &disp, 
+                         recptproto * collectproto, displayclass &disp, 
                          outconvertclass &outconvert, ostream &textout, 
-                         ostream &/*logout*/) {
+                         ostream& logout) {
 
   text_t link, icon;
@@ -129 +131 @@
 
     if (use_table || colnumber > 0) textout << "<tr valign=top>";
-    textout << outconvert << disp << get_formatted_string (*thissection, formatlistptr, 
-                               link, icon, highlight);
+    textout << outconvert << disp 
+        << get_formatted_string (collection, collectproto, 
+                     *thissection, formatlistptr, 
+                     link, icon, highlight, logout);
+
     if (use_table || colnumber > 0) textout << "</tr>";
     textout << "\n";